diff --git a/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py b/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py index 520914a059..fe0556fe73 100644 --- a/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py +++ b/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py @@ -286,6 +286,11 @@ def delete_op_intent( id: str, ovn: str, ) -> Tuple[OperationalIntentReference, List[SubscriberToNotify], Query]: + """ + Delete an operational intent. + Raises: + * QueryError: if request failed, if HTTP status code is different than 200, or if the parsing of the response failed. + """ self._uses_scope(Scope.StrategicCoordination) op = OPERATIONS[OperationID.DeleteOperationalIntentReference] query = query_and_describe( diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/test_step_fragments.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/test_step_fragments.py index ac8d9ed59f..1cf30767cf 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/test_step_fragments.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/test_step_fragments.py @@ -26,6 +26,7 @@ def remove_op_intent( scenario.record_query(query) except fetch.QueryError as e: scenario.record_queries(e.queries) + query = e.queries[0] check.record_failed( summary=f"Could not remove op intent reference {oi_id}", details=f"When attempting to remove op intent reference {oi_id} from the DSS, received {query.status_code}; {e}", diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py index 3ad7a5840b..871e3fe840 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py @@ -294,6 +294,7 @@ def _clear_op_intents(self): self.record_query(del_query) except QueryError as e: self.record_queries(e.queries) + del_query = e.queries[0] check.record_failed( summary=f"Failed to delete op intent {oi_ref.id} from DSS", details=f"DSS responded code {del_query.status_code}; error message: {del_query.error_message}; {e}", diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/op_intent_ref_access_control.py b/monitoring/uss_qualifier/scenarios/astm/utm/op_intent_ref_access_control.py index 41dc538b35..3332167afb 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/op_intent_ref_access_control.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/op_intent_ref_access_control.py @@ -161,6 +161,7 @@ def _clean_known_op_intents_ids(self): self.record_query(dq) except QueryError as e: self.record_queries(e.queries) + dq = e.queries[0] check.record_failed( f"Could not delete operational intent using main credentials", details=f"DSS responded with {dq.response.status_code} to attempt to delete OI {self._oid_1}; {e}", @@ -190,6 +191,7 @@ def _clean_known_op_intents_ids(self): self.record_query(dq) except QueryError as e: self.record_queries(e.queries) + dq = e.queries[0] check.record_failed( f"Could not delete operational intent using second credentials", details=f"DSS responded with {dq.response.status_code} to attempt to delete OI {self._oid_2}; {e}", @@ -226,6 +228,7 @@ def _attempt_to_delete_remaining_op_intents(self): self.record_query(dq) except QueryError as e: self.record_queries(e.queries) + dq = e.queries[0] check.record_failed( f"Could not delete operational intent using main credentials", details=f"DSS responded with {dq.response.status_code} to attempt to delete OI {op_intent.id}; {e}", @@ -264,6 +267,7 @@ def _attempt_to_delete_remaining_op_intents(self): self.record_query(dq) except QueryError as e: self.record_queries(e.queries) + dq = e.queries[0] check.record_failed( f"Could not delete operational intent using second credentials", details=f"DSS responded with {dq.response.status_code} to attempt to delete OI {op_intent.id}; {e}",