[uss_qualifier] scd auth: proper cleanup and check for scd and constr…

…aints test cases (#783)
interuss · Sep 11, 2024 · 7fa4c8c · 7fa4c8c
1 parent b926b65
commit 7fa4c8c
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/authentication/authentication_validation.py
@@ -355,22 +355,31 @@ def _ensure_clean_workspace_step(self):
 
     def _ensure_test_entities_dont_exist(self):
 
-        # Drop OIR's first: subscriptions may be tied to them and can't be deleted
-        # as long as they exist
-        test_step_fragments.cleanup_op_intent(self, self._scd_dss, self._test_id)
-        test_step_fragments.cleanup_sub(self, self._scd_dss, self._test_id)
+        if self._scd_dss:
+            # Drop OIR's first: subscriptions may be tied to them and can't be deleted
+            # as long as they exist
+            test_step_fragments.cleanup_op_intent(self, self._scd_dss, self._test_id)
+            test_step_fragments.cleanup_sub(self, self._scd_dss, self._test_id)
+
+        if self._constraints_dss:
+            test_step_fragments.cleanup_constraint_ref(
+                self,
+                self._constraints_dss,
+                self._test_id,
+            )
 
         # Make sure the test ID for uss availability is set to 'Unknown'
         # if we are testing availabilities
         if self._availability_dss:
             self._ensure_availability_is_unknown()
 
     def _ensure_no_active_subs_exist(self):
-        test_step_fragments.cleanup_active_subs(
-            self,
-            self._scd_dss,
-            self._planning_area_volume4d,
-        )
+        if self._scd_dss:
+            test_step_fragments.cleanup_active_subs(
+                self,
+                self._scd_dss,
+                self._planning_area_volume4d,
+            )
 
     def _ensure_availability_is_unknown(self):