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.

Sign up for GitHub

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] Wire additional resources into certain configurations to avoid warnings #363

Merged
merged 1 commit into from
Nov 28, 2023
Merged

[uss_qualifier] Wire additional resources into certain configurations to avoid warnings #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions monitoring/uss_qualifier/configurations/dev/f3548_self_contained.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ v1:
invalid_flight_intents: invalid_flight_intents
non_conflicting_flights: non_conflicting_flights
dss: dss
dss_instances: dss_instances
mock_uss: mock_uss

# This block defines all the resources available in the resource pool.
Expand Down Expand Up @@ -87,6 +88,19 @@ v1:
participant_id: uss1
base_url: http://dss.uss1.localutm

dss_instances:
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 that can be used in tests for flight planning, modifying data sharing behavior and recording interactions
mock_uss:
resource_type: resources.interuss.mock_uss.client.MockUSSResource
Expand Down
5 changes: 5 additions & 0 deletions monitoring/uss_qualifier/configurations/dev/message_signing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ v1:
resource_declarations:
che_conflicting_flights: {$ref: 'library/resources.yaml#/che_conflicting_flights'}
che_invalid_flight_intents: {$ref: 'library/resources.yaml#/che_invalid_flight_intents'}
che_non_conflicting_flights: {$ref: 'library/resources.yaml#/che_non_conflicting_flights'}
combination_selector:
resource_type: resources.flight_planning.FlightPlannerCombinationSelectorResource
specification:
Expand All @@ -14,6 +15,7 @@ v1:

utm_auth: {$ref: 'library/environment.yaml#/utm_auth'}
scd_dss: {$ref: 'library/environment.yaml#/scd_dss'}
scd_dss_instances: {$ref: 'library/environment.yaml#/scd_dss_instances'}
flight_planners:
resource_type: resources.flight_planning.FlightPlannersResource
dependencies:
Expand Down Expand Up @@ -46,8 +48,11 @@ v1:
flight_planners: flight_planners
combination_selector: combination_selector
conflicting_flights: che_conflicting_flights
invalid_flight_intents: che_invalid_flight_intents
non_conflicting_flights: che_non_conflicting_flights
priority_preemption_flights: che_conflicting_flights
dss: scd_dss
dss_instances: scd_dss_instances
execution:
stop_fast: true

Expand Down
7 changes: 7 additions & 0 deletions monitoring/uss_qualifier/suites/faa/uft/message_signing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ resources:
flight_planners: resources.flight_planning.FlightPlannersResource
combination_selector: resources.flight_planning.FlightPlannerCombinationSelectorResource
dss: resources.astm.f3548.v21.DSSInstanceResource
dss_instances: resources.astm.f3548.v21.DSSInstancesResource?
conflicting_flights: resources.flight_planning.FlightIntentsResource
non_conflicting_flights: resources.flight_planning.FlightIntentsResource
priority_preemption_flights: resources.flight_planning.FlightIntentsResource
invalid_flight_intents: resources.flight_planning.FlightIntentsResource
actions:
- test_scenario:
scenario_type: scenarios.faa.uft.StartMessageSigningReport
Expand All @@ -15,12 +18,16 @@ actions:
- test_suite:
suite_type: suites.astm.utm.f3548_21
resources:
mock_uss: mock_uss
conflicting_flights: conflicting_flights
non_conflicting_flights: non_conflicting_flights
priority_preemption_flights: priority_preemption_flights
flight_planners: flight_planners
nominal_planning_selector: combination_selector
invalid_flight_intents: invalid_flight_intents
priority_planning_selector: combination_selector
dss: dss
dss_instances: dss_instances
on_failure: Continue
- test_scenario:
scenario_type: scenarios.faa.uft.FinalizeMessageSigningReport
Expand Down
Loading