Merge branch 'mock_uss_prios' into scd0010

interuss · Dec 8, 2023 · 98f2344 · 98f2344
2 parents 04180b6 + 306f860
commit 98f2344
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml
@@ -15,8 +15,6 @@ v1:
         resources:
           flight_planners: flight_planners
           conflicting_flights: conflicting_flights
-          conflicting_flights_no_equal_prio: conflicting_flights
-          priority_preemption_flights: priority_preemption_flights
           invalid_flight_intents: invalid_flight_intents
           non_conflicting_flights: non_conflicting_flights
           dss: dss
@@ -58,13 +56,6 @@ v1:
             file:
               path: file://./test_data/che/flight_intents/conflicting_flights.yaml
 
-        # Details of priority-preemption flights (used in nominal planning priority scenario)
-        priority_preemption_flights:
-          resource_type: resources.flight_planning.FlightIntentsResource
-          specification:
-            file:
-              path: test_data.che.flight_intents.conflicting_flights
-
         # Details of flights with invalid operational intents (used in flight intent validation scenario)
         invalid_flight_intents:
           resource_type: resources.flight_planning.FlightIntentsResource

diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml
@@ -4,8 +4,7 @@ resources:
   dss: resources.astm.f3548.v21.DSSInstanceResource
   dss_instances: resources.astm.f3548.v21.DSSInstancesResource?
   conflicting_flights: resources.flight_planning.FlightIntentsResource
-  conflicting_flights_no_equal_prio: resources.flight_planning.FlightIntentsResource?
-  priority_preemption_flights: resources.flight_planning.FlightIntentsResource
+  priority_preemption_flights: resources.flight_planning.FlightIntentsResource?
   invalid_flight_intents: resources.flight_planning.FlightIntentsResource
   non_conflicting_flights: resources.flight_planning.FlightIntentsResource
   nominal_planning_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource?