[uss_qualifier] Clean up dev configurations

monitoring/uss_qualifier/configurations/README.md

@@ -8,7 +8,7 @@ To execute a test run with uss_qualifier, a uss_qualifier configuration must be
 
 When referring to a configuration, three methods may be used; see [`FileReference` documentation](../fileio.py) for more details.
 
-* **Package-based**: refer to a dictionary (*.json, *.yaml) file located in a subfolder of the `uss_qualifier` folder using the Python module style, omitting the extension of the file name.  For instance, `configurations.dev.f3548` would refer to [uss_qualifier/configurations/dev/f3548.yaml](dev/f3548.yaml).
+* **Package-based**: refer to a dictionary (*.json, *.yaml) file located in a subfolder of the `uss_qualifier` folder using the Python module style, omitting the extension of the file name.  For instance, `configurations.dev.uspace` would refer to [uss_qualifier/configurations/dev/uspace.yaml](dev/uspace.yaml).
 * **Local file**: when a configuration reference is prefixed with `file://`, it refers to a local file using the path syntax of the host operating system.
 * **Web file**: when a configuration reference is prefixed with `http://` or `https://`, it refers to a file accessible at the specified URL.
 

monitoring/uss_qualifier/configurations/dev/dss_probing.yaml

@@ -1,90 +1,30 @@
 $content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json
 v1:
   test_run:
+    resources:
+      resource_declarations:
+        id_generator: {$ref: 'library/resources.yaml#/id_generator'}
+        kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'}
+        kentland_problematically_big_area: {$ref: 'library/resources.yaml#/kentland_problematically_big_area'}
+
+        utm_auth: {$ref: 'library/environment.yaml#/utm_auth'}
+        scd_dss_instances: {$ref: 'library/environment.yaml#/scd_dss_instances'}
+        netrid_dss_instances_v22a: {$ref: 'library/environment.yaml#/netrid_dss_instances_v22a'}
+        netrid_dss_instances_v19: {$ref: 'library/environment.yaml#/netrid_dss_instances_v19'}
     non_baseline_inputs:
       - v1.test_run.resources.resource_declarations.utm_auth
-      - v1.test_run.resources.resource_declarations.netrid_dss_instances_v19
+      - v1.test_run.resources.resource_declarations.scd_dss_instances
       - v1.test_run.resources.resource_declarations.netrid_dss_instances_v22a
-    resources:
-      resource_declarations:
-        utm_auth:
-          resource_type: resources.communications.AuthAdapterResource
-          specification:
-            environment_variable_containing_auth_spec: AUTH_SPEC
-        netrid_dss_instances_v19:
-          resource_type: resources.astm.f3411.DSSInstancesResource
-          dependencies:
-            auth_adapter: utm_auth
-          specification:
-            dss_instances:
-              - participant_id: uss1
-                rid_version: F3411-19
-                base_url: http://dss.uss1.localutm
-                has_private_address: true
-              - participant_id: uss2
-                rid_version: F3411-19
-                base_url: http://dss.uss2.localutm
-                has_private_address: true
-        netrid_dss_instances_v22a:
-          resource_type: resources.astm.f3411.DSSInstancesResource
-          dependencies:
-            auth_adapter: utm_auth
-          specification:
-            dss_instances:
-              - participant_id: uss1
-                rid_version: F3411-22a
-                base_url: http://dss.uss1.localutm/rid/v2
-                has_private_address: true
-              - participant_id: uss2
-                rid_version: F3411-22a
-                base_url: http://dss.uss2.localutm/rid/v2
-                has_private_address: true
-        id_generator:
-          resource_type: resources.interuss.IDGeneratorResource
-          dependencies:
-            auth_adapter: utm_auth
-          specification:
-            whoami_audience: localhost
-            whoami_scope: rid.display_provider
-        service_area:
-          resource_type: resources.netrid.ServiceAreaResource
-          specification:
-            base_url: https://uss_qualifier.test.utm/dummy_base_url
-            footprint:
-              - lat: 37.1853
-                lng: -80.6140
-              - lat: 37.2148
-                lng: -80.6140
-              - lat: 37.2148
-                lng: -80.5440
-              - lat: 37.1853
-                lng: -80.5440
-            altitude_min: 0
-            altitude_max: 3048
-            reference_time: '2023-01-10T00:00:00.123456+00:00'
-            time_start: '2023-01-10T00:00:01.123456+00:00'
-            time_end: '2023-01-10T01:00:01.123456+00:00'
-        problematically_big_area:
-          resource_type: resources.VerticesResource
-          specification:
-            vertices:
-              - lat: 38
-                lng: -81
-              - lat: 37
-                lng: -81
-              - lat: 37
-                lng: -80
-              - lat: 38
-                lng: -80
+      - v1.test_run.resources.resource_declarations.netrid_dss_instances_v19
     action:
       test_suite:
         suite_type: suites.interuss.dss.all_tests
         resources:
           f3411v19_dss_instances: netrid_dss_instances_v19
           f3411v22a_dss_instances: netrid_dss_instances_v22a
           id_generator: id_generator
-          service_area: service_area
-          problematically_big_area: problematically_big_area
+          service_area: kentland_service_area
+          problematically_big_area: kentland_problematically_big_area
   artifacts:
     report:
       report_path: output/report_dss_probing.json

monitoring/uss_qualifier/configurations/dev/f3548/flight_intent_validation.yaml

@@ -2,16 +2,24 @@ v1:
   test_run:
     resources:
       resource_declarations:
-        "$ref": ../library/resources.yaml#/f3548_single_scenario
+        che_invalid_flight_intents: {$ref: '../library/resources.yaml#/che_invalid_flight_intents'}
+
+        utm_auth: {$ref: '../library/environment.yaml#/utm_auth'}
+        uss1_flight_planner: {$ref: '../library/environment.yaml#/uss1_flight_planner'}
+        scd_dss: {$ref: '../library/environment.yaml#/scd_dss'}
+    non_baseline_inputs:
+      - v1.test_run.resources.resource_declarations.utm_auth
+      - v1.test_run.resources.resource_declarations.uss1_flight_planner
+      - v1.test_run.resources.resource_declarations.scd_dss
     action:
       test_scenario:
         scenario_type: scenarios.astm.utm.FlightIntentValidation
         resources:
-          tested_uss: uss1
-          flight_intents: invalid_flight_intents
-          dss: dss
+          tested_uss: uss1_flight_planner
+          flight_intents: che_invalid_flight_intents
+          dss: scd_dss
   artifacts:
     report:
       report_path: output/report_f3548_flight_intent_validation.json
   validation:
-    $ref: ./library/validation.yaml#/normal_test
+    $ref: ../library/validation.yaml#/normal_test

monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_equal_priority_not_permitted.yaml

@@ -2,17 +2,27 @@ v1:
   test_run:
     resources:
       resource_declarations:
-        "$ref": ../library/resources.yaml#/f3548_single_scenario
+        che_conflicting_flights: {$ref: '../library/resources.yaml#/che_conflicting_flights'}
+
+        utm_auth: {$ref: '../library/environment.yaml#/utm_auth'}
+        uss1_flight_planner: {$ref: '../library/environment.yaml#/uss1_flight_planner'}
+        uss2_flight_planner: {$ref: '../library/environment.yaml#/uss2_flight_planner'}
+        scd_dss: {$ref: '../library/environment.yaml#/scd_dss'}
+    non_baseline_inputs:
+      - v1.test_run.resources.resource_declarations.utm_auth
+      - v1.test_run.resources.resource_declarations.uss1_flight_planner
+      - v1.test_run.resources.resource_declarations.uss1_flight_planner
+      - v1.test_run.resources.resource_declarations.scd_dss
     action:
       test_scenario:
         scenario_type: scenarios.astm.utm.ConflictEqualPriorityNotPermitted
         resources:
-          tested_uss: uss1
-          control_uss: uss2
-          flight_intents: priority_preemption_flights
-          dss: dss
+          tested_uss: uss1_flight_planner
+          control_uss: uss2_flight_planner
+          flight_intents: che_conflicting_flights
+          dss: scd_dss
   artifacts:
     report:
       report_path: output/report_f3548_nominal_planning_conflict_equal_priority_not_permitted.json
   validation:
-    $ref: ./library/validation.yaml#/normal_test
+    $ref: ../library/validation.yaml#/normal_test

monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_higher_priority.yaml

@@ -2,17 +2,27 @@ v1:
   test_run:
     resources:
       resource_declarations:
-        "$ref": ../library/resources.yaml#/f3548_single_scenario
+        che_conflicting_flights: {$ref: '../library/resources.yaml#/che_conflicting_flights'}
+
+        utm_auth: {$ref: '../library/environment.yaml#/utm_auth'}
+        uss1_flight_planner: {$ref: '../library/environment.yaml#/uss1_flight_planner'}
+        uss2_flight_planner: {$ref: '../library/environment.yaml#/uss2_flight_planner'}
+        scd_dss: {$ref: '../library/environment.yaml#/scd_dss'}
+    non_baseline_inputs:
+      - v1.test_run.resources.resource_declarations.utm_auth
+      - v1.test_run.resources.resource_declarations.uss1_flight_planner
+      - v1.test_run.resources.resource_declarations.uss1_flight_planner
+      - v1.test_run.resources.resource_declarations.scd_dss
     action:
       test_scenario:
         scenario_type: scenarios.astm.utm.ConflictHigherPriority
         resources:
-          tested_uss: uss1
-          control_uss: uss2
-          flight_intents: priority_preemption_flights
-          dss: dss
+          tested_uss: uss1_flight_planner
+          control_uss: uss2_flight_planner
+          flight_intents: che_conflicting_flights
+          dss: scd_dss
   artifacts:
     report:
       report_path: output/report_f3548_nominal_planning_conflict_higher_priority.json
   validation:
-    $ref: ./library/validation.yaml#/normal_test
+    $ref: ../library/validation.yaml#/normal_test

monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml

@@ -40,36 +40,36 @@ v1:
             auth_adapter: utm_auth
           specification:
             flight_planners:
-            # uss1 is the mock_uss directly exposing scdsc functionality
-            - participant_id: uss1
-              injection_base_url: http://scdsc.uss1.localutm/scdsc
-            # uss2 is another mock_uss directly exposing scdsc functionality
-            - participant_id: uss2
-              injection_base_url: http://scdsc.uss2.localutm/scdsc
+              # uss1 is the mock_uss directly exposing scdsc functionality
+              - participant_id: uss1
+                injection_base_url: http://scdsc.uss1.localutm/scdsc
+              # uss2 is another mock_uss directly exposing scdsc functionality
+              - participant_id: uss2
+                injection_base_url: http://scdsc.uss2.localutm/scdsc
 
         # Details of conflicting flights (used in nominal planning scenario)
         conflicting_flights:
           resource_type: resources.flight_planning.FlightIntentsResource
           specification:
             planning_time: '0:05:00'
             file:
-                path: file://./test_data/che/flight_intents/conflicting_flights.json
+              path: file://./test_data/che/flight_intents/conflicting_flights.json
 
         # Details of priority-preemption flights (used in nominal planning priority scenario)
         priority_preemption_flights:
           resource_type: resources.flight_planning.FlightIntentsResource
           specification:
             planning_time: '0:05:00'
             file:
-                path: test_data.che.flight_intents.priority_preemption
+              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
           specification:
             planning_time: '0:05:00'
             file:
-                path: test_data.che.flight_intents.invalid_flight_intents
+              path: test_data.che.flight_intents.invalid_flight_intents
 
         # Location of DSS instance that can be used to verify flight planning outcomes
         dss:
@@ -93,14 +93,23 @@ v1:
   # relative to where uss_qualifier is executed from, and are located inside the
   # Docker container executing uss_qualifier.
   artifacts:
+    # Write out full report content
     report:
       # Path to main report output
       report_path: output/report_f3548_self_contained.json
 
-    # Information about a report including a list of roles tested and which participants are attempting to fill them
-    tested_roles:
-      report_path: output/tested_roles_f3548_self_contained
+    # Write out a human-readable report of the requirements tested
+    tested_requirements:
+      output_path: output/tested_requirements_f3548_self_contained
+      requirement_collections:
+        scd:
+          requirement_collections:
+            - requirement_sets:
+                - astm.f3548.v21.scd
+      participant_requirements:
+        uss1: scd
+        uss2: scd
 
-    graph:
-      # Path to output GraphViz test file summarizing test run
-      gv_path: output/report_f3548_self_contained.gv
+    # Write out a human-readable report showing the sequence of events of the test
+    sequence_view:
+      output_path: output/sequence_f3548_self_contained