Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[uss_qualifier] Add DSS probing configuration #189

Merged
merged 4 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions monitoring/uss_qualifier/configurations/dev/dss_probing.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions monitoring/uss_qualifier/run_locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
14 changes: 1 addition & 13 deletions monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!--This file is autogenerated via `make format`; do not change manually-->
# 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))
Original file line number Diff line number Diff line change
@@ -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
20 changes: 1 addition & 19 deletions monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!--This file is autogenerated via `make format`; do not change manually-->
# 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))
Original file line number Diff line number Diff line change
@@ -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