diff --git a/monitoring/prober/infrastructure.py b/monitoring/prober/infrastructure.py
index 1f8ccc565d..9022444a94 100644
--- a/monitoring/prober/infrastructure.py
+++ b/monitoring/prober/infrastructure.py
@@ -100,7 +100,7 @@ def wrapper_default_scope(*args, **kwargs):
resource_type_code_descriptions: Dict[ResourceType, str] = {}
-# Next code: 399
+# Next code: 400
def register_resource_type(code: int, description: str) -> ResourceType:
"""Register that the specified code refers to the described resource.
diff --git a/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml b/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml
index 3e1953d3a2..354f479df3 100644
--- a/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml
+++ b/monitoring/uss_qualifier/configurations/dev/library/environment_containers.yaml
@@ -226,6 +226,22 @@ mock_uss_instance_uss1:
participant_id: mock_uss
mock_uss_base_url: http://scdsc.uss1.localutm
+mock_uss_instance_dp_v19:
+ resource_type: resources.interuss.mock_uss.client.MockUSSResource
+ dependencies:
+ auth_adapter: utm_auth
+ specification:
+ participant_id: mock_uss
+ mock_uss_base_url: http://v19.riddp.uss3.localutm
+
+mock_uss_instance_dp_v22a:
+ resource_type: resources.interuss.mock_uss.client.MockUSSResource
+ dependencies:
+ auth_adapter: utm_auth
+ specification:
+ participant_id: mock_uss
+ mock_uss_base_url: http://v22a.riddp.uss1.localutm
+
mock_uss_instance_uss6:
resource_type: resources.interuss.mock_uss.client.MockUSSResource
dependencies:
diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml
index 155e4eccea..289c14dbc8 100644
--- a/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml
+++ b/monitoring/uss_qualifier/configurations/dev/netrid_v19.yaml
@@ -15,6 +15,8 @@ v1:
netrid_observers_v19: {$ref: 'library/environment.yaml#/netrid_observers_v19'}
netrid_dss_instances_v19: {$ref: 'library/environment.yaml#/netrid_dss_instances_v19'}
+ mock_uss_instance_dp_v19: {$ref: 'library/environment.yaml#/mock_uss_instance_dp_v19'}
+
test_exclusions: { $ref: 'library/resources.yaml#/test_exclusions' }
non_baseline_inputs:
- v1.test_run.resources.resource_declarations.utm_auth
@@ -28,6 +30,7 @@ v1:
flights_data: kentland_flights_data
service_providers: netrid_service_providers_v19
observers: netrid_observers_v19
+ mock_uss: mock_uss_instance_dp_v19
evaluation_configuration: netrid_observation_evaluation_configuration
dss_instances: netrid_dss_instances_v19
utm_client_identity: utm_client_identity
diff --git a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml
index 6c8883c988..bd7120b9ab 100644
--- a/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml
+++ b/monitoring/uss_qualifier/configurations/dev/netrid_v22a.yaml
@@ -15,6 +15,8 @@ v1:
netrid_observers_v22a: {$ref: 'library/environment.yaml#/netrid_observers_v22a'}
netrid_dss_instances_v22a: {$ref: 'library/environment.yaml#/netrid_dss_instances_v22a'}
+ mock_uss_instance_dp_v22a: {$ref: 'library/environment.yaml#/mock_uss_instance_dp_v22a'}
+
test_exclusions: { $ref: 'library/resources.yaml#/test_exclusions' }
non_baseline_inputs:
- v1.test_run.resources.resource_declarations.utm_auth
@@ -28,6 +30,7 @@ v1:
flights_data: kentland_flights_data
service_providers: netrid_service_providers_v22a
observers: netrid_observers_v22a
+ mock_uss: mock_uss_instance_dp_v22a
evaluation_configuration: netrid_observation_evaluation_configuration
dss_instances: netrid_dss_instances_v22a
utm_client_identity: utm_client_identity
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 403e5faa99..55b452f644 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py
@@ -1,11 +1,24 @@
-from typing import List, Optional
+from datetime import timedelta
+from typing import List, Optional, Type
+from future.backports.datetime import datetime
+from implicitdict import ImplicitDict
+from loguru import logger
from requests.exceptions import RequestException
from s2sphere import LatLngRect
+from uas_standards.astm.f3411.v19 import api as api_v19
+from uas_standards.astm.f3411.v22a import api as api_v22a
from monitoring.monitorlib.errors import stacktrace_string
from monitoring.monitorlib.rid import RIDVersion
+from monitoring.monitorlib.temporal import Time
+from monitoring.prober.infrastructure import register_resource_type
from monitoring.uss_qualifier.resources.astm.f3411.dss import DSSInstancesResource
+from monitoring.uss_qualifier.resources.interuss import IDGeneratorResource
+from monitoring.uss_qualifier.resources.interuss.mock_uss.client import (
+ MockUSSResource,
+ MockUSSClient,
+)
from monitoring.uss_qualifier.resources.netrid import (
FlightDataResource,
NetRIDServiceProviders,
@@ -16,6 +29,7 @@
display_data_evaluator,
injection,
)
+from monitoring.uss_qualifier.scenarios.astm.netrid.dss_wrapper import DSSWrapper
from monitoring.uss_qualifier.scenarios.astm.netrid.injected_flight_collection import (
InjectedFlightCollection,
)
@@ -31,30 +45,42 @@
class NominalBehavior(GenericTestScenario):
+ SUB_TYPE = register_resource_type(399, "Subscription")
+
_flights_data: FlightDataResource
_service_providers: NetRIDServiceProviders
_observers: NetRIDObserversResource
+ _mock_uss: MockUSSClient
_evaluation_configuration: EvaluationConfigurationResource
_injected_flights: List[InjectedFlight]
_injected_tests: List[InjectedTest]
+ _dss_wrapper: DSSWrapper
+ _subscription_id: str
+
def __init__(
self,
flights_data: FlightDataResource,
service_providers: NetRIDServiceProviders,
observers: NetRIDObserversResource,
+ mock_uss: Optional[MockUSSResource],
evaluation_configuration: EvaluationConfigurationResource,
- dss_pool: Optional[DSSInstancesResource] = None,
+ id_generator: IDGeneratorResource,
+ dss_pool: DSSInstancesResource,
):
super().__init__()
self._flights_data = flights_data
self._service_providers = service_providers
self._observers = observers
+ self._mock_uss = mock_uss.mock_uss
self._evaluation_configuration = evaluation_configuration
self._dss_pool = dss_pool
+ self._dss_wrapper = DSSWrapper(self, dss_pool.dss_instances[0])
self._injected_tests = []
+ self._subscription_id = id_generator.id_factory.make_id(self.SUB_TYPE)
+
@property
def _rid_version(self) -> RIDVersion:
raise NotImplementedError(
@@ -63,17 +89,74 @@ def _rid_version(self) -> RIDVersion:
def run(self, context: ExecutionContext):
self.begin_test_scenario(context)
+
+ self.begin_test_case("Setup")
+
+ if not self._mock_uss:
+ self.record_note(
+ "notification_testing",
+ "Mock USS not available, will skip checks related to notifications",
+ )
+
+ self.begin_test_step("Clean workspace")
+ # Test flights are being taken care of by preparation step before this scenario
+ self._dss_wrapper.cleanup_sub(self._subscription_id)
+
+ self.end_test_step()
+ self.end_test_case()
+
self.begin_test_case("Nominal flight")
+ if self._mock_uss:
+ self.begin_test_step("Mock USS Subscription")
+ self._subscribe_mock_uss()
+ self.end_test_step()
+
self.begin_test_step("Injection")
self._inject_flights()
self.end_test_step()
self._poll_during_flights()
+ if self._mock_uss:
+ self.begin_test_step("Validate Mock USS received notification")
+ self._validate_mock_uss_notifications(context.start_time)
+ self.end_test_step()
+
self.end_test_case()
self.end_test_scenario()
+ def _subscribe_mock_uss(self):
+ dss_wrapper = DSSWrapper(self, self._dss_pool.dss_instances[0])
+ # Get all bounding rects for flights
+ flight_rects = [f.get_rect() for f in self._flights_data.get_test_flights()]
+ flight_union: Optional[LatLngRect] = None
+ for fr in flight_rects:
+ if flight_union is None:
+ flight_union = fr
+ else:
+ flight_union = flight_union.union(fr)
+ with self.check(
+ "Subscription creation succeeds", dss_wrapper.participant_id
+ ) as check:
+ cs = dss_wrapper.put_sub(
+ check,
+ [flight_union.get_vertex(k) for k in range(4)],
+ 0,
+ 3000,
+ datetime.now(),
+ datetime.now() + timedelta(hours=1),
+ self._mock_uss.base_url + "/mock/riddp",
+ self._subscription_id,
+ None,
+ )
+ if not cs.success:
+ check.record_failed(
+ summary="Error while creating a Subscription for the Mock USS on the DSS",
+ details=f"Error message: {cs.errors}",
+ )
+ return
+
def _inject_flights(self):
(self._injected_flights, self._injected_tests) = injection.inject_flights(
self, self._flights_data, self._service_providers
@@ -110,8 +193,98 @@ def poll_fct(rect: LatLngRect) -> bool:
poll_fct,
)
+ def _validate_mock_uss_notifications(self, scenario_start_time: datetime):
+ interactions, q = self._mock_uss.get_interactions(Time(scenario_start_time))
+ if q.status_code != 200:
+ logger.error(
+ f"Failed to get interactions from mock uss: HTTP {q.status_code} - {q.response.json}"
+ )
+ self.record_note(
+ "mock_uss_interactions",
+ f"failed to obtain interactions with http status {q.status_code}",
+ )
+ return
+
+ logger.debug(
+ f"Received {len(interactions)} interactions from mock uss:\n{interactions}"
+ )
+
+ # For each of the service providers we injected flights in,
+ # we're looking for an inbound notification for the mock_uss's subscription:
+ for test_flight in self._injected_flights:
+ notification_reception_times = []
+ with self.check(
+ "Service Provider issued a notification", test_flight.uss_participant_id
+ ) as check:
+ notif_param_type = self._notif_param_type()
+ sub_notif_interactions: List[(datetime, notif_param_type)] = [
+ (
+ i.query.request.received_at.datetime,
+ ImplicitDict.parse(i.query.request.json, notif_param_type),
+ )
+ for i in interactions
+ if i.query.request.method == "POST"
+ and i.direction == "Incoming"
+ and "/uss/identification_service_areas/" in i.query.request.url
+ ]
+ for (received_at, notification) in sub_notif_interactions:
+ for sub in notification.subscriptions:
+ if (
+ sub.subscription_id == self._subscription_id
+ and notification.service_area.owner
+ == test_flight.uss_participant_id
+ ):
+ notification_reception_times.append(received_at)
+
+ if len(notification_reception_times) == 0:
+ check.record_failed(
+ summary="No notification received",
+ details=f"No notification received from {test_flight.uss_participant_id} for subscription {self._subscription_id} about flight {test_flight.test_id} that happened within the subscription's boundaries.",
+ )
+ continue
+
+ # The performance requirements define 95th and 99th percentiles for the SP to respect,
+ # which we can't strictly check with one (or very few) samples.
+ # Furthermore, we use the time of injection as the 'starting point', which is necessarily before the SP
+ # actually becomes aware of the subscription (when the ISA is created at the DSS)
+ # the p95 to respect is 1 second, the p99 is 3 seconds.
+ # As an approximation, we check that the single sample (or the average of the few) is below the p99.
+ notif_latencies = [
+ l - test_flight.query_timestamp for l in notification_reception_times
+ ]
+ avg_latency = (
+ sum(notif_latencies, timedelta(0)) / len(notif_latencies)
+ if notif_latencies
+ else None
+ )
+ with self.check(
+ "Service Provider notification was received within delay",
+ test_flight.uss_participant_id,
+ ) as check:
+ if avg_latency.seconds > self._rid_version.dp_data_resp_percentile99_s:
+ check.record_failed(
+ summary="Notification received too late",
+ details=f"Notification(s) received {avg_latency} after the flight ended, which is more than the allowed 99th percentile of {self._rid_version.dp_data_resp_percentile99_s} seconds.",
+ )
+
+ def _notif_param_type(
+ self,
+ ) -> Type[
+ api_v19.PutIdentificationServiceAreaNotificationParameters
+ | api_v22a.PutIdentificationServiceAreaNotificationParameters
+ ]:
+ if self._rid_version == RIDVersion.f3411_19:
+ return api_v19.PutIdentificationServiceAreaNotificationParameters
+ elif self._rid_version == RIDVersion.f3411_22a:
+ return api_v22a.PutIdentificationServiceAreaNotificationParameters
+ else:
+ raise ValueError(f"Unsupported RID version: {self._rid_version}")
+
def cleanup(self):
self.begin_cleanup()
+
+ self._dss_wrapper.cleanup_sub(self._subscription_id)
+
while self._injected_tests:
injected_test = self._injected_tests.pop()
matching_sps = [
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md
index 5cf14bec10..ae6d1b859e 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md
@@ -18,16 +18,38 @@ A set of [`NetRIDServiceProviders`](../../../../resources/netrid/service_provide
A set of [`NetRIDObserversResource`](../../../../resources/netrid/observers.py) to be tested via checking their observations of the NetRID system and comparing the observations against expectations. An observer generally represents a "Display Application", in ASTM F3411 terminology. This scenario requires at least one observer.
+### mock_uss
+
+(Optional) MockUSSResource for testing notification delivery. If left unspecified, the scenario will not run any notification-related checks.
+
### evaluation_configuration
This [`EvaluationConfigurationResource`](../../../../resources/netrid/evaluation.py) defines how to gauge success when observing the injected flights.
+### id_generator
+
+[`IDGeneratorResource`](../../../../../resources/interuss/id_generator.py) providing the Subscription ID for this scenario.
+
### dss_pool
If specified, uss_qualifier will act as a Display Provider and check a DSS instance from this [`DSSInstanceResource`](../../../../resources/astm/f3411/dss.py) for appropriate identification service areas and then query the corresponding USSs with flights using the same session.
+## Setup test case
+
+### [Clean workspace test step](./dss/test_steps/clean_workspace.md)
+
## Nominal flight test case
+### Mock USS Subscription test step
+
+Before injecting the test flights, a subscription is created on the DSS for the configured mock USS to allow it
+to validate that Servie Providers under test correctly send out notifications.
+
+#### ⚠️ Subscription creation succeeds check
+
+As per **[astm.f3411.v19.DSS0030,c](../../../../requirements/astm/f3411/v19.md)**, the DSS API must allow callers to create a subscription with either onr or both of the
+start and end time missing, provided all the required parameters are valid.
+
### Injection test step
In this step, uss_qualifier injects a single nominal flight into each SP under test, usually with a start time in the future. Each SP is expected to queue the provided telemetry and later simulate that telemetry coming from an aircraft at the designated timestamps.
@@ -120,6 +142,25 @@ Per **[interuss.automated_testing.rid.observation.UniqueFlights](../../../../req
Per **[interuss.automated_testing.rid.observation.ObservationSuccess](../../../../requirements/interuss/automated_testing/rid/observation.md)**, the call for flight details is expected to succeed since a valid ID was provided by uss_qualifier.
+### Validate Mock USS received notification test step
+
+This test step verifies that the mock_uss for which a subscription was registered before flight injection properly received a notification from each Service Provider
+at which a flight was injected.
+
+#### ℹ️ Service Provider issued a notification check
+
+This check validates that each Service Provider at which a test flight was injected properly notified the mock_uss.
+
+ASTM F3411 V19 has no explicit requirement for this check, so failing it will raise an informational warning.
+
+#### ⚠️ Service Provider notification was received within delay check
+
+This check validates that the notification from each Service Provider was received by the mock_uss within the specified delay.
+
+ASTM F3411 V19 has no explicit requirement for this check, so failing it will raise an informational warning.
+
+This check will be failed if it takes longer than 3 seconds between the injection of the flight and the notification being received by the mock_uss.
+
## Cleanup
The cleanup phase of this test scenario attempts to remove injected data from all SPs.
@@ -127,3 +168,7 @@ The cleanup phase of this test scenario attempts to remove injected data from al
### ⚠️ Successful test deletion check
**[interuss.automated_testing.rid.injection.DeleteTestSuccess](../../../../requirements/interuss/automated_testing/rid/injection.md)**
+
+### [Clean Subscriptions](./dss/test_steps/clean_workspace.md)
+
+Remove all created subscriptions from the DSS.
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md
index 068a27e2ec..029b6b9f01 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md
@@ -18,6 +18,10 @@ A set of [`NetRIDServiceProviders`](../../../../resources/netrid/service_provide
A set of [`NetRIDObserversResource`](../../../../resources/netrid/observers.py) to be tested via checking their observations of the NetRID system and comparing the observations against expectations. An observer generally represents a "Display Application", in ASTM F3411 terminology. This scenario requires at least one observer.
+### mock_uss
+
+(Optional) MockUSSResource for testing notification delivery. If left unspecified, the scenario will not run any notification-related checks.
+
### evaluation_configuration
This [`EvaluationConfigurationResource`](../../../../resources/netrid/evaluation.py) defines how to gauge success when observing the injected flights.
@@ -26,8 +30,26 @@ This [`EvaluationConfigurationResource`](../../../../resources/netrid/evaluation
If specified, uss_qualifier will act as a Display Provider and check a DSS instance from this [`DSSInstanceResource`](../../../../resources/astm/f3411/dss.py) for appropriate identification service areas and then query the corresponding USSs with flights using the same session.
+### id_generator
+
+[`IDGeneratorResource`](../../../../../resources/interuss/id_generator.py) providing the Subscription ID for this scenario.
+
+## Setup test case
+
+### [Clean workspace test step](./dss/test_steps/clean_workspace.md)
+
## Nominal flight test case
+### Mock USS Subscription test step
+
+Before injecting the test flights, a subscription is created on the DSS for the configured mock USS to allow it
+to validate that Servie Providers under test correctly send out notifications.
+
+#### Subscription creation succeeds check
+
+As per **[astm.f3411.v22a.DSS0030,c](../../../../requirements/astm/f3411/v22a.md)**, the DSS API must allow callers to create a subscription with either onr or both of the
+start and end time missing, provided all the required parameters are valid.
+
### Injection test step
In this step, uss_qualifier injects a single nominal flight into each SP under test, usually with a start time in the future. Each SP is expected to queue the provided telemetry and later simulate that telemetry coming from an aircraft at the designated timestamps.
@@ -124,6 +146,25 @@ Per **[interuss.automated_testing.rid.observation.ObservationSuccess](../../../.
#### [Flight details consistency with Common Data Dictionary checks](./common_dictionary_evaluator_dp_flight_details.md)
+### Validate Mock USS received notification test step
+
+This test step verifies that the mock_uss for which a subscription was registered before flight injection properly received a notification from each Service Provider
+at which a flight was injected.
+
+#### ⚠️ Service Provider issued a notification check
+
+This check validates that each Service Provider at which a test flight was injected properly notified the mock_uss.
+
+If this is not the case, the respective Service Provider fails to meet **[astm.f3411.v22a.NET0740](../../../../requirements/astm/f3411/v22a.md)**.
+
+#### ⚠️ Service Provider notification was received within delay check
+
+This check validates that the notification from each Service Provider was received by the mock_uss within the specified delay.
+
+**[astm.f3411.v22a.NET0740](../../../../requirements/astm/f3411/v22a.md)** states that a Service Provider must notify the owner of a subscription within `NetDpDataResponse95thPercentile` (1 second) second 95% of the time and `NetDpDataResponse99thPercentile` (3 seconds) 99% of the time as soon as the SP becomes aware of the subscription.
+
+This check will be failed if it takes longer than 3 seconds between the injection of the flight and the notification being received by the mock_uss.
+
## Cleanup
The cleanup phase of this test scenario attempts to remove injected data from all SPs.
@@ -131,3 +172,7 @@ The cleanup phase of this test scenario attempts to remove injected data from al
### ⚠️ Successful test deletion check
**[interuss.automated_testing.rid.injection.DeleteTestSuccess](../../../../requirements/interuss/automated_testing/rid/injection.md)**
+
+### [Clean Subscriptions](./dss/test_steps/clean_workspace.md)
+
+Remove all created subscriptions from the DSS.
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index b5c79ed78c..7afc88e597 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
@@ -44,22 +44,22 @@
| DSS0030,c |
Implemented |
- ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation |
+ ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID nominal behavior |
| DSS0030,d |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,e |
Implemented |
- ASTM F3411-19 NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM F3411-19 NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,f |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0050 |
@@ -404,7 +404,7 @@
| NET0730 |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
interuss
.automated_testing
.rid
.injection |
@@ -442,7 +442,7 @@
interuss
.f3411
.dss_endpoints |
GetISA |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| SearchISAs |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml
index 8bba99aed7..6a0792cc46 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.yaml
@@ -3,6 +3,7 @@ resources:
flights_data: resources.netrid.FlightDataResource
service_providers: resources.netrid.NetRIDServiceProviders
observers: resources.netrid.NetRIDObserversResource
+ mock_uss: resources.interuss.mock_uss.client.MockUSSResource?
evaluation_configuration: resources.netrid.EvaluationConfigurationResource
dss_instances: resources.astm.f3411.DSSInstancesResource
dss_crdb_cluster: resources.interuss.crdb.CockroachDBClusterResource?
@@ -45,7 +46,9 @@ actions:
flights_data: flights_data
service_providers: service_providers
observers: observers
+ mock_uss: mock_uss?
evaluation_configuration: evaluation_configuration
+ id_generator: id_generator
dss_pool: dss_instances
on_failure: Continue
- test_scenario:
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index ca7e03fcd7..7b2494e026 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
@@ -21,7 +21,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -49,22 +49,22 @@
| DSS0030,c |
Implemented |
- ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation |
+ ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID nominal behavior |
| DSS0030,d |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,e |
Implemented |
- ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,f |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0050 |
@@ -534,7 +534,12 @@
| NET0730 |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
+
+
+ | NET0740 |
+ Implemented |
+ ASTM NetRID nominal behavior |
interuss
.automated_testing
.rid
.injection |
@@ -572,7 +577,7 @@
interuss
.f3411
.dss_endpoints |
GetISA |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| SearchISAs |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
index d1644bf1e1..fae3cf395a 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.yaml
@@ -3,6 +3,7 @@ resources:
flights_data: resources.netrid.FlightDataResource
service_providers: resources.netrid.NetRIDServiceProviders?
observers: resources.netrid.NetRIDObserversResource
+ mock_uss: resources.interuss.mock_uss.client.MockUSSResource?
evaluation_configuration: resources.netrid.EvaluationConfigurationResource
dss_instances: resources.astm.f3411.DSSInstancesResource?
dss_crdb_cluster: resources.interuss.crdb.CockroachDBClusterResource?
@@ -46,7 +47,9 @@ actions:
flights_data: flights_data
service_providers: service_providers
observers: observers
+ mock_uss: mock_uss?
evaluation_configuration: evaluation_configuration
+ id_generator: id_generator
dss_pool: dss_instances?
on_failure: Continue
- test_scenario:
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index fed28dc075..0248b32e56 100644
--- a/monitoring/uss_qualifier/suites/uspace/network_identification.md
+++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md
@@ -17,7 +17,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -45,22 +45,22 @@
| DSS0030,c |
Implemented |
- ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation |
+ ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID nominal behavior |
| DSS0030,d |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,e |
Implemented |
- ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,f |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0050 |
@@ -530,7 +530,12 @@
| NET0730 |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
+
+
+ | NET0740 |
+ Implemented |
+ ASTM NetRID nominal behavior |
interuss
.automated_testing
.rid
.injection |
@@ -568,7 +573,7 @@
interuss
.f3411
.dss_endpoints |
GetISA |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| SearchISAs |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index 1a19da1b8b..8abbfd556f 100644
--- a/monitoring/uss_qualifier/suites/uspace/required_services.md
+++ b/monitoring/uss_qualifier/suites/uspace/required_services.md
@@ -18,7 +18,7 @@
Checked in |
- astm
.f3411
.v22a |
+ astm
.f3411
.v22a |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -46,22 +46,22 @@
| DSS0030,c |
Implemented |
- ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation |
+ ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID nominal behavior |
| DSS0030,d |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,e |
Implemented |
- ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM F3411-22a NetRID DSS interoperability
ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0030,f |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| DSS0050 |
@@ -531,7 +531,12 @@
| NET0730 |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
+
+
+ | NET0740 |
+ Implemented |
+ ASTM NetRID nominal behavior |
astm
.f3548
.v21 |
@@ -991,7 +996,7 @@
interuss
.f3411
.dss_endpoints |
GetISA |
Implemented |
- ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation |
+ ASTM NetRID DSS: Concurrent Requests
ASTM NetRID DSS: ISA Expiry
ASTM NetRID DSS: ISA Subscription Interactions
ASTM NetRID DSS: Simple ISA
ASTM NetRID DSS: Submitted ISA Validations
ASTM NetRID DSS: Subscription Simple
ASTM NetRID DSS: Subscription Validation
ASTM NetRID DSS: Token Validation
ASTM NetRID nominal behavior |
| SearchISAs |