From 21fba805bc51806676f523e866c5ed71a232883f Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Thu, 19 Oct 2023 01:15:11 +0000 Subject: [PATCH 1/6] Clean up dev configurations --- .../configurations/dev/dss_probing.yaml | 88 +- .../configurations/dev/f3548.yaml | 32 - .../dev/f3548/flight_intent_validation.yaml | 18 +- ...conflict_equal_priority_not_permitted.yaml | 22 +- ...nal_planning_conflict_higher_priority.yaml | 22 +- .../dev/f3548_self_contained.yaml | 39 +- .../dev/faa/uft/local_message_signing.yaml | 65 - .../dev/general_flight_auth.yaml | 5 +- .../dev/generate_rid_test_data.json | 93 -- .../dev/generate_rid_test_data.yaml | 65 + .../dev/geospatial_comprehension.yaml | 5 +- .../configurations/dev/library/README.md | 4 +- .../dev/library/environment.yaml | 212 +--- .../dev/library/environment_containers.yaml | 217 ++++ .../dev/library/environment_localhost.yaml | 217 ++++ .../configurations/dev/library/resources.yaml | 722 ++++++------ .../configurations/dev/message_signing.yaml | 55 + .../configurations/dev/netrid_v19.yaml | 92 +- .../configurations/dev/netrid_v22a.yaml | 92 +- .../dev/non_docker/environment.yaml | 179 --- .../configurations/dev/uspace.yaml | 49 +- monitoring/uss_qualifier/run_locally.sh | 4 +- .../suites/astm/utm/f3548_21.yaml | 8 +- .../suites/faa/uft/design/README.md | 18 +- monitoring/uss_qualifier/suites/suite.py | 3 + .../flight_intents/conflicting_flights.json | 453 ++++++- .../flight_intents/priority_preemption.json | 1041 ----------------- 27 files changed, 1596 insertions(+), 2224 deletions(-) delete mode 100644 monitoring/uss_qualifier/configurations/dev/f3548.yaml delete mode 100644 monitoring/uss_qualifier/configurations/dev/faa/uft/local_message_signing.yaml delete mode 100644 monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.json create mode 100644 monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml create mode 100644 monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml create mode 100644 monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml create mode 100644 monitoring/uss_qualifier/configurations/dev/message_signing.yaml delete mode 100644 monitoring/uss_qualifier/configurations/dev/non_docker/environment.yaml delete mode 100644 monitoring/uss_qualifier/test_data/che/flight_intents/priority_preemption.json diff --git a/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml b/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml index 4bb83b7e9c..6b458f94b0 100644 --- a/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml +++ b/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml @@ -1,81 +1,21 @@ $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 @@ -83,8 +23,8 @@ v1: 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 diff --git a/monitoring/uss_qualifier/configurations/dev/f3548.yaml b/monitoring/uss_qualifier/configurations/dev/f3548.yaml deleted file mode 100644 index c06ccd1eff..0000000000 --- a/monitoring/uss_qualifier/configurations/dev/f3548.yaml +++ /dev/null @@ -1,32 +0,0 @@ -$content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json -v1: - test_run: - resources: - resource_declarations: - $ref: ./library/resources.yaml#/f3548_che - action: - test_suite: - suite_type: suites.astm.utm.f3548_21 - resources: - flight_planners: flight_planners - conflicting_flights: conflicting_flights - priority_preemption_flights: priority_preemption_flights - invalid_flight_intents: invalid_flight_intents - dss: scd_dss - dss_instances: scd_dss_instances - artifacts: - tested_roles: - report_path: output/tested_roles_f3548 - report: - report_path: output/report_f3548.json - tested_requirements: - output_path: output/tested_requirements_f3548 - requirement_collections: - scd: - requirement_sets: - - astm.f3548.v21.scd#Automated verification - participant_requirements: - uss1: scd - uss2: scd - validation: - $ref: ./library/validation.yaml#/normal_test diff --git a/monitoring/uss_qualifier/configurations/dev/f3548/flight_intent_validation.yaml b/monitoring/uss_qualifier/configurations/dev/f3548/flight_intent_validation.yaml index 368c203b0a..acd0084997 100644 --- a/monitoring/uss_qualifier/configurations/dev/f3548/flight_intent_validation.yaml +++ b/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 diff --git a/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_equal_priority_not_permitted.yaml b/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_equal_priority_not_permitted.yaml index 5d38bcb43e..29dbc20501 100644 --- a/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_equal_priority_not_permitted.yaml +++ b/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 diff --git a/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_higher_priority.yaml b/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_higher_priority.yaml index 846496d195..545ff29535 100644 --- a/monitoring/uss_qualifier/configurations/dev/f3548/nominal_planning_conflict_higher_priority.yaml +++ b/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 diff --git a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml index 7776f466b3..413fbf3cfc 100644 --- a/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml +++ b/monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml @@ -40,12 +40,12 @@ 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: @@ -53,7 +53,7 @@ v1: 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: @@ -61,7 +61,7 @@ v1: 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: @@ -69,7 +69,7 @@ v1: 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 diff --git a/monitoring/uss_qualifier/configurations/dev/faa/uft/local_message_signing.yaml b/monitoring/uss_qualifier/configurations/dev/faa/uft/local_message_signing.yaml deleted file mode 100644 index 7eaf59a31d..0000000000 --- a/monitoring/uss_qualifier/configurations/dev/faa/uft/local_message_signing.yaml +++ /dev/null @@ -1,65 +0,0 @@ -v1: - test_run: - resources: - resource_declarations: - "$ref": ../../library/resources.yaml#/common - flight_planners: - resource_type: resources.flight_planning.FlightPlannersResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planners: - - participant_id: uss1 - injection_base_url: http://host.docker.internal:8074/scdsc - - participant_id: uss2 - injection_base_url: http://host.docker.internal:8074/scdsc - - participant_id: mock_uss - injection_base_url: http://host.docker.internal:8074/scdsc - combination_selector: - resource_type: resources.flight_planning.FlightPlannerCombinationSelectorResource - specification: - must_include: - - mock_uss - maximum_roles: - mock_uss: 1 - 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 - priority_preemption_flights: - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: test_data.che.flight_intents.priority_preemption - dss: - resource_type: resources.astm.f3548.v21.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - base_url: http://host.docker.internal:8082 - mock_uss: - resource_type: resources.interuss.mock_uss.client.MockUSSResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: mock_uss - mock_uss_base_url: http://host.docker.internal:8074 - - action: - test_suite: - suite_type: suites.faa.uft.message_signing - resources: - mock_uss: mock_uss - flight_planners: flight_planners - combination_selector: combination_selector - conflicting_flights: conflicting_flights - priority_preemption_flights: priority_preemption_flights - dss: dss - - artifacts: - report: - report_path: output/report.json diff --git a/monitoring/uss_qualifier/configurations/dev/general_flight_auth.yaml b/monitoring/uss_qualifier/configurations/dev/general_flight_auth.yaml index ee0dd0e734..f9126e75d4 100644 --- a/monitoring/uss_qualifier/configurations/dev/general_flight_auth.yaml +++ b/monitoring/uss_qualifier/configurations/dev/general_flight_auth.yaml @@ -3,13 +3,12 @@ v1: test_run: resources: resource_declarations: - $ref: ./library/resources.yaml#/general_flight_authorization + example_flight_check_table: {$ref: 'library/resources.yaml#/example_flight_check_table'} action: test_scenario: scenario_type: scenarios.interuss.flight_authorization.GeneralFlightAuthorization resources: - table: flight_check_table - on_failure: Abort + table: example_flight_check_table artifacts: report: report_path: output/report_general_flight_auth.json diff --git a/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.json b/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.json deleted file mode 100644 index e06d3b0d09..0000000000 --- a/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "$content_schema": "monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json", - "v1": { - "test_run": { - "resources": { - "resource_declarations": { - "$ref": "./library/resources.yaml#/net_rid_sims" - } - }, - "action": { - "test_suite": { - "suite_definition": { - "name": "Generate RID test data twice", - "resources": { - "adjacent_circular_flights_data": "resources.netrid.FlightDataResource", - "adjacent_circular_storage_config": "resources.netrid.FlightDataStorageResource", - "kml_flights_data": "resources.netrid.FlightDataResource", - "kml_storage_config": "resources.netrid.FlightDataStorageResource" - }, - "actions": [ - { - "action_generator": { - "generator_type": "action_generators.repetition.Repeat", - "specification": { - "action_to_repeat": { - "test_suite": { - "suite_definition": { - "name": "Generate RID test data", - "resources": { - "adjacent_circular_flights_data": "resources.netrid.FlightDataResource", - "adjacent_circular_storage_config": "resources.netrid.FlightDataStorageResource", - "kml_flights_data": "resources.netrid.FlightDataResource", - "kml_storage_config": "resources.netrid.FlightDataStorageResource" - }, - "actions": [ - { - "test_scenario": { - "scenario_type": "scenarios.astm.netrid.StoreFlightData", - "resources": { - "flights_data": "adjacent_circular_flights_data", - "storage_configuration": "adjacent_circular_storage_config" - } - }, - "on_failure": "Continue" - }, - { - "test_scenario": { - "scenario_type": "scenarios.astm.netrid.StoreFlightData", - "resources": { - "flights_data": "kml_flights_data", - "storage_configuration": "kml_storage_config" - } - }, - "on_failure": "Continue" - } - ] - }, - "resources": { - "adjacent_circular_flights_data": "adjacent_circular_flights_data", - "adjacent_circular_storage_config": "adjacent_circular_storage_config", - "kml_flights_data": "kml_flights_data", - "kml_storage_config": "kml_storage_config" - } - }, - "on_failure": "Abort" - }, - "times_to_repeat": 2 - }, - "resources": { - "adjacent_circular_flights_data": "adjacent_circular_flights_data", - "adjacent_circular_storage_config": "adjacent_circular_storage_config", - "kml_flights_data": "kml_flights_data", - "kml_storage_config": "kml_storage_config" - } - }, - "on_failure": "Continue" - } - ] - }, - "resources": { - "adjacent_circular_flights_data": "adjacent_circular_flights_data", - "adjacent_circular_storage_config": "adjacent_circular_storage_config", - "kml_flights_data": "kml_flights_data", - "kml_storage_config": "kml_storage_config" - } - } - } - }, - "validation": { - "$ref": "./library/validation.yaml#/normal_test" - } - } -} diff --git a/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml b/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml new file mode 100644 index 0000000000..6ec98c40da --- /dev/null +++ b/monitoring/uss_qualifier/configurations/dev/generate_rid_test_data.yaml @@ -0,0 +1,65 @@ +$content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json +v1: + test_run: + resources: + resource_declarations: + che_adjacent_circular_flights_data: {$ref: 'library/resources.yaml#/che_adjacent_circular_flights_data'} + dc_flights_data: {$ref: 'library/resources.yaml#/dc_flights_data'} + + adjacent_circular_storage_config: {$ref: 'library/resources.yaml#/adjacent_circular_storage_config'} + kml_storage_config: {$ref: 'library/resources.yaml#/kml_storage_config'} + action: + test_suite: + resources: + adjacent_circular_flights_data: che_adjacent_circular_flights_data + adjacent_circular_storage_config: adjacent_circular_storage_config + kml_flights_data: dc_flights_data + kml_storage_config: kml_storage_config + suite_definition: + name: Generate RID test data twice + resources: + adjacent_circular_flights_data: resources.netrid.FlightDataResource + adjacent_circular_storage_config: resources.netrid.FlightDataStorageResource + kml_flights_data: resources.netrid.FlightDataResource + kml_storage_config: resources.netrid.FlightDataStorageResource + actions: + - action_generator: + generator_type: action_generators.repetition.Repeat + specification: + action_to_repeat: + test_suite: + suite_definition: + name: Generate RID test data + resources: + adjacent_circular_flights_data: resources.netrid.FlightDataResource + adjacent_circular_storage_config: resources.netrid.FlightDataStorageResource + kml_flights_data: resources.netrid.FlightDataResource + kml_storage_config: resources.netrid.FlightDataStorageResource + actions: + - test_scenario: + scenario_type: scenarios.astm.netrid.StoreFlightData + resources: + flights_data: adjacent_circular_flights_data + storage_configuration: adjacent_circular_storage_config + on_failure: Continue + - test_scenario: + scenario_type: scenarios.astm.netrid.StoreFlightData + resources: + flights_data: kml_flights_data + storage_configuration: kml_storage_config + on_failure: Continue + resources: + adjacent_circular_flights_data: adjacent_circular_flights_data + adjacent_circular_storage_config: adjacent_circular_storage_config + kml_flights_data: kml_flights_data + kml_storage_config: kml_storage_config + on_failure: Abort + times_to_repeat: 2 + resources: + adjacent_circular_flights_data: adjacent_circular_flights_data + adjacent_circular_storage_config: adjacent_circular_storage_config + kml_flights_data: kml_flights_data + kml_storage_config: kml_storage_config + on_failure: Continue + validation: + "$ref": "./library/validation.yaml#/normal_test" diff --git a/monitoring/uss_qualifier/configurations/dev/geospatial_comprehension.yaml b/monitoring/uss_qualifier/configurations/dev/geospatial_comprehension.yaml index 9e45824562..d96d005596 100644 --- a/monitoring/uss_qualifier/configurations/dev/geospatial_comprehension.yaml +++ b/monitoring/uss_qualifier/configurations/dev/geospatial_comprehension.yaml @@ -3,13 +3,12 @@ v1: test_run: resources: resource_declarations: - $ref: ./library/resources.yaml#/geospatial_map + example_feature_check_table: {$ref: 'library/resources.yaml#/example_feature_check_table'} action: test_scenario: scenario_type: scenarios.interuss.geospatial_map.GeospatialFeatureComprehension resources: - table: feature_check_table - on_failure: Abort + table: example_feature_check_table artifacts: report: report_path: output/report_geospatial_comprehension.json diff --git a/monitoring/uss_qualifier/configurations/dev/library/README.md b/monitoring/uss_qualifier/configurations/dev/library/README.md index 929b9d0383..509245ed73 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/README.md +++ b/monitoring/uss_qualifier/configurations/dev/library/README.md @@ -1,5 +1,5 @@ -# dev library +# dev configuration library This folder contains configuration components intended to be included in other components or configurations. -The field `$content_schema` is used to annotate intended content type, and matching JSON Schema may be found in the [`schemas` folder of this repo](../../../../../schemas). +The field `$content_schema` is used to annotate intended content type, and matching JSON Schema may be found in the [`schemas` folder of this repo](../../../../../schemas). Its value is not used programmatically. diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment.yaml index 89eace0848..eb42d6ad5d 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/environment.yaml +++ b/monitoring/uss_qualifier/configurations/dev/library/environment.yaml @@ -1,211 +1 @@ -# The resources in this file describe the system/environment under test and should not change the test being run. - -non_baseline_inputs: - non_baseline_inputs: - - v1.test_run.resources.resource_declarations.utm_auth - - v1.test_run.resources.resource_declarations.netrid_service_providers_v19 - - v1.test_run.resources.resource_declarations.netrid_service_providers_v22a - - v1.test_run.resources.resource_declarations.netrid_observers_v19 - - v1.test_run.resources.resource_declarations.netrid_observers_v22a - - v1.test_run.resources.resource_declarations.netrid_dss_instances_v19 - - v1.test_run.resources.resource_declarations.netrid_dss_instances_v22a - - v1.test_run.resources.resource_declarations.netrid_dss_instance_v19 - - v1.test_run.resources.resource_declarations.netrid_dss_instance_v22a - - v1.test_run.resources.resource_declarations.flight_planners - - v1.test_run.resources.resource_declarations.dss - - v1.test_run.resources.resource_declarations.uss1 - - v1.test_run.resources.resource_declarations.uss2 - - -common: - utm_auth: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.communications.AuthAdapterResource - specification: - environment_variable_containing_auth_spec: AUTH_SPEC - -net_rid: - netrid_service_providers_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDServiceProviders - dependencies: - auth_adapter: utm_auth - specification: - service_providers: - - participant_id: uss2 - injection_base_url: http://v19.ridsp.uss2.localutm/ridsp/injection - local_debug: true - netrid_service_providers_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDServiceProviders - dependencies: - auth_adapter: utm_auth - specification: - service_providers: - - participant_id: uss1 - injection_base_url: http://v22a.ridsp.uss1.localutm/ridsp/injection - local_debug: true - netrid_observers_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDObserversResource - dependencies: - auth_adapter: utm_auth - specification: - observers: - - participant_id: uss3 - observation_base_url: http://v19.riddp.uss3.localutm/riddp/observation - local_debug: true - netrid_observers_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDObserversResource - dependencies: - auth_adapter: utm_auth - specification: - observers: - - participant_id: uss1 - observation_base_url: http://v22a.riddp.uss1.localutm/riddp/observation - local_debug: true - netrid_dss_instances_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - 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: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - 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 - netrid_dss_instance_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - rid_version: F3411-19 - base_url: http://dss.uss1.localutm - has_private_address: true - netrid_dss_instance_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - rid_version: F3411-22a - base_url: http://dss.uss1.localutm/rid/v2 - has_private_address: true - -f3548: - flight_planners: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannersResource - dependencies: - 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 - local_debug: true - - # The atproxy has been disabled since it is suspected to be responsible of issue #28. Replaced by another simple mock_uss - # # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled - # - participant_id: uss2 - # injection_base_url: http://host.docker.internal:8075/scd - - # uss2 is the mock_uss directly exposing scdsc functionality - - participant_id: uss2 - injection_base_url: http://scdsc.uss2.localutm/scdsc - local_debug: true - scd_dss: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - base_url: http://dss.uss1.localutm - has_private_address: true - scd_dss_instances: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.DSSInstancesResource - dependencies: - auth_adapter: utm_auth - specification: - dss_instances: - - participant_id: uss1 - base_url: http://dss.uss1.localutm - has_private_address: true - - participant_id: uss2 - base_url: http://dss.uss2.localutm - has_private_address: true - -f3548_single_scenario: - uss1: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannerResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planner: - participant_id: uss1 - injection_base_url: http://scdsc.uss1.localutm/scdsc - local_debug: true - uss2: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannerResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planner: - participant_id: uss2 - injection_base_url: http://scdsc.uss2.localutm/scdsc - local_debug: true - -mock_uss_instances: - mock_uss_instances_scdsc: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.mock_uss.client.MockUSSsResource - dependencies: - auth_adapter: utm_auth - specification: - instances: - - mock_uss_base_url: http://scdsc.uss1.localutm - participant_id: uss1 - - mock_uss_base_url: http://scdsc.uss2.localutm - participant_id: uss2 - -scd_version_providers: - version_providers: - resource_type: resources.versioning.VersionProvidersResource - dependencies: - auth_adapter: utm_auth - specification: - instances: - - participant_id: uss1 - interuss: - base_url: http://scdsc.uss1.localutm/versioning - - participant_id: uss2 - interuss: - base_url: http://scdsc.uss2.localutm/versioning +$ref: environment_containers.yaml diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml new file mode 100644 index 0000000000..7e593e6127 --- /dev/null +++ b/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml @@ -0,0 +1,217 @@ +# The resources in this file describe the system/environment under test and should not change the test being run. +# This file assumes the use of a container-based local environment. + +# ===== Auth ===== + +utm_auth: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.communications.AuthAdapterResource + specification: + environment_variable_containing_auth_spec: AUTH_SPEC + +# ===== NetRID ===== + +netrid_service_providers_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDServiceProviders + dependencies: + auth_adapter: utm_auth + specification: + service_providers: + - participant_id: uss2 + injection_base_url: http://v19.ridsp.uss2.localutm/ridsp/injection + local_debug: true + +netrid_service_providers_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDServiceProviders + dependencies: + auth_adapter: utm_auth + specification: + service_providers: + - participant_id: uss1 + injection_base_url: http://v22a.ridsp.uss1.localutm/ridsp/injection + local_debug: true + +netrid_observers_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDObserversResource + dependencies: + auth_adapter: utm_auth + specification: + observers: + - participant_id: uss3 + observation_base_url: http://v19.riddp.uss3.localutm/riddp/observation + local_debug: true + +netrid_observers_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDObserversResource + dependencies: + auth_adapter: utm_auth + specification: + observers: + - participant_id: uss1 + observation_base_url: http://v22a.riddp.uss1.localutm/riddp/observation + local_debug: true + +netrid_dss_instances_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + 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: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + 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 + +netrid_dss_instance_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + rid_version: F3411-19 + base_url: http://dss.uss1.localutm + has_private_address: true + +netrid_dss_instance_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + rid_version: F3411-22a + base_url: http://dss.uss1.localutm/rid/v2 + has_private_address: true + +# ===== Flight planning ===== + +all_flight_planners: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannersResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planners: + - participant_id: uss1 + injection_base_url: http://scdsc.uss1.localutm/scdsc + local_debug: true + + # The atproxy has been disabled since it is suspected to be responsible of issue #28. Replaced by another simple mock_uss + # # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled + # - participant_id: uss2 + # injection_base_url: http://host.docker.internal:8075/scd + + - participant_id: uss2 + injection_base_url: http://scdsc.uss2.localutm/scdsc + local_debug: true + +uss1_flight_planner: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannerResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planner: + participant_id: uss1 + injection_base_url: http://scdsc.uss1.localutm/scdsc + local_debug: true + +uss2_flight_planner: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannerResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planner: + participant_id: uss2 + injection_base_url: http://scdsc.uss2.localutm/scdsc + local_debug: true + +# ===== F3548 ===== + +scd_dss: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3548.v21.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + base_url: http://dss.uss1.localutm + has_private_address: true + +scd_dss_instances: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3548.v21.DSSInstancesResource + dependencies: + auth_adapter: utm_auth + specification: + dss_instances: + - participant_id: uss1 + base_url: http://dss.uss1.localutm + has_private_address: true + - participant_id: uss2 + base_url: http://dss.uss2.localutm + has_private_address: true + +# ===== mock_uss instances ===== + +mock_uss_instance_uss1: + resource_type: resources.interuss.mock_uss.client.MockUSSResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: mock_uss + mock_uss_base_url: http://scdsc.uss1.localutm + +mock_uss_instances_scdsc: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.mock_uss.client.MockUSSsResource + dependencies: + auth_adapter: utm_auth + specification: + instances: + - mock_uss_base_url: http://scdsc.uss1.localutm + participant_id: uss1 + - mock_uss_base_url: http://scdsc.uss2.localutm + participant_id: uss2 + +# ===== System versioning ===== + +scd_version_providers: + resource_type: resources.versioning.VersionProvidersResource + dependencies: + auth_adapter: utm_auth + specification: + instances: + - participant_id: uss1 + interuss: + base_url: http://scdsc.uss1.localutm/versioning + - participant_id: uss2 + interuss: + base_url: http://scdsc.uss2.localutm/versioning diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml new file mode 100644 index 0000000000..e25be6824d --- /dev/null +++ b/monitoring/uss_qualifier/configurations/dev/library/environment_localhost.yaml @@ -0,0 +1,217 @@ +# The resources in this file describe the system/environment under test and should not change the test being run. +# This file assumes the use of a host-machine local environment. + +# ===== Auth ===== + +utm_auth: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.communications.AuthAdapterResource + specification: + environment_variable_containing_auth_spec: AUTH_SPEC + +# ===== NetRID ===== + +netrid_service_providers_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDServiceProviders + dependencies: + auth_adapter: utm_auth + specification: + service_providers: + - participant_id: uss2 + injection_base_url: http://localhost:8071/ridsp/injection + local_debug: true + +netrid_service_providers_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDServiceProviders + dependencies: + auth_adapter: utm_auth + specification: + service_providers: + - participant_id: uss1 + injection_base_url: http://localhost:8081/ridsp/injection + local_debug: true + +netrid_observers_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDObserversResource + dependencies: + auth_adapter: utm_auth + specification: + observers: + - participant_id: uss3 + observation_base_url: http://localhost:8073/riddp/observation + local_debug: true + +netrid_observers_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.NetRIDObserversResource + dependencies: + auth_adapter: utm_auth + specification: + observers: + - participant_id: uss1 + observation_base_url: http://localhost:8083/riddp/observation + local_debug: true + +netrid_dss_instances_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstancesResource + dependencies: + auth_adapter: utm_auth + specification: + dss_instances: + - participant_id: uss1 + rid_version: F3411-19 + base_url: http://localhost:8082 + has_private_address: true + - participant_id: uss2 + rid_version: F3411-19 + base_url: http://localhost:8082 + has_private_address: true + +netrid_dss_instances_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstancesResource + dependencies: + auth_adapter: utm_auth + specification: + dss_instances: + - participant_id: uss1 + rid_version: F3411-22a + base_url: http://localhost:8082/rid/v2 + has_private_address: true + - participant_id: uss2 + rid_version: F3411-22a + base_url: http://localhost:8082/rid/v2 + has_private_address: true + +netrid_dss_instance_v19: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + rid_version: F3411-19 + base_url: http://localhost:8082 + has_private_address: true + +netrid_dss_instance_v22a: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3411.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + rid_version: F3411-22a + base_url: http://localhost:8082/rid/v2 + has_private_address: true + +# ===== Flight planning ===== + +all_flight_planners: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannersResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planners: + - participant_id: uss1 + injection_base_url: http://localhost:8074/scdsc + local_debug: true + + # The atproxy has been disabled since it is suspected to be responsible of issue #28. Replaced by another simple mock_uss + # # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled + # - participant_id: uss2 + # injection_base_url: http://host.docker.internal:8075/scd + + - participant_id: uss2 + injection_base_url: http://localhost:8094/scdsc + local_debug: true + +uss1_flight_planner: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannerResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planner: + participant_id: uss1 + injection_base_url: http://localhost:8074/scdsc + local_debug: true + +uss2_flight_planner: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightPlannerResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planner: + participant_id: uss2 + injection_base_url: http://localhost:8094/scdsc + local_debug: true + +# ===== F3548 ===== + +scd_dss: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3548.v21.DSSInstanceResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: uss1 + base_url: http://localhost:8082 + has_private_address: true + +scd_dss_instances: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.astm.f3548.v21.DSSInstancesResource + dependencies: + auth_adapter: utm_auth + specification: + dss_instances: + - participant_id: uss1 + base_url: http://localhost:8082 + has_private_address: true + - participant_id: uss2 + base_url: http://localhost:8082 + has_private_address: true + +# ===== mock_uss instances ===== + +mock_uss_instance_uss1: + resource_type: resources.interuss.mock_uss.client.MockUSSResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: mock_uss + mock_uss_base_url: http://localhost:8074 + +mock_uss_instances_scdsc: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.mock_uss.client.MockUSSsResource + dependencies: + auth_adapter: utm_auth + specification: + instances: + - mock_uss_base_url: http://localhost:8074 + participant_id: uss1 + - mock_uss_base_url: http://localhost:8094 + participant_id: uss2 + +# ===== System versioning ===== + +scd_version_providers: + resource_type: resources.versioning.VersionProvidersResource + dependencies: + auth_adapter: utm_auth + specification: + instances: + - participant_id: uss1 + interuss: + base_url: http://localhost:8074/versioning + - participant_id: uss2 + interuss: + base_url: http://localhost:8094/versioning diff --git a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml index 2914bf1bf4..a6b42a181c 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml +++ b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml @@ -1,393 +1,375 @@ -all: - allOf: - - $ref: '#/uspace' - - $ref: '#/net_rid_sims' - - $ref: '#/general_flight_authorization' - - $ref: '#/geospatial_map' - - $ref: '#/mock_uss_instances' - - $ref: '#/uspace_versioning' +# ===== NetRID ===== -uspace: - allOf: - - $ref: '#/net_rid' - - $ref: '#/flight_auth' - - $ref: '#/uspace_versioning' +netrid_observation_evaluation_configuration: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.EvaluationConfigurationResource + specification: { } -net_rid: - allOf: - - $ref: '#/common' - - $ref: 'environment.yaml#/net_rid' - netrid_observation_evaluation_configuration: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.EvaluationConfigurationResource - specification: { } - id_generator: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.IDGeneratorResource - dependencies: - auth_adapter: utm_auth - specification: - whoami_audience: localhost - whoami_scope: rid.display_provider - service_area: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - 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: # A huge (as in "too big") area for checks around area sizes - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.VerticesResource - specification: - vertices: - - lat: -23 - lng: 130 - - lat: -24 - lng: 130 - - lat: -24 - lng: 132 - - lat: -23 - lng: 132 +id_generator: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.IDGeneratorResource + dependencies: + auth_adapter: utm_auth + specification: + whoami_audience: localhost + whoami_scope: rid.display_provider -net_rid_sims: - adjacent_circular_flights_data: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataResource - specification: - adjacent_circular_flights_simulation_source: { } - adjacent_circular_storage_config: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataStorageResource - specification: - flight_record_collection_path: "./output/test_data.che.netrid.circular_flights.json" - kml_flights_data: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataResource - specification: - kml_source: - kml_file: - path: file://./test_data/usa/netrid/dcdemo.kml - kml_storage_config: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataStorageResource - specification: - flight_record_collection_path: "./output/test_data.usa.netrid.dcdemo_flights.json" - kentland_flights_data: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataResource - specification: - kml_source: - kml_file: - path: file://./test_data/usa/kentland/rid.kml - flight_start_delay: 5s - foca_flights_data: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.FlightDataResource - specification: - kml_source: - kml_file: - path: file://./test_data/che/rid/foca.kml - flight_start_delay: 5s +kentland_service_area: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + 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' -flight_auth: - $ref: '#/f3548_che' - invalid_flight_auth_flights: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: file://./test_data/che/flight_intents/invalid_flight_auths.json +au_problematically_big_area: # A huge (as in "too big") area for checks around area sizes + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.VerticesResource + specification: + vertices: + - lat: -23 + lng: 130 + - lat: -24 + lng: 130 + - lat: -24 + lng: 132 + - lat: -23 + lng: 132 -che_flight_intents: - conflicting_flights: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: file://./test_data/che/flight_intents/conflicting_flights.json - priority_preemption_flights: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: test_data.che.flight_intents.priority_preemption - # Note that this hash_sha512 field can be safely deleted if the content changes - hash_sha512: 432ea57009b6a41b3af43cb9431a0627a487eac0a04511fbccd85d9fcac193b11976ad2dbc07d9efa41ceaf7a9338b39064ede6eeb5755be3966d2e17e7d555a - invalid_flight_intents: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: test_data.che.flight_intents.invalid_flight_intents +kentland_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 -kentland_flight_intents: - conflicting_flights: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: file://./test_data/usa/kentland/flight_intents/conflicting_flights.yaml - priority_preemption_flights: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: test_data.usa.kentland.flight_intents.priority_preemption - invalid_flight_intents: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightIntentsResource - specification: - planning_time: '0:05:00' - file: - path: test_data.usa.kentland.flight_intents.invalid_flight_intents +# ===== NetRID flights data ===== -f3548_che: - allOf: - - $ref: '#/f3548' - - $ref: '#/che_flight_intents' +che_adjacent_circular_flights_data: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataResource + specification: + adjacent_circular_flights_simulation_source: { } -f3548_kentland: - allOf: - - $ref: '#/f3548' - - $ref: '#/kentland_flight_intents' +dc_flights_data: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataResource + specification: + kml_source: + kml_file: + path: file://./test_data/usa/netrid/dcdemo.kml -f3548: - allOf: - - $ref: '#/common' - - $ref: 'environment.yaml#/f3548' +kentland_flights_data: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataResource + specification: + kml_source: + kml_file: + path: file://./test_data/usa/kentland/rid.kml + flight_start_delay: 5s -f3548_single_scenario: - allOf: - - $ref: '#/f3548_che' - - $ref: 'environment.yaml#/f3548_single_scenario' +foca_flights_data: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataResource + specification: + kml_source: + kml_file: + path: file://./test_data/che/rid/foca.kml + flight_start_delay: 5s -general_flight_authorization: - flight_check_table: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.flight_authorization.FlightCheckTableResource - specification: - table: - rows: - - flight_check_id: TEST_001 - requirement_ids: - - REQ_002 - - REQ_007 - description: The first test step defined by the test designer - additional_information: - new_jurisdiction_x: - operation_rule_set: Rules1 - volumes: - - outline_circle: - center: - lng: 7.4774 - lat: 46.9749 - radius: - value: 100 - units: M - altitude_lower: - value: 0 - units: M - reference: SFC - altitude_upper: +# ===== NetRID data generation/simulation/storage ===== + +adjacent_circular_storage_config: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataStorageResource + specification: + flight_record_collection_path: "./output/test_data.che.netrid.circular_flights.json" + +kml_storage_config: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.netrid.FlightDataStorageResource + specification: + flight_record_collection_path: "./output/test_data.usa.netrid.dcdemo_flights.json" + +# ===== Flight planning intents ===== + +che_invalid_flight_auth_flights: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: file://./test_data/che/flight_intents/invalid_flight_auths.json + +che_conflicting_flights: + # Includes flight intents for both equal-priority-not-permitted and higher-priority + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: file://./test_data/che/flight_intents/conflicting_flights.json + # Note that this hash_sha512 field can be safely deleted if the content changes + hash_sha512: 432ea57009b6a41b3af43cb9431a0627a487eac0a04511fbccd85d9fcac193b11976ad2dbc07d9efa41ceaf7a9338b39064ede6eeb5755be3966d2e17e7d555a + +che_invalid_flight_intents: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: test_data.che.flight_intents.invalid_flight_intents + +kentland_conflicting_flights: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: file://./test_data/usa/kentland/flight_intents/conflicting_flights.yaml + +kentland_priority_preemption_flights: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: test_data.usa.kentland.flight_intents.priority_preemption + +kentland_invalid_flight_intents: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.flight_planning.FlightIntentsResource + specification: + planning_time: '0:05:00' + file: + path: test_data.usa.kentland.flight_intents.invalid_flight_intents + +# ===== General flight authorization ===== + +example_flight_check_table: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.flight_authorization.FlightCheckTableResource + specification: + table: + rows: + - flight_check_id: TEST_001 + requirement_ids: + - REQ_002 + - REQ_007 + description: The first test step defined by the test designer + additional_information: + new_jurisdiction_x: + operation_rule_set: Rules1 + volumes: + - outline_circle: + center: + lng: 7.4774 + lat: 46.9749 + radius: value: 100 units: M - reference: SFC - start_time: - start_of_test: {} - use_timezone: Europe/Berlin - end_time: - offset_from: - starting_from: - next_day: - time_zone: Europe/Zurich - starting_from: - start_of_test: {} - days_of_the_week: ["Tu", "Th"] - offset: 12h - acceptance_expectation: MustBeAccepted - - flight_check_id: TEST_002 - requirement_ids: - - REQ_001 - - REQ_003 - - REQ_004 - description: The second test step defined by the test designer - additional_information: - new_jurisdiction_x: - operation_rule_set: Rules1 - volumes: - - outline_circle: - center: - lng: 7.4774 - lat: 46.9749 - radius: - value: 100 - units: M - altitude_lower: - value: 50 + altitude_lower: + value: 0 + units: M + reference: SFC + altitude_upper: + value: 100 + units: M + reference: SFC + start_time: + start_of_test: { } + use_timezone: Europe/Berlin + end_time: + offset_from: + starting_from: + next_day: + time_zone: Europe/Zurich + starting_from: + start_of_test: { } + days_of_the_week: [ "Tu", "Th" ] + offset: 12h + acceptance_expectation: MustBeAccepted + - flight_check_id: TEST_002 + requirement_ids: + - REQ_001 + - REQ_003 + - REQ_004 + description: The second test step defined by the test designer + additional_information: + new_jurisdiction_x: + operation_rule_set: Rules1 + volumes: + - outline_circle: + center: + lng: 7.4774 + lat: 46.9749 + radius: + value: 100 units: M - reference: SFC - altitude_upper: - value: 5000 - units: FT - reference: W84 - start_time: - next_day: - time_zone: +02:00 - starting_from: - offset_from: - starting_from: - start_of_test: {} - offset: 12h - duration: 5m - conditions_expectation: MustBePresent + altitude_lower: + value: 50 + units: M + reference: SFC + altitude_upper: + value: 5000 + units: FT + reference: W84 + start_time: + next_day: + time_zone: +02:00 + starting_from: + offset_from: + starting_from: + start_of_test: { } + offset: 12h + duration: 5m + conditions_expectation: MustBePresent -geospatial_map: - feature_check_table: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.geospatial_map.FeatureCheckTableResource - specification: - table: - rows: - - geospatial_check_id: TEST_001 - requirement_ids: - - REQ_002 - - REQ_007 - description: The first test step defined by the test designer - operation_rule_set: Rules1 - restriction_source: ThisRegulator - volumes: - - outline_circle: - center: - lng: 7.4774 - lat: 46.9749 - radius: - value: 100 - units: M - altitude_lower: - value: 0 +# ===== Geospatial feature comprehension ===== + +example_feature_check_table: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.geospatial_map.FeatureCheckTableResource + specification: + table: + rows: + - geospatial_check_id: TEST_001 + requirement_ids: + - REQ_002 + - REQ_007 + description: The first test step defined by the test designer + operation_rule_set: Rules1 + restriction_source: ThisRegulator + volumes: + - outline_circle: + center: + lng: 7.4774 + lat: 46.9749 + radius: + value: 100 units: M - reference: SFC - altitude_upper: + altitude_lower: + value: 0 + units: M + reference: SFC + altitude_upper: + value: 100 + units: M + reference: SFC + start_time: + start_of_test: { } + end_time: + offset_from: + starting_from: + next_day: + time_zone: Europe/Zurich + starting_from: + start_of_test: { } + days_of_the_week: [ "Mo", "Fr" ] + offset: 12h + expected_result: Block + - geospatial_check_id: TEST_002 + requirement_ids: + - REQ_001 + - REQ_003 + - REQ_004 + description: The second test step defined by the test designer + operation_rule_set: Rules1 + restriction_source: ThisRegulator + volumes: + - outline_circle: + center: + lng: 7.4774 + lat: 46.9749 + radius: value: 100 units: M - reference: SFC - start_time: - start_of_test: {} - end_time: - offset_from: - starting_from: - next_day: - time_zone: Europe/Zurich - starting_from: - start_of_test: {} - days_of_the_week: ["Mo", "Fr"] - offset: 12h - expected_result: Block - - geospatial_check_id: TEST_002 - requirement_ids: - - REQ_001 - - REQ_003 - - REQ_004 - description: The second test step defined by the test designer - operation_rule_set: Rules1 - restriction_source: ThisRegulator - volumes: - - outline_circle: - center: - lng: 7.4774 - lat: 46.9749 - radius: - value: 100 - units: M - altitude_lower: - value: 50 + altitude_lower: + value: 50 + units: M + reference: SFC + altitude_upper: + value: 5000 + units: FT + reference: W84 + start_time: + next_day: + time_zone: Europe/Zurich + starting_from: + offset_from: + starting_from: + start_of_test: { } + offset: 12h + use_timezone: +01:00 + duration: 5m + expected_result: Advise + - geospatial_check_id: TEST_002 + requirement_ids: + - REQ_001 + - REQ_003 + - REQ_004 + description: The second test step defined by the test designer + operation_rule_set: Rules1 + restriction_source: ThisRegulator + volumes: + - outline_circle: + center: + lng: 7.4774 + lat: 46.9749 + radius: + value: 100 units: M - reference: SFC - altitude_upper: - value: 5000 - units: FT - reference: W84 - start_time: - next_day: - time_zone: Europe/Zurich - starting_from: - offset_from: - starting_from: - start_of_test: {} - offset: 12h - use_timezone: +01:00 - duration: 5m - expected_result: Advise - - geospatial_check_id: TEST_002 - requirement_ids: - - REQ_001 - - REQ_003 - - REQ_004 - description: The second test step defined by the test designer - operation_rule_set: Rules1 - restriction_source: ThisRegulator - volumes: - - outline_circle: - center: + altitude_upper: + value: 400 + units: FT + reference: SFC + end_time: + next_sun_position: + elevation_deg: -0.833 # Sunset + observed_from: lng: 7.4774 lat: 46.9749 - radius: - value: 100 - units: M - altitude_upper: - value: 400 - units: FT - reference: SFC - end_time: - next_sun_position: - elevation_deg: -0.833 # Sunset - observed_from: - lng: 7.4774 - lat: 46.9749 - starting_from: - offset_from: - starting_from: - next_day: - time_zone: Europe/Zurich - starting_from: - start_of_test: {} - offset: 12h - duration: 5m - expected_result: Advise -common: - $ref: 'environment.yaml#/common' + starting_from: + offset_from: + starting_from: + next_day: + time_zone: Europe/Zurich + starting_from: + start_of_test: { } + offset: 12h + duration: 5m + expected_result: Advise + +# ===== mock_uss behavioral control ===== + +locality_che: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.interuss.mock_uss.locality.LocalityResource + specification: + locality_code: CHE -mock_uss_instances: - $ref: 'environment.yaml#/mock_uss_instances' - locality_che: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.mock_uss.locality.LocalityResource - specification: - locality_code: CHE +# ===== System versioning ===== -uspace_versioning: - $ref: 'environment.yaml#/scd_version_providers' - uspace_system_identity: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.versioning.SystemIdentityResource - specification: - system_identity: uspace.ussp +uspace_system_identity: + $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json + resource_type: resources.versioning.SystemIdentityResource + specification: + system_identity: uspace.ussp diff --git a/monitoring/uss_qualifier/configurations/dev/message_signing.yaml b/monitoring/uss_qualifier/configurations/dev/message_signing.yaml new file mode 100644 index 0000000000..4a3df3ea85 --- /dev/null +++ b/monitoring/uss_qualifier/configurations/dev/message_signing.yaml @@ -0,0 +1,55 @@ +v1: + test_run: + resources: + resource_declarations: + che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'} + che_priority_preemption_flights: {$ref: 'library/resources.yaml#/che_priority_preemption_flights'} + che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'} + combination_selector: + resource_type: resources.flight_planning.FlightPlannerCombinationSelectorResource + specification: + must_include: + - mock_uss + maximum_roles: + mock_uss: 1 + + utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} + scd_dss: {$ref: 'library/environment.yaml#/scd_dss'} + flight_planners: + resource_type: resources.flight_planning.FlightPlannersResource + dependencies: + auth_adapter: utm_auth + specification: + flight_planners: + - participant_id: uss1 + injection_base_url: http://host.docker.internal:8074/scdsc + - participant_id: uss2 + injection_base_url: http://host.docker.internal:8074/scdsc + - participant_id: mock_uss + injection_base_url: http://host.docker.internal:8074/scdsc + mock_uss: + resource_type: resources.interuss.mock_uss.client.MockUSSResource + dependencies: + auth_adapter: utm_auth + specification: + participant_id: mock_uss + mock_uss_base_url: http://host.docker.internal:8074 + non_baseline_inputs: + - v1.test_run.resources.resource_declarations.utm_auth + - v1.test_run.resources.resource_declarations.all_flight_planners + - v1.test_run.resources.resource_declarations.scd_dss + - v1.test_run.resources.resource_declarations.mock_uss_instance_uss1 + action: + test_suite: + suite_type: suites.faa.uft.message_signing + resources: + mock_uss: mock_uss + flight_planners: flight_planners + combination_selector: combination_selector + conflicting_flights: che_conflicting_flights + priority_preemption_flights: che_priority_preemption_flights + dss: scd_dss + + artifacts: + report: + report_path: output/report_message_signing.json diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml index 58e5e85459..65e3b32062 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml @@ -1,42 +1,56 @@ $content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json v1: - test_run: + test_run: + resources: + resource_declarations: + kentland_flights_data: {$ref: 'library/resources.yaml#/kentland_flights_data'} + netrid_observation_evaluation_configuration: {$ref: 'library/resources.yaml#/netrid_observation_evaluation_configuration'} + id_generator: {$ref: 'library/resources.yaml#/id_generator'} + kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} + au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} + + utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} + netrid_service_providers_v19: {$ref: 'library/environment.yaml#/netrid_service_providers_v19'} + netrid_observers_v19: {$ref: 'library/environment.yaml#/netrid_observers_v19'} + 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_service_providers_v19 + - v1.test_run.resources.resource_declarations.netrid_observers_v19 + - v1.test_run.resources.resource_declarations.netrid_dss_instances_v19 + action: + test_suite: + suite_type: suites.astm.netrid.f3411_19 resources: - resource_declarations: - $ref: ./library/resources.yaml#/all - action: - test_suite: - suite_type: suites.astm.netrid.f3411_19 - resources: - flights_data: kentland_flights_data - service_providers: netrid_service_providers_v19 - observers: netrid_observers_v19 - evaluation_configuration: netrid_observation_evaluation_configuration - dss_instances: netrid_dss_instances_v19 - id_generator: id_generator - service_area: service_area - problematically_big_area: problematically_big_area - artifacts: - report: - report_path: output/report_netrid_v19.json - tested_roles: - report_path: output/tested_roles_netrid_v19 - tested_requirements: - output_path: output/tested_requirements_f3411v19 - requirement_collections: - sp_dp_dss: - requirement_sets: - - astm.f3411.v19.service_provider#Tested by automated tests - - astm.f3411.v19.display_provider#Automated verification - - astm.f3411.v19.dss_provider - sp_dss: - requirement_sets: - - astm.f3411.v19.service_provider#Tested by automated tests - - astm.f3411.v19.dss_provider - participant_requirements: - uss1: sp_dp_dss - uss2: sp_dss - sequence_view: - output_path: output/sequence_netrid_v19 - validation: - $ref: ./library/validation.yaml#/normal_test + flights_data: kentland_flights_data + service_providers: netrid_service_providers_v19 + observers: netrid_observers_v19 + evaluation_configuration: netrid_observation_evaluation_configuration + dss_instances: netrid_dss_instances_v19 + id_generator: id_generator + service_area: kentland_service_area + problematically_big_area: au_problematically_big_area + artifacts: + report: + report_path: output/report_netrid_v19.json + tested_roles: + report_path: output/tested_roles_netrid_v19 + tested_requirements: + output_path: output/tested_requirements_f3411v19 + requirement_collections: + sp_dp_dss: + requirement_sets: + - astm.f3411.v19.service_provider#Tested by automated tests + - astm.f3411.v19.display_provider#Automated verification + - astm.f3411.v19.dss_provider + sp_dss: + requirement_sets: + - astm.f3411.v19.service_provider#Tested by automated tests + - astm.f3411.v19.dss_provider + participant_requirements: + uss1: sp_dp_dss + uss2: sp_dss + sequence_view: + output_path: output/sequence_netrid_v19 + validation: + $ref: ./library/validation.yaml#/normal_test diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml index 0405c07c31..7d919e2ebd 100644 --- a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml +++ b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml @@ -1,42 +1,56 @@ $content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json v1: - test_run: + test_run: + resources: + resource_declarations: + kentland_flights_data: {$ref: 'library/resources.yaml#/kentland_flights_data'} + netrid_observation_evaluation_configuration: {$ref: 'library/resources.yaml#/netrid_observation_evaluation_configuration'} + id_generator: {$ref: 'library/resources.yaml#/id_generator'} + kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} + au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} + + utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} + netrid_service_providers_v22a: {$ref: 'library/environment.yaml#/netrid_service_providers_v22a'} + netrid_observers_v22a: {$ref: 'library/environment.yaml#/netrid_observers_v22a'} + netrid_dss_instances_v22a: {$ref: 'library/environment.yaml#/netrid_dss_instances_v22a'} + non_baseline_inputs: + - v1.test_run.resources.resource_declarations.utm_auth + - v1.test_run.resources.resource_declarations.netrid_service_providers_v22a + - v1.test_run.resources.resource_declarations.netrid_observers_v22a + - v1.test_run.resources.resource_declarations.netrid_dss_instances_v22a + action: + test_suite: + suite_type: suites.astm.netrid.f3411_22a resources: - resource_declarations: - $ref: ./library/resources.yaml#/all - action: - test_suite: - suite_type: suites.astm.netrid.f3411_22a - resources: - flights_data: kentland_flights_data - service_providers: netrid_service_providers_v22a - observers: netrid_observers_v22a - evaluation_configuration: netrid_observation_evaluation_configuration - dss_instances: netrid_dss_instances_v22a - id_generator: id_generator - service_area: service_area - problematically_big_area: problematically_big_area - artifacts: - report: - report_path: output/report_netrid_v22a.json - tested_roles: - report_path: output/tested_roles_netrid_v22a - tested_requirements: - output_path: output/tested_requirements_f3411v22a - requirement_collections: - sp_dp_dss: - requirement_sets: - - astm.f3411.v22a.service_provider#Mandatory requirements - - astm.f3411.v22a.display_provider#Mandatory requirements - - astm.f3411.v22a.dss_provider - sp_dss: - requirement_sets: - - astm.f3411.v22a.service_provider#Mandatory requirements - - astm.f3411.v22a.dss_provider - participant_requirements: - uss1: sp_dp_dss - uss2: sp_dss - sequence_view: - output_path: output/sequence_netrid_v22a - validation: - $ref: ./library/validation.yaml#/normal_test + flights_data: kentland_flights_data + service_providers: netrid_service_providers_v22a + observers: netrid_observers_v22a + evaluation_configuration: netrid_observation_evaluation_configuration + dss_instances: netrid_dss_instances_v22a + id_generator: id_generator + service_area: kentland_service_area + problematically_big_area: au_problematically_big_area + artifacts: + report: + report_path: output/report_netrid_v22a.json + tested_roles: + report_path: output/tested_roles_netrid_v22a + tested_requirements: + output_path: output/tested_requirements_f3411v22a + requirement_collections: + sp_dp_dss: + requirement_sets: + - astm.f3411.v22a.service_provider#Mandatory requirements + - astm.f3411.v22a.display_provider#Mandatory requirements + - astm.f3411.v22a.dss_provider + sp_dss: + requirement_sets: + - astm.f3411.v22a.service_provider#Mandatory requirements + - astm.f3411.v22a.dss_provider + participant_requirements: + uss1: sp_dp_dss + uss2: sp_dss + sequence_view: + output_path: output/sequence_netrid_v22a + validation: + $ref: ./library/validation.yaml#/normal_test diff --git a/monitoring/uss_qualifier/configurations/dev/non_docker/environment.yaml b/monitoring/uss_qualifier/configurations/dev/non_docker/environment.yaml deleted file mode 100644 index ed8667e072..0000000000 --- a/monitoring/uss_qualifier/configurations/dev/non_docker/environment.yaml +++ /dev/null @@ -1,179 +0,0 @@ -# The resources in this file describe the system/environment under test and should not change the test being run. - -non_baseline_inputs: - $ref: '../library/environment.yaml#/non_baseline_inputs' - -common: - $ref: '../library/environment.yaml#/common' - -net_rid: - netrid_service_providers_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDServiceProviders - dependencies: - auth_adapter: utm_auth - specification: - service_providers: - - participant_id: uss2 - injection_base_url: http://localhost:8071/ridsp/injection - local_debug: true - netrid_service_providers_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDServiceProviders - dependencies: - auth_adapter: utm_auth - specification: - service_providers: - - participant_id: uss1 - injection_base_url: http://localhost:8081/ridsp/injection - local_debug: true - netrid_observers_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDObserversResource - dependencies: - auth_adapter: utm_auth - specification: - observers: - - participant_id: uss3 - observation_base_url: http://localhost:8073/riddp/observation - local_debug: true - netrid_observers_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.netrid.NetRIDObserversResource - dependencies: - auth_adapter: utm_auth - specification: - observers: - - participant_id: uss1 - observation_base_url: http://localhost:8083/riddp/observation - local_debug: true - netrid_dss_instances_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstancesResource - dependencies: - auth_adapter: utm_auth - specification: - dss_instances: - - participant_id: uss1 - rid_version: F3411-19 - base_url: http://localhost:8082 - has_private_address: true - - participant_id: uss2 - rid_version: F3411-19 - base_url: http://localhost:8082 - has_private_address: true - netrid_dss_instances_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstancesResource - dependencies: - auth_adapter: utm_auth - specification: - dss_instances: - - participant_id: uss1 - rid_version: F3411-22a - base_url: http://localhost:8082/rid/v2 - has_private_address: true - - participant_id: uss2 - rid_version: F3411-22a - base_url: http://localhost:8082/rid/v2 - has_private_address: true - netrid_dss_instance_v19: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - rid_version: F3411-19 - base_url: http://localhost:8082 - has_private_address: true - netrid_dss_instance_v22a: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3411.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - rid_version: F3411-22a - base_url: http://localhost:8082/rid/v2 - has_private_address: true - -f3548: - flight_planners: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannersResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planners: - # uss1 is the mock_uss directly exposing scdsc functionality - - participant_id: uss1 - injection_base_url: http://localhost:8074/scdsc - local_debug: true - - # The atproxy has been disabled since it is suspected to be responsible of issue #28. Replaced by another simple mock_uss - # # uss2 uses atproxy, with requests being fulfilled by mock_uss with atproxy_client functionality enabled - # - participant_id: uss2 - # injection_base_url: http://host.docker.internal:8075/scd - - # uss2 is the mock_uss directly exposing scdsc functionality - - participant_id: uss2 - injection_base_url: http://localhost:8094/scdsc - local_debug: true - scd_dss: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.DSSInstanceResource - dependencies: - auth_adapter: utm_auth - specification: - participant_id: uss1 - base_url: http://localhost:8082 - has_private_address: true - scd_dss_instances: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.astm.f3548.v21.DSSInstancesResource - dependencies: - auth_adapter: utm_auth - specification: - dss_instances: - - participant_id: uss1 - base_url: http://localhost:8082 - has_private_address: true - - participant_id: uss2 - base_url: http://localhost:8082 - has_private_address: true - -f3548_single_scenario: - uss1: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannerResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planner: - participant_id: uss1 - injection_base_url: http://localhost:8074/scdsc - local_debug: true - uss2: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.flight_planning.FlightPlannerResource - dependencies: - auth_adapter: utm_auth - specification: - flight_planner: - participant_id: uss2 - injection_base_url: http://localhost:8094/scdsc - local_debug: true - -mock_uss_instances: - mock_uss_instances_scdsc: - $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json - resource_type: resources.interuss.mock_uss.client.MockUSSsResource - dependencies: - auth_adapter: utm_auth - specification: - instances: - - mock_uss_base_url: http://localhost:8074 - participant_id: uss1 - - mock_uss_base_url: http://localhost:8094 - participant_id: uss2 diff --git a/monitoring/uss_qualifier/configurations/dev/uspace.yaml b/monitoring/uss_qualifier/configurations/dev/uspace.yaml index 3406b8b704..eac7881a40 100644 --- a/monitoring/uss_qualifier/configurations/dev/uspace.yaml +++ b/monitoring/uss_qualifier/configurations/dev/uspace.yaml @@ -1,10 +1,38 @@ $content_schema: monitoring/uss_qualifier/configurations/configuration/USSQualifierConfiguration.json v1: test_run: - $ref: ./library/environment.yaml#/non_baseline_inputs resources: resource_declarations: - $ref: ./library/resources.yaml#/all + locality_che: {$ref: 'library/resources.yaml#/locality_che'} + uspace_system_identity: {$ref: 'library/resources.yaml#/uspace_system_identity'} + che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'} + che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'} + che_invalid_flight_auth_flights: {$ref: 'library/resources.yaml#/che_invalid_flight_auth_flights'} + foca_flights_data: {$ref: 'library/resources.yaml#/foca_flights_data'} + netrid_observation_evaluation_configuration: {$ref: 'library/resources.yaml#/netrid_observation_evaluation_configuration'} + id_generator: {$ref: 'library/resources.yaml#/id_generator'} + kentland_service_area: {$ref: 'library/resources.yaml#/kentland_service_area'} + au_problematically_big_area: {$ref: 'library/resources.yaml#/au_problematically_big_area'} + + utm_auth: {$ref: 'library/environment.yaml#/utm_auth'} + mock_uss_instances_scdsc: {$ref: 'library/environment.yaml#/mock_uss_instances_scdsc'} + scd_version_providers: {$ref: 'library/environment.yaml#/scd_version_providers'} + all_flight_planners: {$ref: 'library/environment.yaml#/all_flight_planners'} + scd_dss: {$ref: 'library/environment.yaml#/scd_dss'} + scd_dss_instances: {$ref: 'library/environment.yaml#/scd_dss_instances'} + netrid_service_providers_v22a: {$ref: 'library/environment.yaml#/netrid_service_providers_v22a'} + netrid_observers_v22a: {$ref: 'library/environment.yaml#/netrid_observers_v22a'} + netrid_dss_instances_v22a: {$ref: 'library/environment.yaml#/netrid_dss_instances_v22a'} + non_baseline_inputs: + - v1.test_run.resources.resource_declarations.utm_auth + - v1.test_run.resources.resource_declarations.mock_uss_instances_scdsc + - v1.test_run.resources.resource_declarations.scd_version_providers + - v1.test_run.resources.resource_declarations.all_flight_planners + - v1.test_run.resources.resource_declarations.scd_dss + - v1.test_run.resources.resource_declarations.scd_dss_instances + - v1.test_run.resources.resource_declarations.netrid_service_providers_v22a + - v1.test_run.resources.resource_declarations.netrid_observers_v22a + - v1.test_run.resources.resource_declarations.netrid_dss_instances_v22a action: action_generator: generator_type: action_generators.interuss.mock_uss.WithLocality @@ -12,14 +40,14 @@ v1: mock_uss_instances: mock_uss_instances_scdsc locality: locality_che - version_providers: version_providers + version_providers: scd_version_providers system_identity: uspace_system_identity - conflicting_flights: conflicting_flights - priority_preemption_flights: priority_preemption_flights - invalid_flight_intents: invalid_flight_intents - invalid_flight_auth_flights: invalid_flight_auth_flights - flight_planners: flight_planners + conflicting_flights: che_conflicting_flights + priority_preemption_flights: che_conflicting_flights + invalid_flight_intents: che_invalid_flight_intents + invalid_flight_auth_flights: che_invalid_flight_auth_flights + flight_planners: all_flight_planners scd_dss: scd_dss scd_dss_instances: scd_dss_instances @@ -29,8 +57,8 @@ v1: evaluation_configuration: netrid_observation_evaluation_configuration netrid_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: au_problematically_big_area specification: mock_uss_instances_source: mock_uss_instances locality_source: locality @@ -57,7 +85,6 @@ v1: id_generator: id_generator service_area: service_area problematically_big_area: problematically_big_area - on_failure: Continue artifacts: tested_roles: report_path: output/tested_roles_uspace diff --git a/monitoring/uss_qualifier/run_locally.sh b/monitoring/uss_qualifier/run_locally.sh index 7d57257a96..ad157b6d86 100755 --- a/monitoring/uss_qualifier/run_locally.sh +++ b/monitoring/uss_qualifier/run_locally.sh @@ -26,12 +26,12 @@ OTHER_ARGS=${@:2} if [ "$CONFIG_NAME" == "ALL" ]; then CONFIG_NAME="\ configurations.dev.noop,\ -configurations.dev.dss_probing,\ configurations.dev.geoawareness_cis,\ configurations.dev.generate_rid_test_data,\ configurations.dev.geospatial_comprehension,\ configurations.dev.general_flight_auth,\ -configurations.dev.f3548,\ +configurations.dev.message_signing,\ +configurations.dev.dss_probing,\ configurations.dev.f3548_self_contained,\ configurations.dev.netrid_v22a,\ configurations.dev.netrid_v19,\ diff --git a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml index db4afe785f..d2438492d8 100644 --- a/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml +++ b/monitoring/uss_qualifier/suites/astm/utm/f3548_21.yaml @@ -72,20 +72,20 @@ actions: generator_type: action_generators.flight_planning.FlightPlannerCombinations resources: flight_planners: flight_planners - priority_planning_selector: priority_planning_selector? - priority_preemption_flights: priority_preemption_flights + nominal_planning_selector: nominal_planning_selector? + conflicting_flights: conflicting_flights dss: dss specification: action_to_repeat: test_scenario: scenario_type: scenarios.astm.utm.ConflictEqualPriorityNotPermitted resources: - flight_intents: priority_preemption_flights + flight_intents: conflicting_flights tested_uss: uss1 control_uss: uss2 dss: dss on_failure: Continue - combination_selector_source: priority_planning_selector + combination_selector_source: nominal_planning_selector flight_planners_source: flight_planners roles: - uss1 diff --git a/monitoring/uss_qualifier/suites/faa/uft/design/README.md b/monitoring/uss_qualifier/suites/faa/uft/design/README.md index 1b96404e88..787b708078 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/design/README.md +++ b/monitoring/uss_qualifier/suites/faa/uft/design/README.md @@ -25,7 +25,7 @@ Note - As different USSes have different implementations, it could happen that y ## Steps to run the test -1. Set your uss_qualifier Interface implementation url in the [configuration file ](../../../../configurations/dev/faa/uft/local_message_signing.yaml) to run +1. Set your uss_qualifier Interface implementation url in the [configuration file ](../../../../configurations/dev/local_message_signing.yaml) to run the UFT message signing tests. If personal changes are needed, copy this yaml file to a personal configuration file in the [personal configuration folder](../../../../configurations/personal), and edit this file instead. The property to set is `resources.resource_declarations.flight_planners.specification.flight_planners.participant_id` @@ -48,17 +48,17 @@ The property to set is `resources.resource_declarations.flight_planners.specific ## Results SCD tests report is generated under [uss_qualifier](../../../../../../monitoring/uss_qualifier). -The message signing results will be in the report created for the overall run - report.json. Failed message signing checks will show up as `FailedChecks` within the `FinalizeMessageSigningReport` test scenario. +The message signing results will be in the report created for the overall run - report.json. Failed message signing checks will show up as `FailedChecks` within the `FinalizeMessageSigningReport` test scenario. ### Positive tests - A set of private/public keys are provided for use by mock_uss in message -signing analysis under the [build/test-certs/message-signing] folder. -This key pair, mock_faa_priv.pem/mock_faa_pub.der, is used by mock_uss -(when requested from an instance with the capability enabled) to sign its responses, and by `AuthAdapter` to sign requests of outgoing messages. +signing analysis under the [build/test-certs/message-signing] folder. +This key pair, mock_faa_priv.pem/mock_faa_pub.der, is used by mock_uss +(when requested from an instance with the capability enabled) to sign its responses, and by `AuthAdapter` to sign requests of outgoing messages. When the message signing mock_uss capability is enabled, the public key is served under the mock_uss endpoint - /mock/msgsigning/.well-known/uas-traffic-management/pub.der, - and can be retrieved by the USS under test in order for it to validate the - mock_uss responses, per UFT message signing requirements. This public key was provided by the FAA + /mock/msgsigning/.well-known/uas-traffic-management/pub.der, + and can be retrieved by the USS under test in order for it to validate the + mock_uss responses, per UFT message signing requirements. This public key was provided by the FAA and will pass SCVP validation for the UFT activity. A USS should pass all the uss_qualifier tests in this suite. No failed checks indicate the USS-under-test message-signed all its requests and responses. @@ -85,4 +85,4 @@ Below are examples of valid http message signature headers. Malformed headers ca "x-utm-message-signature": "utm-message-signature=:VrUhTe7g2PdnrX37t4hM6Dj7ggSy9YSYt6AqxvICSBTo+AFTVnhCw6k4Kpo1udVboepVYzYC4MHdjaGoTQ6hDT4gvH63QB3JyEqjs0TrAxFj78D5Rau7Sysku18Y/MJG1/cta7DRekdBQJnhFks0aIYzPTizYt0tUL9jx3yybyuK7jTNdtsFmN5qQDs2upTe0ivQjOWggGACMF1yxMZBsGmPLs24E5LssAfSpa1qunnWQNukMHYxtJ+GFMhAV4LDLsO3QQRidKhuhndqittYrGGujQwSz6WSaO8D+4DjR8vpWeR14JnwEIoS2oS6DiyX4fHMB296ai/tkbzklkbe5g==:" } } -``` \ No newline at end of file +``` diff --git a/monitoring/uss_qualifier/suites/suite.py b/monitoring/uss_qualifier/suites/suite.py index 0d9b7094dd..6e13eaa33c 100644 --- a/monitoring/uss_qualifier/suites/suite.py +++ b/monitoring/uss_qualifier/suites/suite.py @@ -218,6 +218,9 @@ def __init__( TestSuiteAction(action=action_dec, resources=self.local_resources) ) except MissingResourceError as e: + logger.warning( + f"Skipping action {a} ({action_dec.get_action_type()} {action_dec.get_child_type()}) because {str(e)}" + ) skipped_actions.append( SkippedActionReport( timestamp=StringBasedDateTime(arrow.utcnow().datetime), diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json b/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json index 59b6248886..b7830c0b1b 100644 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json +++ b/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json @@ -1,6 +1,6 @@ { "intents": { - "first_flight": { + "flight_1_planned_vol_A": { "full": { "reference_time": "2023-02-12T10:34:14.483425+00:00", "request": { @@ -225,14 +225,6 @@ { "lng": 7.477601673804613, "lat": 46.974785690027296 - }, - { - "lng": 7.477582533186026, - "lat": 46.974787633340085 - }, - { - "lng": 7.477563763022608, - "lat": 46.97479085141769 } ] }, @@ -273,7 +265,7 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://example.uav.com/emergency", + "emergency_procedure_url": "https://uav.com/emergency", "operator_id": "CHEo5kut30e0mt01-qwe", "uas_id": "", "uas_type_certificate": "" @@ -281,9 +273,41 @@ } } }, - "first_flight_activated": { + "flight_1_activated_vol_A": { + "delta": { + "source": "flight_1_planned_vol_A", + "mutation": { + "request": { + "operational_intent": { + "state": "Activated" + } + } + } + } + }, + "flight_1_planned_vol_A_extended": { + "delta": { + "source": "flight_1_planned_vol_A", + "mutation": { + "request": { + "operational_intent": { + "volumes": [ + { + "volume": { + "altitude_lower": { + "value": 575.0 + } + } + } + ] + } + } + } + } + }, + "flight_1_activated_vol_A_extended": { "delta": { - "source": "first_flight", + "source": "flight_1_planned_vol_A_extended", "mutation": { "request": { "operational_intent": { @@ -293,7 +317,42 @@ } } }, - "conflicting_flight": { + "flight_1_planned_vol_B": { + "delta": { + "source": "flight_1_planned_vol_A", + "mutation": { + "request": { + "operational_intent": { + "volumes": [ + { + "volume": { + "altitude_lower": { + "value": 650.0 + }, + "altitude_upper": { + "value": 705.0 + } + } + } + ] + } + } + } + } + }, + "flight_1_activated_vol_B": { + "delta": { + "source": "flight_1_planned_vol_B", + "mutation": { + "request": { + "operational_intent": { + "state": "Activated" + } + } + } + } + }, + "flight_2_planned_vol_A": { "full": { "reference_time": "2023-02-12T10:34:14.483425+00:00", "request": { @@ -592,7 +651,7 @@ ], "state": "Accepted", "off_nominal_volumes": [], - "priority": 0 + "priority": 100 }, "flight_authorisation": { "uas_serial_number": "1AF49UL5CC5J6K", @@ -606,13 +665,377 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://example.uav.com/emergency", + "emergency_procedure_url": "https://uav.com/emergency", "operator_id": "CHEo5kut30e0mt01-qwe", "uas_id": "", "uas_type_certificate": "" } } } + }, + "flight_2_activated_vol_A": { + "delta": { + "source": "flight_2_planned_vol_A", + "mutation": { + "request": { + "operational_intent": { + "state": "Activated" + } + } + } + } + }, + "flight_2_activated_vol_B": { + "delta": { + "source": "flight_2_activated_vol_A", + "mutation": { + "request": { + "operational_intent": { + "volumes": [ + { + "volume": { + "altitude_lower": { + "value": 650.0 + }, + "altitude_upper": { + "value": 705.0 + } + } + } + ] + } + } + } + } + }, + "flight_2_equal_prio_planned_vol_B": { + "delta": { + "source": "flight_2_activated_vol_B", + "mutation": { + "request": { + "operational_intent": { + "state": "Accepted", + "priority": 0 + } + } + } + } + }, + "flight_2_equal_prio_activated_vol_B": { + "delta": { + "source": "flight_2_equal_prio_planned_vol_B", + "mutation": { + "request": { + "operational_intent": { + "state": "Activated" + } + } + } + } + }, + "flight_2_equal_prio_nonconforming_vol_A": { + "delta": { + "source": "flight_2_equal_prio_activated_vol_B", + "mutation": { + "request": { + "operational_intent": { + "state": "Nonconforming", + "off_nominal_volumes": [ + { + "volume": { + "outline_polygon": { + "vertices": [ + { + "lng": 7.474315728091042, + "lat": 46.97716400145211 + }, + { + "lng": 7.474303247689658, + "lat": 46.97717412304557 + }, + { + "lng": 7.474292276891787, + "lat": 46.9771850331586 + }, + { + "lng": 7.474282921352688, + "lat": 46.97719662672131 + }, + { + "lng": 7.474275271172041, + "lat": 46.97720879208173 + }, + { + "lng": 7.474269400026217, + "lat": 46.97722141208117 + }, + { + "lng": 7.4742653644586845, + "lat": 46.977234365182404 + }, + { + "lng": 7.474263203335437, + "lat": 46.97724752664021 + }, + { + "lng": 7.474262937470636, + "lat": 46.97726076970267 + }, + { + "lng": 7.474264569426098, + "lat": 46.97727396683188 + }, + { + "lng": 7.47426808348659, + "lat": 46.97728699093222 + }, + { + "lng": 7.474273445811106, + "lat": 46.97729971657432 + }, + { + "lng": 7.474280604758724, + "lat": 46.97731202120303 + }, + { + "lng": 7.4742894913859015, + "lat": 46.97732378631779 + }, + { + "lng": 7.47430002011039, + "lat": 46.977334898613684 + }, + { + "lng": 7.474312089535409, + "lat": 46.97734525107282 + }, + { + "lng": 7.4743255834261335, + "lat": 46.97735474399491 + }, + { + "lng": 7.47434037182908, + "lat": 46.977363285957416 + }, + { + "lng": 7.474356312323634, + "lat": 46.97737079469613 + }, + { + "lng": 7.47437325139364, + "lat": 46.977377197897326 + }, + { + "lng": 7.474391025905868, + "lat": 46.97738243389426 + }, + { + "lng": 7.474409464681103, + "lat": 46.977386452261086 + }, + { + "lng": 7.474428390142731, + "lat": 46.97738921429845 + }, + { + "lng": 7.4744476200269405, + "lat": 46.97739069340619 + }, + { + "lng": 7.474466969138073, + "lat": 46.97739087533958 + }, + { + "lng": 7.474486251132214, + "lat": 46.97738975834647 + }, + { + "lng": 7.474505280311834, + "lat": 46.97738735318418 + }, + { + "lng": 7.47452387341421, + "lat": 46.97738368301589 + }, + { + "lng": 7.474541851376407, + "lat": 46.97737878318756 + }, + { + "lng": 7.474559041059788, + "lat": 46.97737270088755 + }, + { + "lng": 7.474575276917473, + "lat": 46.9773654946921 + }, + { + "lng": 7.474590402588685, + "lat": 46.977357234001225 + }, + { + "lng": 7.474604272404609, + "lat": 46.97734799837037 + }, + { + "lng": 7.4780602717187445, + "lat": 46.97480899404357 + }, + { + "lng": 7.478072750859629, + "lat": 46.97479887202181 + }, + { + "lng": 7.47808372039712, + "lat": 46.97478796152745 + }, + { + "lng": 7.478093074689058, + "lat": 46.97477636763495 + }, + { + "lng": 7.478100723649223, + "lat": 46.97476420200029 + }, + { + "lng": 7.478106593614889, + "lat": 46.974751581785505 + }, + { + "lng": 7.478110628056212, + "lat": 46.97473862853046 + }, + { + "lng": 7.4781127881205816, + "lat": 46.9747254669823 + }, + { + "lng": 7.478113053006759, + "lat": 46.97471222389403 + }, + { + "lng": 7.478111420165148, + "lat": 46.974699026803876 + }, + { + "lng": 7.478107905322289, + "lat": 46.97468600280696 + }, + { + "lng": 7.478102542329355, + "lat": 46.974673277331334 + }, + { + "lng": 7.478095382836098, + "lat": 46.97466097293006 + }, + { + "lng": 7.478086495793389, + "lat": 46.9746492081009 + }, + { + "lng": 7.478075966789133, + "lat": 46.97463809614524 + }, + { + "lng": 7.47806389722399, + "lat": 46.97462774407688 + }, + { + "lng": 7.478050403334804, + "lat": 46.97461825159139 + }, + { + "lng": 7.4780356150751714, + "lat": 46.97460971010614 + }, + { + "lng": 7.478019674863899, + "lat": 46.97460220187985 + }, + { + "lng": 7.478002736213457, + "lat": 46.97459579922035 + }, + { + "lng": 7.477984962251586, + "lat": 46.97459056378839 + }, + { + "lng": 7.477966524150307, + "lat": 46.974586546003664 + }, + { + "lng": 7.477947599477487, + "lat": 46.974583784559336 + }, + { + "lng": 7.477928370486799, + "lat": 46.97458230604945 + }, + { + "lng": 7.477909022362576, + "lat": 46.974582124712704 + }, + { + "lng": 7.4778897414364325, + "lat": 46.97458324229544 + }, + { + "lng": 7.47787071339284, + "lat": 46.974585648034825 + }, + { + "lng": 7.477852121480946, + "lat": 46.974589318762405 + }, + { + "lng": 7.477834144749823, + "lat": 46.974594219127326 + }, + { + "lng": 7.47781695632419, + "lat": 46.97460030193667 + }, + { + "lng": 7.477800721737151, + "lat": 46.97460750861006 + }, + { + "lng": 7.47778559733606, + "lat": 46.974615769743735 + }, + { + "lng": 7.477771728776835, + "lat": 46.97462500577891 + } + ] + }, + "altitude_lower": { + "value": 605.0, + "reference": "W84", + "units": "M" + }, + "altitude_upper": { + "value": 635.0, + "reference": "W84", + "units": "M" + } + }, + "time_start": { + "value": "2023-02-12T10:27:14.483425+00:00", + "format": "RFC3339" + }, + "time_end": { + "value": "2023-02-12T10:52:14.483425+00:00", + "format": "RFC3339" + } + } + ] + } + } + } + } } } } diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/priority_preemption.json b/monitoring/uss_qualifier/test_data/che/flight_intents/priority_preemption.json deleted file mode 100644 index b7830c0b1b..0000000000 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/priority_preemption.json +++ /dev/null @@ -1,1041 +0,0 @@ -{ - "intents": { - "flight_1_planned_vol_A": { - "full": { - "reference_time": "2023-02-12T10:34:14.483425+00:00", - "request": { - "operational_intent": { - "volumes": [ - { - "volume": { - "outline_polygon": { - "vertices": [ - { - "lng": 7.477423822749622, - "lat": 46.97491999984008 - }, - { - "lng": 7.477423821039847, - "lat": 46.97538499982026 - }, - { - "lng": 7.477424770457274, - "lat": 46.97539822817162 - }, - { - "lng": 7.477427609667229, - "lat": 46.975411329130466 - }, - { - "lng": 7.477432311328011, - "lat": 46.975424176527724 - }, - { - "lng": 7.477438830161459, - "lat": 46.97543664663613 - }, - { - "lng": 7.477447103388957, - "lat": 46.975448619361856 - }, - { - "lng": 7.477457051335981, - "lat": 46.975459979401066 - }, - { - "lng": 7.477468578199379, - "lat": 46.97547061735031 - }, - { - "lng": 7.477481572969964, - "lat": 46.97548043076024 - }, - { - "lng": 7.4774959105015855, - "lat": 46.97548932512221 - }, - { - "lng": 7.477511452716338, - "lat": 46.97549721477847 - }, - { - "lng": 7.47752804993433, - "lat": 46.97550402374711 - }, - { - "lng": 7.477545542315188, - "lat": 46.975509686453854 - }, - { - "lng": 7.477563761397435, - "lat": 46.97551414836356 - }, - { - "lng": 7.477582531720886, - "lat": 46.9755173665054 - }, - { - "lng": 7.477601672516463, - "lat": 46.975519309886806 - }, - { - "lng": 7.477620999447144, - "lat": 46.97551995979184 - }, - { - "lng": 7.478057000544437, - "lat": 46.97551995980457 - }, - { - "lng": 7.478076327475301, - "lat": 46.975519309900726 - }, - { - "lng": 7.478095468271412, - "lat": 46.97551736652059 - }, - { - "lng": 7.478114238595763, - "lat": 46.97551414838003 - }, - { - "lng": 7.478132457679282, - "lat": 46.97550968647161 - }, - { - "lng": 7.478149950061773, - "lat": 46.97550402376608 - }, - { - "lng": 7.478166547281737, - "lat": 46.97549721479852 - }, - { - "lng": 7.4781820894987705, - "lat": 46.97548932514323 - }, - { - "lng": 7.478196427032943, - "lat": 46.97548043078203 - }, - { - "lng": 7.478209421806301, - "lat": 46.97547061737267 - }, - { - "lng": 7.478220948672645, - "lat": 46.975459979423775 - }, - { - "lng": 7.478230896622737, - "lat": 46.97544861938469 - }, - { - "lng": 7.4782391698533655, - "lat": 46.97543664665883 - }, - { - "lng": 7.4782456886899595, - "lat": 46.975424176550064 - }, - { - "lng": 7.4782503903538515, - "lat": 46.97541132915219 - }, - { - "lng": 7.478253229566841, - "lat": 46.97539822819251 - }, - { - "lng": 7.478254178987183, - "lat": 46.975384999840095 - }, - { - "lng": 7.478254177277408, - "lat": 46.974919999820244 - }, - { - "lng": 7.478253227761765, - "lat": 46.97490677142331 - }, - { - "lng": 7.4782503884602685, - "lat": 46.97489367042681 - }, - { - "lng": 7.4782456867183855, - "lat": 46.97488082300081 - }, - { - "lng": 7.478239167817867, - "lat": 46.974868352873266 - }, - { - "lng": 7.478230894540598, - "lat": 46.974856380138455 - }, - { - "lng": 7.478220946563947, - "lat": 46.974845020100375 - }, - { - "lng": 7.478209419693374, - "lat": 46.974834382162385 - }, - { - "lng": 7.47819642493976, - "lat": 46.974824568773556 - }, - { - "lng": 7.4781820874502785, - "lat": 46.97481567444202 - }, - { - "lng": 7.478166545303149, - "lat": 46.97480778482489 - }, - { - "lng": 7.478149948177879, - "lat": 46.9748009759033 - }, - { - "lng": 7.4781324559137685, - "lat": 46.97479531325065 - }, - { - "lng": 7.478114236970597, - "lat": 46.97479085140123 - }, - { - "lng": 7.478095466806278, - "lat": 46.9747876333249 - }, - { - "lng": 7.478076326187155, - "lat": 46.97478569001336 - }, - { - "lng": 7.478056999447158, - "lat": 46.974785040181715 - }, - { - "lng": 7.477621000544429, - "lat": 46.97478504019445 - }, - { - "lng": 7.477601673804613, - "lat": 46.974785690027296 - } - ] - }, - "altitude_lower": { - "value": 605.0, - "reference": "W84", - "units": "M" - }, - "altitude_upper": { - "value": 635.0, - "reference": "W84", - "units": "M" - } - }, - "time_start": { - "value": "2023-02-12T10:27:14.483425+00:00", - "format": "RFC3339" - }, - "time_end": { - "value": "2023-02-12T10:52:14.483425+00:00", - "format": "RFC3339" - } - } - ], - "state": "Accepted", - "off_nominal_volumes": [], - "priority": 0 - }, - "flight_authorisation": { - "uas_serial_number": "1AF49UL5CC5J6K", - "operation_category": "Open", - "operation_mode": "Vlos", - "uas_class": "C0", - "identification_technologies": [ - "ASTMNetRID" - ], - "connectivity_methods": [ - "cellular" - ], - "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.com/emergency", - "operator_id": "CHEo5kut30e0mt01-qwe", - "uas_id": "", - "uas_type_certificate": "" - } - } - } - }, - "flight_1_activated_vol_A": { - "delta": { - "source": "flight_1_planned_vol_A", - "mutation": { - "request": { - "operational_intent": { - "state": "Activated" - } - } - } - } - }, - "flight_1_planned_vol_A_extended": { - "delta": { - "source": "flight_1_planned_vol_A", - "mutation": { - "request": { - "operational_intent": { - "volumes": [ - { - "volume": { - "altitude_lower": { - "value": 575.0 - } - } - } - ] - } - } - } - } - }, - "flight_1_activated_vol_A_extended": { - "delta": { - "source": "flight_1_planned_vol_A_extended", - "mutation": { - "request": { - "operational_intent": { - "state": "Activated" - } - } - } - } - }, - "flight_1_planned_vol_B": { - "delta": { - "source": "flight_1_planned_vol_A", - "mutation": { - "request": { - "operational_intent": { - "volumes": [ - { - "volume": { - "altitude_lower": { - "value": 650.0 - }, - "altitude_upper": { - "value": 705.0 - } - } - } - ] - } - } - } - } - }, - "flight_1_activated_vol_B": { - "delta": { - "source": "flight_1_planned_vol_B", - "mutation": { - "request": { - "operational_intent": { - "state": "Activated" - } - } - } - } - }, - "flight_2_planned_vol_A": { - "full": { - "reference_time": "2023-02-12T10:34:14.483425+00:00", - "request": { - "operational_intent": { - "volumes": [ - { - "volume": { - "outline_polygon": { - "vertices": [ - { - "lng": 7.474315728091042, - "lat": 46.97716400145211 - }, - { - "lng": 7.474303247689658, - "lat": 46.97717412304557 - }, - { - "lng": 7.474292276891787, - "lat": 46.9771850331586 - }, - { - "lng": 7.474282921352688, - "lat": 46.97719662672131 - }, - { - "lng": 7.474275271172041, - "lat": 46.97720879208173 - }, - { - "lng": 7.474269400026217, - "lat": 46.97722141208117 - }, - { - "lng": 7.4742653644586845, - "lat": 46.977234365182404 - }, - { - "lng": 7.474263203335437, - "lat": 46.97724752664021 - }, - { - "lng": 7.474262937470636, - "lat": 46.97726076970267 - }, - { - "lng": 7.474264569426098, - "lat": 46.97727396683188 - }, - { - "lng": 7.47426808348659, - "lat": 46.97728699093222 - }, - { - "lng": 7.474273445811106, - "lat": 46.97729971657432 - }, - { - "lng": 7.474280604758724, - "lat": 46.97731202120303 - }, - { - "lng": 7.4742894913859015, - "lat": 46.97732378631779 - }, - { - "lng": 7.47430002011039, - "lat": 46.977334898613684 - }, - { - "lng": 7.474312089535409, - "lat": 46.97734525107282 - }, - { - "lng": 7.4743255834261335, - "lat": 46.97735474399491 - }, - { - "lng": 7.47434037182908, - "lat": 46.977363285957416 - }, - { - "lng": 7.474356312323634, - "lat": 46.97737079469613 - }, - { - "lng": 7.47437325139364, - "lat": 46.977377197897326 - }, - { - "lng": 7.474391025905868, - "lat": 46.97738243389426 - }, - { - "lng": 7.474409464681103, - "lat": 46.977386452261086 - }, - { - "lng": 7.474428390142731, - "lat": 46.97738921429845 - }, - { - "lng": 7.4744476200269405, - "lat": 46.97739069340619 - }, - { - "lng": 7.474466969138073, - "lat": 46.97739087533958 - }, - { - "lng": 7.474486251132214, - "lat": 46.97738975834647 - }, - { - "lng": 7.474505280311834, - "lat": 46.97738735318418 - }, - { - "lng": 7.47452387341421, - "lat": 46.97738368301589 - }, - { - "lng": 7.474541851376407, - "lat": 46.97737878318756 - }, - { - "lng": 7.474559041059788, - "lat": 46.97737270088755 - }, - { - "lng": 7.474575276917473, - "lat": 46.9773654946921 - }, - { - "lng": 7.474590402588685, - "lat": 46.977357234001225 - }, - { - "lng": 7.474604272404609, - "lat": 46.97734799837037 - }, - { - "lng": 7.4780602717187445, - "lat": 46.97480899404357 - }, - { - "lng": 7.478072750859629, - "lat": 46.97479887202181 - }, - { - "lng": 7.47808372039712, - "lat": 46.97478796152745 - }, - { - "lng": 7.478093074689058, - "lat": 46.97477636763495 - }, - { - "lng": 7.478100723649223, - "lat": 46.97476420200029 - }, - { - "lng": 7.478106593614889, - "lat": 46.974751581785505 - }, - { - "lng": 7.478110628056212, - "lat": 46.97473862853046 - }, - { - "lng": 7.4781127881205816, - "lat": 46.9747254669823 - }, - { - "lng": 7.478113053006759, - "lat": 46.97471222389403 - }, - { - "lng": 7.478111420165148, - "lat": 46.974699026803876 - }, - { - "lng": 7.478107905322289, - "lat": 46.97468600280696 - }, - { - "lng": 7.478102542329355, - "lat": 46.974673277331334 - }, - { - "lng": 7.478095382836098, - "lat": 46.97466097293006 - }, - { - "lng": 7.478086495793389, - "lat": 46.9746492081009 - }, - { - "lng": 7.478075966789133, - "lat": 46.97463809614524 - }, - { - "lng": 7.47806389722399, - "lat": 46.97462774407688 - }, - { - "lng": 7.478050403334804, - "lat": 46.97461825159139 - }, - { - "lng": 7.4780356150751714, - "lat": 46.97460971010614 - }, - { - "lng": 7.478019674863899, - "lat": 46.97460220187985 - }, - { - "lng": 7.478002736213457, - "lat": 46.97459579922035 - }, - { - "lng": 7.477984962251586, - "lat": 46.97459056378839 - }, - { - "lng": 7.477966524150307, - "lat": 46.974586546003664 - }, - { - "lng": 7.477947599477487, - "lat": 46.974583784559336 - }, - { - "lng": 7.477928370486799, - "lat": 46.97458230604945 - }, - { - "lng": 7.477909022362576, - "lat": 46.974582124712704 - }, - { - "lng": 7.4778897414364325, - "lat": 46.97458324229544 - }, - { - "lng": 7.47787071339284, - "lat": 46.974585648034825 - }, - { - "lng": 7.477852121480946, - "lat": 46.974589318762405 - }, - { - "lng": 7.477834144749823, - "lat": 46.974594219127326 - }, - { - "lng": 7.47781695632419, - "lat": 46.97460030193667 - }, - { - "lng": 7.477800721737151, - "lat": 46.97460750861006 - }, - { - "lng": 7.47778559733606, - "lat": 46.974615769743735 - }, - { - "lng": 7.477771728776835, - "lat": 46.97462500577891 - } - ] - }, - "altitude_lower": { - "value": 605.0, - "reference": "W84", - "units": "M" - }, - "altitude_upper": { - "value": 635.0, - "reference": "W84", - "units": "M" - } - }, - "time_start": { - "value": "2023-02-12T10:27:14.483425+00:00", - "format": "RFC3339" - }, - "time_end": { - "value": "2023-02-12T10:52:14.483425+00:00", - "format": "RFC3339" - } - } - ], - "state": "Accepted", - "off_nominal_volumes": [], - "priority": 100 - }, - "flight_authorisation": { - "uas_serial_number": "1AF49UL5CC5J6K", - "operation_category": "Open", - "operation_mode": "Vlos", - "uas_class": "C0", - "identification_technologies": [ - "ASTMNetRID" - ], - "connectivity_methods": [ - "cellular" - ], - "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.com/emergency", - "operator_id": "CHEo5kut30e0mt01-qwe", - "uas_id": "", - "uas_type_certificate": "" - } - } - } - }, - "flight_2_activated_vol_A": { - "delta": { - "source": "flight_2_planned_vol_A", - "mutation": { - "request": { - "operational_intent": { - "state": "Activated" - } - } - } - } - }, - "flight_2_activated_vol_B": { - "delta": { - "source": "flight_2_activated_vol_A", - "mutation": { - "request": { - "operational_intent": { - "volumes": [ - { - "volume": { - "altitude_lower": { - "value": 650.0 - }, - "altitude_upper": { - "value": 705.0 - } - } - } - ] - } - } - } - } - }, - "flight_2_equal_prio_planned_vol_B": { - "delta": { - "source": "flight_2_activated_vol_B", - "mutation": { - "request": { - "operational_intent": { - "state": "Accepted", - "priority": 0 - } - } - } - } - }, - "flight_2_equal_prio_activated_vol_B": { - "delta": { - "source": "flight_2_equal_prio_planned_vol_B", - "mutation": { - "request": { - "operational_intent": { - "state": "Activated" - } - } - } - } - }, - "flight_2_equal_prio_nonconforming_vol_A": { - "delta": { - "source": "flight_2_equal_prio_activated_vol_B", - "mutation": { - "request": { - "operational_intent": { - "state": "Nonconforming", - "off_nominal_volumes": [ - { - "volume": { - "outline_polygon": { - "vertices": [ - { - "lng": 7.474315728091042, - "lat": 46.97716400145211 - }, - { - "lng": 7.474303247689658, - "lat": 46.97717412304557 - }, - { - "lng": 7.474292276891787, - "lat": 46.9771850331586 - }, - { - "lng": 7.474282921352688, - "lat": 46.97719662672131 - }, - { - "lng": 7.474275271172041, - "lat": 46.97720879208173 - }, - { - "lng": 7.474269400026217, - "lat": 46.97722141208117 - }, - { - "lng": 7.4742653644586845, - "lat": 46.977234365182404 - }, - { - "lng": 7.474263203335437, - "lat": 46.97724752664021 - }, - { - "lng": 7.474262937470636, - "lat": 46.97726076970267 - }, - { - "lng": 7.474264569426098, - "lat": 46.97727396683188 - }, - { - "lng": 7.47426808348659, - "lat": 46.97728699093222 - }, - { - "lng": 7.474273445811106, - "lat": 46.97729971657432 - }, - { - "lng": 7.474280604758724, - "lat": 46.97731202120303 - }, - { - "lng": 7.4742894913859015, - "lat": 46.97732378631779 - }, - { - "lng": 7.47430002011039, - "lat": 46.977334898613684 - }, - { - "lng": 7.474312089535409, - "lat": 46.97734525107282 - }, - { - "lng": 7.4743255834261335, - "lat": 46.97735474399491 - }, - { - "lng": 7.47434037182908, - "lat": 46.977363285957416 - }, - { - "lng": 7.474356312323634, - "lat": 46.97737079469613 - }, - { - "lng": 7.47437325139364, - "lat": 46.977377197897326 - }, - { - "lng": 7.474391025905868, - "lat": 46.97738243389426 - }, - { - "lng": 7.474409464681103, - "lat": 46.977386452261086 - }, - { - "lng": 7.474428390142731, - "lat": 46.97738921429845 - }, - { - "lng": 7.4744476200269405, - "lat": 46.97739069340619 - }, - { - "lng": 7.474466969138073, - "lat": 46.97739087533958 - }, - { - "lng": 7.474486251132214, - "lat": 46.97738975834647 - }, - { - "lng": 7.474505280311834, - "lat": 46.97738735318418 - }, - { - "lng": 7.47452387341421, - "lat": 46.97738368301589 - }, - { - "lng": 7.474541851376407, - "lat": 46.97737878318756 - }, - { - "lng": 7.474559041059788, - "lat": 46.97737270088755 - }, - { - "lng": 7.474575276917473, - "lat": 46.9773654946921 - }, - { - "lng": 7.474590402588685, - "lat": 46.977357234001225 - }, - { - "lng": 7.474604272404609, - "lat": 46.97734799837037 - }, - { - "lng": 7.4780602717187445, - "lat": 46.97480899404357 - }, - { - "lng": 7.478072750859629, - "lat": 46.97479887202181 - }, - { - "lng": 7.47808372039712, - "lat": 46.97478796152745 - }, - { - "lng": 7.478093074689058, - "lat": 46.97477636763495 - }, - { - "lng": 7.478100723649223, - "lat": 46.97476420200029 - }, - { - "lng": 7.478106593614889, - "lat": 46.974751581785505 - }, - { - "lng": 7.478110628056212, - "lat": 46.97473862853046 - }, - { - "lng": 7.4781127881205816, - "lat": 46.9747254669823 - }, - { - "lng": 7.478113053006759, - "lat": 46.97471222389403 - }, - { - "lng": 7.478111420165148, - "lat": 46.974699026803876 - }, - { - "lng": 7.478107905322289, - "lat": 46.97468600280696 - }, - { - "lng": 7.478102542329355, - "lat": 46.974673277331334 - }, - { - "lng": 7.478095382836098, - "lat": 46.97466097293006 - }, - { - "lng": 7.478086495793389, - "lat": 46.9746492081009 - }, - { - "lng": 7.478075966789133, - "lat": 46.97463809614524 - }, - { - "lng": 7.47806389722399, - "lat": 46.97462774407688 - }, - { - "lng": 7.478050403334804, - "lat": 46.97461825159139 - }, - { - "lng": 7.4780356150751714, - "lat": 46.97460971010614 - }, - { - "lng": 7.478019674863899, - "lat": 46.97460220187985 - }, - { - "lng": 7.478002736213457, - "lat": 46.97459579922035 - }, - { - "lng": 7.477984962251586, - "lat": 46.97459056378839 - }, - { - "lng": 7.477966524150307, - "lat": 46.974586546003664 - }, - { - "lng": 7.477947599477487, - "lat": 46.974583784559336 - }, - { - "lng": 7.477928370486799, - "lat": 46.97458230604945 - }, - { - "lng": 7.477909022362576, - "lat": 46.974582124712704 - }, - { - "lng": 7.4778897414364325, - "lat": 46.97458324229544 - }, - { - "lng": 7.47787071339284, - "lat": 46.974585648034825 - }, - { - "lng": 7.477852121480946, - "lat": 46.974589318762405 - }, - { - "lng": 7.477834144749823, - "lat": 46.974594219127326 - }, - { - "lng": 7.47781695632419, - "lat": 46.97460030193667 - }, - { - "lng": 7.477800721737151, - "lat": 46.97460750861006 - }, - { - "lng": 7.47778559733606, - "lat": 46.974615769743735 - }, - { - "lng": 7.477771728776835, - "lat": 46.97462500577891 - } - ] - }, - "altitude_lower": { - "value": 605.0, - "reference": "W84", - "units": "M" - }, - "altitude_upper": { - "value": 635.0, - "reference": "W84", - "units": "M" - } - }, - "time_start": { - "value": "2023-02-12T10:27:14.483425+00:00", - "format": "RFC3339" - }, - "time_end": { - "value": "2023-02-12T10:52:14.483425+00:00", - "format": "RFC3339" - } - } - ] - } - } - } - } - } - } -} From 88b02628e361a45ed18450a0d5b1b0873b767557 Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Thu, 19 Oct 2023 01:48:53 +0000 Subject: [PATCH 2/6] Fix link --- monitoring/uss_qualifier/suites/faa/uft/design/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/uss_qualifier/suites/faa/uft/design/README.md b/monitoring/uss_qualifier/suites/faa/uft/design/README.md index 787b708078..887d5bb242 100644 --- a/monitoring/uss_qualifier/suites/faa/uft/design/README.md +++ b/monitoring/uss_qualifier/suites/faa/uft/design/README.md @@ -25,7 +25,7 @@ Note - As different USSes have different implementations, it could happen that y ## Steps to run the test -1. Set your uss_qualifier Interface implementation url in the [configuration file ](../../../../configurations/dev/local_message_signing.yaml) to run +1. Set your uss_qualifier Interface implementation url in the [configuration file ](../../../../configurations/dev/message_signing.yaml) to run the UFT message signing tests. If personal changes are needed, copy this yaml file to a personal configuration file in the [personal configuration folder](../../../../configurations/personal), and edit this file instead. The property to set is `resources.resource_declarations.flight_planners.specification.flight_planners.participant_id` From a9e0ea2e65223cea90f9adcd9e2b9ef6199b6513 Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Thu, 19 Oct 2023 01:52:36 +0000 Subject: [PATCH 3/6] Update link --- monitoring/uss_qualifier/configurations/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/uss_qualifier/configurations/README.md b/monitoring/uss_qualifier/configurations/README.md index 4cf1fbb0cc..f052adf98d 100644 --- a/monitoring/uss_qualifier/configurations/README.md +++ b/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. From 5f067d6ce7fa6090dfa07c2bb276d0f2a8e9d65f Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Thu, 19 Oct 2023 02:04:31 +0000 Subject: [PATCH 4/6] Fix intent link --- .../uss_qualifier/configurations/dev/message_signing.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/monitoring/uss_qualifier/configurations/dev/message_signing.yaml b/monitoring/uss_qualifier/configurations/dev/message_signing.yaml index 4a3df3ea85..ea33cc7af7 100644 --- a/monitoring/uss_qualifier/configurations/dev/message_signing.yaml +++ b/monitoring/uss_qualifier/configurations/dev/message_signing.yaml @@ -3,7 +3,6 @@ v1: resources: resource_declarations: che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'} - che_priority_preemption_flights: {$ref: 'library/resources.yaml#/che_priority_preemption_flights'} che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'} combination_selector: resource_type: resources.flight_planning.FlightPlannerCombinationSelectorResource @@ -47,7 +46,7 @@ v1: flight_planners: flight_planners combination_selector: combination_selector conflicting_flights: che_conflicting_flights - priority_preemption_flights: che_priority_preemption_flights + priority_preemption_flights: che_conflicting_flights dss: scd_dss artifacts: From e23126baab7fe1da8e56120b462b84decd5afd7f Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Fri, 20 Oct 2023 18:16:39 +0000 Subject: [PATCH 5/6] Fix example domains per comment --- .../test_data/che/flight_intents/conflicting_flights.json | 4 ++-- .../test_data/che/flight_intents/invalid_flight_auths.json | 4 ++-- .../test_data/che/flight_intents/invalid_flight_intents.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json b/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json index b7830c0b1b..dbeb97d9a1 100644 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json +++ b/monitoring/uss_qualifier/test_data/che/flight_intents/conflicting_flights.json @@ -265,7 +265,7 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.com/emergency", + "emergency_procedure_url": "https://example.interussplatform.org/emergency", "operator_id": "CHEo5kut30e0mt01-qwe", "uas_id": "", "uas_type_certificate": "" @@ -665,7 +665,7 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.com/emergency", + "emergency_procedure_url": "https://example.interussplatform.org/emergency", "operator_id": "CHEo5kut30e0mt01-qwe", "uas_id": "", "uas_type_certificate": "" diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.json b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.json index daa0f3d57a..2a72a323d3 100644 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.json +++ b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_auths.json @@ -61,7 +61,7 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.example.com/emergency", + "emergency_procedure_url": "https://example.interussplatform.org/emergency", "operator_id": "CHEo5kut30e0mt01-qwe" } } @@ -128,7 +128,7 @@ "cellular" ], "endurance_minutes": 30, - "emergency_procedure_url": "https://uav.example.com/emergency", + "emergency_procedure_url": "https://example.interussplatform.org/emergency", "operator_id": "CHEo5kut30e0mt01-qwe" } } diff --git a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_intents.yaml b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_intents.yaml index c8c624d89f..31d2e98e7e 100644 --- a/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_intents.yaml +++ b/monitoring/uss_qualifier/test_data/che/flight_intents/invalid_flight_intents.yaml @@ -41,7 +41,7 @@ intents: connectivity_methods: - cellular endurance_minutes: 30 - emergency_procedure_url: https://uav.example.com/emergency + emergency_procedure_url: https://example.interussplatform.org/emergency operator_id: CHEo5kut30e0mt01-qwe valid_activated: From a82033b1bc877aedafb59dfe93fc5e88879b9c4a Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Fri, 20 Oct 2023 18:27:38 +0000 Subject: [PATCH 6/6] Update hash --- .../uss_qualifier/configurations/dev/library/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml index a6b42a181c..ff155301c1 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/resources.yaml +++ b/monitoring/uss_qualifier/configurations/dev/library/resources.yaml @@ -128,7 +128,7 @@ che_conflicting_flights: file: path: file://./test_data/che/flight_intents/conflicting_flights.json # Note that this hash_sha512 field can be safely deleted if the content changes - hash_sha512: 432ea57009b6a41b3af43cb9431a0627a487eac0a04511fbccd85d9fcac193b11976ad2dbc07d9efa41ceaf7a9338b39064ede6eeb5755be3966d2e17e7d555a + hash_sha512: 6467e88fb69702216dabe1f9723b68fe68a1a9d4b1a40e3af5c0b1ed233061a088c9c30be8a0ada447b18f2c6354db52d84aa12c1e7dfd13f99262d91ba173f4 che_invalid_flight_intents: $content_schema: monitoring/uss_qualifier/resources/definitions/ResourceDeclaration.json