Skip to content

[uss_qualifier] Make observers optional in NetRID scenarios #1350

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

Draft
BenjaminPelletier wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Draft

[uss_qualifier] Make observers optional in NetRID scenarios #1350

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
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ class AggregateChecks(GenericTestScenario):
def __init__(
self,
service_providers: NetRIDServiceProviders,
observers: NetRIDObserversResource,
dss_instances: DSSInstancesResource,
observers: NetRIDObserversResource | None = None,
test_exclusions: TestExclusionsResource | None = None,
):
super().__init__()
self._service_providers = service_providers.service_providers
self._observers = observers.observers
self._observers = observers.observers if observers else []
self._dss_instances = dss_instances.dss_instances

# identify SPs and observers by their base URL
Expand Down
9 changes: 5 additions & 4 deletions monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
NetRIDObserversResource,
NetRIDServiceProviders,
)
from monitoring.uss_qualifier.resources.netrid.observers import RIDSystemObserver
from monitoring.uss_qualifier.scenarios.astm.netrid import (
display_data_evaluator,
injection,
Expand All @@ -31,7 +32,7 @@
class NominalBehavior(GenericTestScenario):
_flights_data: FlightDataResource
_service_providers: NetRIDServiceProviders
_observers: NetRIDObserversResource
_observers: list[RIDSystemObserver]
_evaluation_configuration: EvaluationConfigurationResource

_injected_flights: list[InjectedFlight]
Expand All @@ -41,14 +42,14 @@ def __init__(
self,
flights_data: FlightDataResource,
service_providers: NetRIDServiceProviders,
observers: NetRIDObserversResource,
evaluation_configuration: EvaluationConfigurationResource,
observers: NetRIDObserversResource | None = None,
dss_pool: DSSInstancesResource | None = None,
):
super().__init__()
self._flights_data = flights_data
self._service_providers = service_providers
self._observers = observers
self._observers = observers.observers if observers else []
self._evaluation_configuration = evaluation_configuration
self._dss_pool = dss_pool
self._injected_tests = []
Expand Down Expand Up @@ -98,7 +99,7 @@ def _poll_during_flights(self):
)

def poll_fct(rect: LatLngRect) -> bool:
evaluator.evaluate_system_instantaneously(self._observers.observers, rect)
evaluator.evaluate_system_instantaneously(self._observers, rect)
return False

virtual_observer.start_polling(
Expand Down
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/scenarios/astm/netrid/v19/aggregate_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class AggregateChecks(TestScenario, CommonAggregateChecks):
def __init__(
self,
service_providers: NetRIDServiceProviders,
observers: NetRIDObserversResource,
dss_instances: DSSInstancesResource,
observers: NetRIDObserversResource | None = None,
test_exclusions: TestExclusionsResource | None = None,
):
super().__init__(service_providers, observers, dss_instances, test_exclusions)
super().__init__(service_providers, dss_instances, observers, test_exclusions)
self._rid_version = RIDVersion.f3411_19
4 changes: 2 additions & 2 deletions monitoring/uss_qualifier/scenarios/astm/netrid/v22a/aggregate_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class AggregateChecks(TestScenario, CommonAggregateChecks):
def __init__(
self,
service_providers: NetRIDServiceProviders,
observers: NetRIDObserversResource,
dss_instances: DSSInstancesResource,
observers: NetRIDObserversResource | None = None,
test_exclusions: TestExclusionsResource | None = None,
):
super().__init__(service_providers, observers, dss_instances, test_exclusions)
super().__init__(service_providers, dss_instances, observers, test_exclusions)
self._rid_version = RIDVersion.f3411_22a
7 changes: 3 additions & 4 deletions monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ASTM F3411-22a
resources:
flights_data: resources.netrid.FlightDataResource
service_providers: resources.netrid.NetRIDServiceProviders?
observers: resources.netrid.NetRIDObserversResource
observers: resources.netrid.NetRIDObserversResource?
mock_uss_dp: resources.interuss.mock_uss.client.MockUSSResource?
mock_uss_sp: resources.interuss.mock_uss.client.MockUSSResource?
evaluation_configuration: resources.netrid.EvaluationConfigurationResource
Expand Down Expand Up @@ -92,7 +92,7 @@ actions:
resources:
flights_data: flights_data
service_providers: service_providers
observers: observers
observers: observers?
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances?
on_failure: Continue
Expand All @@ -101,15 +101,14 @@ actions:
resources:
flights_data: flights_data
service_providers: service_providers
observers: observers
evaluation_configuration: evaluation_configuration
dss_pool: dss_instances
on_failure: Continue
- test_scenario:
scenario_type: scenarios.astm.netrid.v22a.AggregateChecks
resources:
service_providers: service_providers
observers: observers
observers: observers?
dss_instances: dss_instances
test_exclusions: test_exclusions?
participant_verifiable_capabilities:
Expand Down
Loading