[uss_qualifier] Switch invalid flights to a provider

NEXT_RELEASE_NOTES.md

@@ -40,6 +40,8 @@ The release notes should contain at least the following sections:
 * For any uss_qualifier test configurations using any of the test suites `suites.astm.utm.f3548_21`, `suites.faa.uft.message_signing`, `suites.uspace.flight_auth`, or `suites.uspace.required_services`, the following resources must be changed:
     * A new required resource named `conflicting_flights_provider` must be provided.  It must be a `resources.resource.ResourceProvidingResource` providing `resources.flight_planning.FlightIntentsResource` instances with spatially separated flight intents for each planner combination used by `ConflictEqualPriorityNotPermitted`.  One suitable implementation is `resources.geospatial.TriangularCascadeSoutheastResource` with `conflicting_flights` as its `base_resource`; see [f3548_self_contained](./monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml) for an example.
     * A new required resource named `non_conflicting_flights_provider` must be provided.  It must be a `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` providing spatially separated flight intents for each DSS instance used in the `dss_probing` test suite.  One suitable implementation is `resources.geospatial.TriangularCascadeSoutheastResource` with `non_conflicting_flights` as its `base_resource`; see [f3548_self_contained](./monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml) for an example.
+    * A new required resource named `invalid_flights_provider` must be provided.  It must be a `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` providing spatially separated invalid flight intents for each flight planner used in the `single_planner` test suite.  One suitable implementation is `resources.geospatial.TriangularCascadeSoutheastResource` with the previous `invalid_flight_intents` as its `base_resource`; see [f3548_self_contained](./monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml) for an example.
+        * The `invalid_flight_intents` resource is no longer accepted.
     * A new required resource named `planning_area_provider` must be provided to replace `planning_area`.  It must be a `resources.resource.ResourceProvidingResource` providing `resources.planning_area.PlanningAreaResource` instances with spatially separated planning areas for each DSS instance used in the `dss_probing` test suite.  One suitable implementation is `resources.geospatial.TriangularCascadeSoutheastResource` with `planning_area` as its `base_resource`; see [f3548_self_contained](./monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml) for an example.  The existing `planning_area` suite input is no longer used except by `suites.uspace.required_services`, which still requires it for NetRID tests.  Keep any underlying planning area resource used as the provider's `base_resource`.
 * For a uss_qualifier test configuration outside this repo using [`validation`](https://github.com/interuss/monitoring/blob/main/monitoring/uss_qualifier/reports/validation/definitions.py), the structure of some test suites has changed and may require an update to validation criteria.
 

monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml

@@ -21,7 +21,7 @@ v1:
           flight_planners_to_clear: flight_planners
           conflicting_flights_provider: conflicting_flights_provider
           priority_preemption_flights_provider: conflicting_flights_provider
-          invalid_flight_intents: invalid_flight_intents
+          invalid_flights_provider: invalid_flights_provider
           non_conflicting_flights_provider: non_conflicting_flights_provider
           dss: dss
           dss_instances: dss_instances
@@ -283,6 +283,15 @@ v1:
                   degrees_east: -96.7587
                   meters_up: 93
 
+        # Provide spatially separated invalid flights for each flight planner
+        invalid_flights_provider:
+          resource_type: resources.geospatial.TriangularCascadeSoutheastResource
+          dependencies:
+            base_resource: invalid_flight_intents
+          specification:
+            meters_east_margin: 10000
+            meters_north_margin: 10000
+
         # Details of non-conflicting flights (used in data validation scenario)
         non_conflicting_flights:
           resource_type: resources.flight_planning.FlightIntentsResource

monitoring/uss_qualifier/configurations/dev/library/resources.yaml

@@ -394,6 +394,15 @@ che_invalid_flight_intents:
           degrees_east: 7.4774
           meters_up: 605
 
+che_invalid_flights_provider:
+  $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
+  resource_type: resources.geospatial.TriangularCascadeSoutheastResource
+  dependencies:
+    base_resource: che_invalid_flight_intents
+  specification:
+    meters_east_margin: 10000
+    meters_north_margin: 10000
+
 che_general_flight_auth_flights:
   $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json
   resource_type: resources.flight_planning.FlightIntentsResource

monitoring/uss_qualifier/configurations/dev/message_signing.yaml

@@ -5,6 +5,7 @@ v1:
         che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'}
         che_conflicting_flights_provider: {$ref: 'library/resources.yaml#/che_conflicting_flights_provider'}
         che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'}
+        che_invalid_flights_provider: {$ref: 'library/resources.yaml#/che_invalid_flights_provider'}
         che_non_conflicting_flights: {$ref: 'library/resources.yaml#/che_non_conflicting_flights'}
         che_non_conflicting_flights_provider: {$ref: 'library/resources.yaml#/che_non_conflicting_flights_provider'}
         che_problematically_big_area: {$ref: 'library/resources.yaml#/che_problematically_big_area'}
@@ -55,7 +56,7 @@ v1:
           flight_planners: flight_planners
           combination_selector: combination_selector
           conflicting_flights_provider: che_conflicting_flights_provider
-          invalid_flight_intents: che_invalid_flight_intents
+          invalid_flights_provider: che_invalid_flights_provider
           non_conflicting_flights_provider: che_non_conflicting_flights_provider
           priority_preemption_flights_provider: che_conflicting_flights_provider
           dss: scd_dss

monitoring/uss_qualifier/configurations/dev/uspace.yaml

@@ -7,6 +7,7 @@ v1:
         che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'}
         che_conflicting_flights_provider: {$ref: 'library/resources.yaml#/che_conflicting_flights_provider'}
         che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'}
+        che_invalid_flights_provider: {$ref: 'library/resources.yaml#/che_invalid_flights_provider'}
         che_invalid_flight_auth_flights: {$ref: 'library/resources.yaml#/che_invalid_flight_auth_flights'}
         che_non_conflicting_flights: {$ref: 'library/resources.yaml#/che_non_conflicting_flights'}
         che_non_conflicting_flights_provider: {$ref: 'library/resources.yaml#/che_non_conflicting_flights_provider'}
@@ -63,7 +64,7 @@ v1:
 
           conflicting_flights_provider: che_conflicting_flights_provider
           priority_preemption_flights_provider: che_conflicting_flights_provider
-          invalid_flight_intents: che_invalid_flight_intents
+          invalid_flights_provider: che_invalid_flights_provider
           invalid_flight_auth_flights: che_invalid_flight_auth_flights
           non_conflicting_flights_provider: che_non_conflicting_flights_provider
           flight_planners: all_flight_planners?
@@ -101,7 +102,7 @@ v1:
 
                 conflicting_flights_provider: conflicting_flights_provider
                 priority_preemption_flights_provider: priority_preemption_flights_provider
-                invalid_flight_intents: invalid_flight_intents
+                invalid_flights_provider: invalid_flights_provider
                 invalid_flight_auth_flights: invalid_flight_auth_flights
                 non_conflicting_flights_provider: non_conflicting_flights_provider
                 flight_planners: flight_planners?

monitoring/uss_qualifier/configurations/dev/utm_implementation_us/definitions/baseline_a.libsonnet

@@ -24,7 +24,7 @@ function(env) {
             flight_planners_to_clear: 'flight_planners_to_clear',
             conflicting_flights_provider: 'conflicting_flights_provider',
             priority_preemption_flights_provider: 'conflicting_flights_provider',
-            invalid_flight_intents: 'invalid_flight_intents',
+            invalid_flights_provider: 'invalid_flights_provider',
             non_conflicting_flights_provider: 'non_conflicting_flights_provider',
             test_exclusions: 'test_exclusions',
             dss: 'dss',
@@ -248,6 +248,18 @@ function(env) {
             },
           },
 
+          // Provide spatially separated invalid flights for each flight planner
+          invalid_flights_provider: {
+            resource_type: 'resources.geospatial.TriangularCascadeSoutheastResource',
+            dependencies: {
+              base_resource: 'invalid_flight_intents',
+            },
+            specification: {
+              meters_east_margin: 10000,
+              meters_north_margin: 10000,
+            },
+          },
+
           // Details of non-conflicting flights (used in data validation scenario)
           non_conflicting_flights: {
             resource_type: 'resources.flight_planning.FlightIntentsResource',

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

@@ -17,7 +17,7 @@
 - `conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `priority_preemption_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` (optional)
 - `non_conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
-- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource`
+- `invalid_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `nominal_planning_selector`: `resources.flight_planning.FlightPlannerCombinationSelectorResource` (optional)
 - `priority_planning_selector`: `resources.flight_planning.FlightPlannerCombinationSelectorResource` (optional)
 - `utm_auth`: `resources.communications.AuthAdapterResource` (optional)

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

@@ -16,8 +16,8 @@ resources:
   conflicting_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
   priority_preemption_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]?
   non_conflicting_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
+  invalid_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
 
-  invalid_flight_intents: resources.flight_planning.FlightIntentsResource
   nominal_planning_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource?
   priority_planning_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource?
   utm_auth: resources.communications.AuthAdapterResource?
@@ -28,7 +28,7 @@ resources:
   # Zero or one of the following two resources must be provided
   id_generator: resources.interuss.id_generator.IDGeneratorResource?
   id_generator_provider: resources.interuss.id_generator.IDGeneratorProviderResource?
-  
+
   planning_area_provider: resources.resource.ResourceProvidingResource[resources.planning_area.PlanningAreaResource]
   problematically_big_area: resources.VolumeResource
   system_identity: resources.versioning.SystemIdentityResource?
@@ -99,17 +99,29 @@ local_resources:
       environments: equal_priority_conflict_combinations  # provides uss1, uss2
       flight_intents: conflicting_flights_provider
     specification: {}
+  single_planner_planner_environments:
+    resource_type: resources.combinations.ResourceCombinationsResource
+    dependencies:
+      tested_uss: flight_planners
+    specification: {}
+  invalid_intents_environments:
+    resource_type: resources.environments.EnvironmentAugmentationResource
+    dependencies:
+      environments: single_planner_planner_environments
+      flight_intents: invalid_flights_provider
+    specification: {}
+  single_planner_environments:
+    resource_type: resources.environments.EnvironmentAugmentationResource
+    dependencies:
+      environments: single_planner_planner_environments
+      invalid_flight_intents: invalid_flights_provider
   flight_intents_environments:
     resource_type: resources.environments.ConcatenatedResourceEnvironmentsResource
     dependencies:
       dss_probing: dss_probing_environments
       priority_preemption: priority_preemption_environments?
       equal_priority_conflict: equal_priority_conflict_environments
-    specification: {}
-  single_planner_environments:
-    resource_type: resources.combinations.ResourceCombinationsResource
-    dependencies:
-      tested_uss: flight_planners
+      invalid: invalid_intents_environments
     specification: {}
 actions:
 - test_scenario:
@@ -127,8 +139,7 @@ actions:
       flight_planners: flight_planners_to_clear
       mock_uss: mock_uss?
       dss: dss
-      flight_intents: invalid_flight_intents
-      flight_intents2: non_conflicting_flights?
+      flight_intents: non_conflicting_flights?
       flight_intents_environments: flight_intents_environments?
 - action_generator:
     generator_type: action_generators.resource_environments.ResourceEnvironmentsActionGenerator
@@ -190,7 +201,6 @@ actions:
     generator_type: action_generators.resource_environments.ResourceEnvironmentsActionGenerator
     resources:
       single_planner_environments: single_planner_environments
-      invalid_flight_intents: invalid_flight_intents
       non_conflicting_flights: non_conflicting_flights
       conflicting_flights: conflicting_flights
       dss: dss
@@ -215,8 +225,7 @@ actions:
       flight_planners: flight_planners
       mock_uss: mock_uss?
       dss: dss
-      flight_intents: invalid_flight_intents
-      flight_intents2: non_conflicting_flights?
+      flight_intents: non_conflicting_flights?
       flight_intents_environments: flight_intents_environments?
 - test_scenario:
     scenario_type: scenarios.astm.utm.make_uss_report.MakeUssReport

monitoring/uss_qualifier/suites/astm/utm/single_planner.md

@@ -2,6 +2,16 @@
 # Single flight planner testing for ASTM F3548-21 test suite
 [`suites.astm.utm.single_planner`](./single_planner.yaml)
 
+## [Resource inputs](../../README.md#resources)
+
+- `tested_uss`: `resources.flight_planning.FlightPlannerResource`
+- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource`
+- `non_conflicting_flights`: `resources.flight_planning.FlightIntentsResource`
+- `conflicting_flights`: `resources.flight_planning.FlightIntentsResource`
+- `dss`: `resources.astm.f3548.v21.DSSInstanceResource`
+- `mock_uss`: `resources.interuss.mock_uss.client.MockUSSResource` (optional)
+- `utm_auth`: `resources.communications.AuthAdapterResource` (optional)
+
 ## [Actions](../../README.md#actions)
 
 1. Scenario: [Validation of operational intents](../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md) ([`scenarios.astm.utm.FlightIntentValidation`](../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.py))

monitoring/uss_qualifier/suites/faa/uft/message_signing.md

@@ -15,7 +15,7 @@
 - `conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `priority_preemption_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` (optional)
 - `non_conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
-- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource`
+- `invalid_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `id_generator`: `resources.interuss.IDGeneratorResource`
 - `utm_client_identity`: `resources.communications.ClientIdentityResource`
 - `second_utm_auth`: `resources.communications.AuthAdapterResource` (optional)

monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml

@@ -15,7 +15,7 @@ resources:
   priority_preemption_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]?
   non_conflicting_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
 
-  invalid_flight_intents: resources.flight_planning.FlightIntentsResource
+  invalid_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
   id_generator: resources.interuss.IDGeneratorResource
   utm_client_identity: resources.communications.ClientIdentityResource
   second_utm_auth: resources.communications.AuthAdapterResource?
@@ -39,7 +39,7 @@ actions:
       flight_planners: flight_planners
       flight_planners_to_clear: flight_planners
       nominal_planning_selector: combination_selector
-      invalid_flight_intents: invalid_flight_intents
+      invalid_flights_provider: invalid_flights_provider
       priority_planning_selector: combination_selector
       dss: dss
       dss_instances: dss_instances

monitoring/uss_qualifier/suites/uspace/flight_auth.md

@@ -12,7 +12,7 @@
 - `priority_preemption_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` (optional)
 - `non_conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `invalid_flight_auth_flights`: `resources.flight_planning.FlightIntentsResource`
-- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource`
+- `invalid_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `flight_planners`: `resources.flight_planning.FlightPlannersResource` (optional)
 - `mock_uss`: `resources.interuss.mock_uss.client.MockUSSResource` (optional)
 - `dss`: `resources.astm.f3548.v21.DSSInstanceResource`

monitoring/uss_qualifier/suites/uspace/flight_auth.yaml

@@ -12,7 +12,7 @@ resources:
   non_conflicting_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
 
   invalid_flight_auth_flights: resources.flight_planning.FlightIntentsResource
-  invalid_flight_intents: resources.flight_planning.FlightIntentsResource
+  invalid_flights_provider: resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]
   flight_planners: resources.flight_planning.FlightPlannersResource?
   mock_uss: resources.interuss.mock_uss.client.MockUSSResource?
   dss: resources.astm.f3548.v21.DSSInstanceResource
@@ -35,7 +35,7 @@ actions:
       conflicting_flights: conflicting_flights?
       conflicting_flights_provider: conflicting_flights_provider
       priority_preemption_flights_provider: priority_preemption_flights_provider?
-      invalid_flight_intents: invalid_flight_intents
+      invalid_flights_provider: invalid_flights_provider
       non_conflicting_flights: non_conflicting_flights?
       non_conflicting_flights_provider: non_conflicting_flights_provider
       flight_planners: flight_planners?

monitoring/uss_qualifier/suites/uspace/required_services.md

@@ -11,7 +11,7 @@
 - `conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `priority_preemption_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]` (optional)
 - `non_conflicting_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
-- `invalid_flight_intents`: `resources.flight_planning.FlightIntentsResource`
+- `invalid_flights_provider`: `resources.resource.ResourceProvidingResource[resources.flight_planning.FlightIntentsResource]`
 - `invalid_flight_auth_flights`: `resources.flight_planning.FlightIntentsResource`
 - `flight_planners`: `resources.flight_planning.FlightPlannersResource` (optional)
 - `mock_uss`: `resources.interuss.mock_uss.client.MockUSSResource` (optional)