setup f3548 suite for optional preemption flight intents

monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml

@@ -15,7 +15,6 @@ v1:
         resources:
           flight_planners: flight_planners
           conflicting_flights: conflicting_flights
-          priority_preemption_flights: priority_preemption_flights
           invalid_flight_intents: invalid_flight_intents
           non_conflicting_flights: non_conflicting_flights
           dss: dss
@@ -57,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

monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml

@@ -4,7 +4,7 @@ resources:
   dss: resources.astm.f3548.v21.DSSInstanceResource
   dss_instances: resources.astm.f3548.v21.DSSInstancesResource?
   conflicting_flights: 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?

monitoring/uss_qualifier/suites/uspace/flight_auth.md

@@ -5,9 +5,6 @@
 ## [Actions](../README.md#actions)
 
 1. Suite: [ASTM F3548-21](../astm/utm/f3548_21.md) ([`suites.astm.utm.f3548_21`](../astm/utm/f3548_21.yaml))
-2. Scenario: [Generic flight planners preparation](../../scenarios/flight_planning/prep_planners.md) ([`scenarios.flight_planning.PrepareFlightPlanners`](../../scenarios/flight_planning/prep_planners.py))
-3. Action generator: [`action_generators.flight_planning.FlightPlannerCombinations`](../../action_generators/flight_planning/planner_combinations.py)
-    1. Scenario: [Flight authorisation validation](../../scenarios/uspace/flight_auth/validation.md) ([`scenarios.uspace.flight_auth.Validation`](../../scenarios/uspace/flight_auth/validation.py))
 
 ## [Checked requirements](../README.md#checked-requirements)
 
@@ -138,17 +135,17 @@
     <td rowspan="6" style="vertical-align:top;"><a href="../../requirements/interuss/automated_testing/flight_planning.md">interuss<br>.automated_testing<br>.flight_planning</a></td>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">ClearArea</a></td>
     <td>Implemented</td>
-    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../scenarios/flight_planning/prep_planners.md">Generic flight planners preparation</a></td>
+    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a></td>
   </tr>
   <tr>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">DeleteFlightSuccess</a></td>
     <td>Implemented</td>
-    <td><a href="../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../scenarios/uspace/flight_auth/validation.md">Flight authorisation validation</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</a><br><a href="../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
+    <td><a href="../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</a><br><a href="../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
   </tr>
   <tr>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">ExpectedBehavior</a></td>
     <td>Implemented</td>
-    <td><a href="../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../scenarios/uspace/flight_auth/validation.md">Flight authorisation validation</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</a><br><a href="../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
+    <td><a href="../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</a><br><a href="../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
   </tr>
   <tr>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">FlightCoveredByOperationalIntent</a></td>
@@ -158,12 +155,12 @@
   <tr>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">ImplementAPI</a></td>
     <td>Implemented</td>
-    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../scenarios/flight_planning/prep_planners.md">Generic flight planners preparation</a></td>
+    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a></td>
   </tr>
   <tr>
     <td><a href="../../requirements/interuss/automated_testing/flight_planning.md">Readiness</a></td>
     <td>Implemented</td>
-    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../scenarios/flight_planning/prep_planners.md">Generic flight planners preparation</a></td>
+    <td><a href="../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a></td>
   </tr>
   <tr>
     <td rowspan="1" style="vertical-align:top;"><a href="../../requirements/interuss/f3548/notification_requirements.md">interuss<br>.f3548<br>.notification_requirements</a></td>

monitoring/uss_qualifier/suites/uspace/flight_auth.yaml

@@ -23,32 +23,32 @@ actions:
       dss: dss
       dss_instances: dss_instances
   on_failure: Continue
-- test_scenario:
-    scenario_type: scenarios.flight_planning.PrepareFlightPlanners
-    resources:
-      flight_planners: flight_planners
-      flight_intents: invalid_flight_auth_flights
-  on_failure: Abort
-- action_generator:
-    generator_type: action_generators.flight_planning.FlightPlannerCombinations
-    resources:
-      flight_planners: flight_planners
-      invalid_flight_auth_flights: invalid_flight_auth_flights
-    specification:
-      resources:
-        flight_planners: flight_planners
-        invalid_flight_auth_flights: invalid_flight_auth_flights
-      action_to_repeat:
-        test_scenario:
-          scenario_type: scenarios.uspace.flight_auth.Validation
-          resources:
-            flight_intents: invalid_flight_auth_flights
-            flight_planner: flight_planner
-        on_failure: Continue
-      flight_planners_source: flight_planners
-      roles:
-      - flight_planner
-  on_failure: Continue
+#- test_scenario:
+#    scenario_type: scenarios.flight_planning.PrepareFlightPlanners
+#    resources:
+#      flight_planners: flight_planners
+#      flight_intents: invalid_flight_auth_flights
+#  on_failure: Abort
+#- action_generator:
+#    generator_type: action_generators.flight_planning.FlightPlannerCombinations
+#    resources:
+#      flight_planners: flight_planners
+#      invalid_flight_auth_flights: invalid_flight_auth_flights
+#    specification:
+#      resources:
+#        flight_planners: flight_planners
+#        invalid_flight_auth_flights: invalid_flight_auth_flights
+#      action_to_repeat:
+#        test_scenario:
+#          scenario_type: scenarios.uspace.flight_auth.Validation
+#          resources:
+#            flight_intents: invalid_flight_auth_flights
+#            flight_planner: flight_planner
+#        on_failure: Continue
+#      flight_planners_source: flight_planners
+#      roles:
+#      - flight_planner
+#  on_failure: Continue
 participant_verifiable_capabilities:
     - id: no_failures
       name: Fails No Existing Tests