From fb503a37de458b1699cb9aa11e54bd49ef4490d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= Date: Tue, 12 Sep 2023 13:58:42 +0200 Subject: [PATCH] [uss_qualifier] Add DSS probing configuration (#189) * [uss_qualifier] Add DSS probing configuration * define inline DSS probing suite * add missing auto-generated md files --- .../configurations/dev/dss_probing.yaml | 41 +++++++++++++++++++ .../dev/library/environment.yaml | 22 ++++++++++ monitoring/uss_qualifier/run_locally.sh | 1 + .../suites/astm/netrid/f3411_19.yaml | 14 +------ .../astm/netrid/f3411_19/dss_probing.md | 7 ++++ .../astm/netrid/f3411_19/dss_probing.yaml | 12 ++++++ .../suites/astm/netrid/f3411_22a.yaml | 20 +-------- .../astm/netrid/f3411_22a/dss_probing.md | 8 ++++ .../astm/netrid/f3411_22a/dss_probing.yaml | 18 ++++++++ 9 files changed, 111 insertions(+), 32 deletions(-) create mode 100644 monitoring/uss_qualifier/configurations/dev/dss_probing.yaml create mode 100644 monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md create mode 100644 monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml create mode 100644 monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md create mode 100644 monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml diff --git a/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml b/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml new file mode 100644 index 0000000000..72c3bd91a8 --- /dev/null +++ b/monitoring/uss_qualifier/configurations/dev/dss_probing.yaml @@ -0,0 +1,41 @@ +$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 + action: + test_suite: + suite_definition: + name: DSS instance probing + resources: + netrid_dss_instance_v19: resources.astm.f3411.DSSInstanceResource + netrid_dss_instance_v22a: resources.astm.f3411.DSSInstanceResource + id_generator: resources.interuss.IDGeneratorResource + isa: resources.netrid.ServiceAreaResource + actions: + - test_suite: + suite_type: suites.astm.netrid.f3411_19.dss_probing + resources: + dss: netrid_dss_instance_v19 + id_generator: id_generator + isa: isa + on_failure: Continue + - test_suite: + suite_type: suites.astm.netrid.f3411_22a.dss_probing + resources: + dss: netrid_dss_instance_v22a + id_generator: id_generator + isa: isa + on_failure: Continue + resources: + netrid_dss_instance_v19: netrid_dss_instance_v19 + netrid_dss_instance_v22a: netrid_dss_instance_v22a + id_generator: id_generator + isa: service_area + artifacts: + tested_roles: + report_path: output/tested_roles_dss_probing + report: + report_path: output/report_dss_probing.json diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment.yaml index 3e6c76b301..74f4b3a20c 100644 --- a/monitoring/uss_qualifier/configurations/dev/library/environment.yaml +++ b/monitoring/uss_qualifier/configurations/dev/library/environment.yaml @@ -9,6 +9,8 @@ non_baseline_inputs: - 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 @@ -89,6 +91,26 @@ net_rid: 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: diff --git a/monitoring/uss_qualifier/run_locally.sh b/monitoring/uss_qualifier/run_locally.sh index a438e7819b..ac1595965c 100755 --- a/monitoring/uss_qualifier/run_locally.sh +++ b/monitoring/uss_qualifier/run_locally.sh @@ -26,6 +26,7 @@ OTHER_ARGS=${@:2} if [ "$CONFIG_NAME" == "ALL" ]; then declare -a all_configurations=( \ "configurations.dev.noop" \ + "configurations.dev.dss_probing" \ "configurations.dev.geoawareness_cis" \ "configurations.dev.generate_rid_test_data" \ "configurations.dev.geospatial_comprehension" \ diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml index 930fd79b59..5404323390 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml @@ -15,19 +15,7 @@ actions: specification: action_to_repeat: test_suite: - suite_definition: - name: DSS instance validator - resources: - dss: resources.astm.f3411.DSSInstanceResource - id_generator: resources.interuss.IDGeneratorResource - isa: resources.netrid.ServiceAreaResource - actions: - - test_scenario: - scenario_type: scenarios.astm.netrid.v22a.dss.SubscriptionValidation - resources: - dss: dss - id_generator: id_generator - isa: isa + suite_type: suites.astm.netrid.f3411_19.dss_probing resources: dss: dss id_generator: id_generator diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md new file mode 100644 index 0000000000..5b9b915276 --- /dev/null +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.md @@ -0,0 +1,7 @@ + +# DSS instance probing for ASTM NetRID F3411-19 test suite +[`suites.astm.netrid.f3411_19.dss_probing`](./dss_probing.yaml) + +## Actions + +1. Scenario: [ASTM NetRID DSS: Subscription Validation](../../../../scenarios/astm/netrid/v19/dss/subscription_validation.md) ([`scenarios.astm.netrid.v19.dss.SubscriptionValidation`](../../../../scenarios/astm/netrid/v19/dss/subscription_validation.py)) diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml new file mode 100644 index 0000000000..13b165753f --- /dev/null +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19/dss_probing.yaml @@ -0,0 +1,12 @@ +name: DSS instance probing for ASTM NetRID F3411-19 +resources: + dss: resources.astm.f3411.DSSInstanceResource + id_generator: resources.interuss.IDGeneratorResource + isa: resources.netrid.ServiceAreaResource +actions: + - test_scenario: + scenario_type: scenarios.astm.netrid.v19.dss.SubscriptionValidation + resources: + dss: dss + id_generator: id_generator + isa: isa diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml index f113125c71..77411d0577 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml @@ -17,25 +17,7 @@ actions: specification: action_to_repeat: test_suite: - suite_definition: - name: DSS instance validator - resources: - dss: resources.astm.f3411.DSSInstanceResource - id_generator: resources.interuss.IDGeneratorResource - isa: resources.netrid.ServiceAreaResource - actions: - - test_scenario: - scenario_type: scenarios.astm.netrid.v22a.dss.ISASimple - resources: - dss: dss - id_generator: id_generator - isa: isa - - test_scenario: - scenario_type: scenarios.astm.netrid.v22a.dss.SubscriptionValidation - resources: - dss: dss - id_generator: id_generator - isa: isa + suite_type: suites.astm.netrid.f3411_22a.dss_probing resources: dss: dss id_generator: id_generator diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md new file mode 100644 index 0000000000..dc68ba0f78 --- /dev/null +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.md @@ -0,0 +1,8 @@ + +# DSS instance probing for ASTM NetRID F3411-22a test suite +[`suites.astm.netrid.f3411_22a.dss_probing`](./dss_probing.yaml) + +## Actions + +1. Scenario: [ASTM NetRID DSS: Simple ISA](../../../../scenarios/astm/netrid/v22a/dss/isa_simple.md) ([`scenarios.astm.netrid.v22a.dss.ISASimple`](../../../../scenarios/astm/netrid/v22a/dss/isa_simple.py)) +2. Scenario: [ASTM NetRID DSS: Subscription Validation](../../../../scenarios/astm/netrid/v22a/dss/subscription_validation.md) ([`scenarios.astm.netrid.v22a.dss.SubscriptionValidation`](../../../../scenarios/astm/netrid/v22a/dss/subscription_validation.py)) diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml new file mode 100644 index 0000000000..406c167ad1 --- /dev/null +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a/dss_probing.yaml @@ -0,0 +1,18 @@ +name: DSS instance probing for ASTM NetRID F3411-22a +resources: + dss: resources.astm.f3411.DSSInstanceResource + id_generator: resources.interuss.IDGeneratorResource + isa: resources.netrid.ServiceAreaResource +actions: + - test_scenario: + scenario_type: scenarios.astm.netrid.v22a.dss.ISASimple + resources: + dss: dss + id_generator: id_generator + isa: isa + - test_scenario: + scenario_type: scenarios.astm.netrid.v22a.dss.SubscriptionValidation + resources: + dss: dss + id_generator: id_generator + isa: isa