From a7291bcfa823e75c1a01c87b9796d188021191fe Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Tue, 4 Nov 2025 10:54:14 +0100 Subject: [PATCH] [uss_qualifier] use set_uss_available fragment in cleanup --- .../astm/utm/off_nominal_planning/down_uss.md | 3 +-- .../astm/utm/off_nominal_planning/down_uss.py | 21 +------------------ .../down_uss_equal_priority_not_permitted.md | 3 +-- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md index 005f50a9cf..1a9eabd468 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md @@ -102,8 +102,7 @@ If the planning was accepted, Flight 1 should have been shared. If the planning was rejected, Flight 1 should not have been shared, thus should not exist. ## Cleanup -### 🛑 Availability of virtual USS restored check -**[astm.f3548.v21.DSS0100,1](../../../../requirements/astm/f3548/v21.md)** +### [Restore virtual USS availability test step](../set_uss_available.md) ### 🛑 Successful flight deletion check Delete flights injected at USS through the flight planning interface. 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 23f03c8907..d7e19a0c22 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 @@ -2,7 +2,6 @@ from uas_standards.astm.f3548.v21.api import ( OperationalIntentReference, OperationalIntentState, - UssAvailabilityState, ) from uas_standards.astm.f3548.v21.constants import Scope @@ -313,25 +312,7 @@ def _clear_op_intents(self): def cleanup(self): self.begin_cleanup() - - with self.check( - "Availability of virtual USS restored", [self.dss.participant_id] - ) as check: - try: - availability_version, avail_query = self.dss.set_uss_availability( - self.uss_qualifier_sub, - UssAvailabilityState.Normal, - ) - self.record_query(avail_query) - except QueryError as e: - self.record_queries(e.queries) - avail_query = e.queries[0] - check.record_failed( - summary=f"Availability of USS {self.uss_qualifier_sub} could not be set to available", - details=f"DSS responded code {avail_query.status_code}; {e}", - query_timestamps=[avail_query.request.timestamp], - ) - + set_uss_available(self, self.dss, self.uss_qualifier_sub) cleanup_flights(self, [self.tested_uss]) self._clear_op_intents() diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md index e5b76d377e..076424da77 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md @@ -173,8 +173,7 @@ to reject or accept Flight 2. If the USS indicates that the injection attempt fa ## Cleanup -### 🛑 Availability of virtual USS restored check -**[astm.f3548.v21.DSS0100,1](../../../../requirements/astm/f3548/v21.md)** +### [Restore virtual USS availability test step](../set_uss_available.md) ### 🛑 Successful flight deletion check Delete flights injected at USS through the flight planning interface.