From fd40a1f938360032a8fc97bf9f2b2f740ef94cc2 Mon Sep 17 00:00:00 2001 From: Benjamin Pelletier Date: Wed, 18 Feb 2026 06:47:44 +0000 Subject: [PATCH] Make observers optional in NetRID scenarios --- .../scenarios/astm/netrid/common/aggregate_checks.py | 4 ++-- .../scenarios/astm/netrid/common/nominal_behavior.py | 9 +++++---- .../scenarios/astm/netrid/v19/aggregate_checks.py | 4 ++-- .../scenarios/astm/netrid/v22a/aggregate_checks.py | 4 ++-- .../uss_qualifier/suites/astm/netrid/f3411_22a.yaml | 7 +++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py index 92aebae8e2..e571a0bf58 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py @@ -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 diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py index 8590cfff78..266b4885c6 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py @@ -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, @@ -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] @@ -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 = [] @@ -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( diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/aggregate_checks.py b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/aggregate_checks.py index f792e5d06f..de2694a3da 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/aggregate_checks.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/aggregate_checks.py @@ -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 diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/aggregate_checks.py b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/aggregate_checks.py index 140be819e4..5c2b2abfd1 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/aggregate_checks.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/aggregate_checks.py @@ -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 diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml index fda452f3ee..cfd286d272 100644 --- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml +++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml @@ -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 @@ -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 @@ -101,7 +101,6 @@ actions: resources: flights_data: flights_data service_providers: service_providers - observers: observers evaluation_configuration: evaluation_configuration dss_pool: dss_instances on_failure: Continue @@ -109,7 +108,7 @@ actions: 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: