diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
index 0ded4dc8a..be69fe6f2 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -50,6 +50,7 @@ def _rect_str(rect) -> str:
VERTICAL_SPEED_PRECISION = 0.1
+SPEED_PRECISION = 0.05
@dataclass
@@ -906,6 +907,10 @@ def _evaluate_normal_sp_observation(
]
observed_position = mapping.observed_flight.most_recent_position
injected_position = injected_telemetry.position
+
+ # TODO all/most checks below (Not only 'alt' but also, speed, etc.) should be moved to the common dictionary evaluator
+ # The intent is to do so in a cleanup step once all fields have been checked.
+ # Tracked in issue https://github.com/interuss/monitoring/issues/842
if "alt" in observed_position:
with self._test_scenario.check(
"Service Provider altitude",
@@ -938,6 +943,25 @@ def _evaluate_normal_sp_observation(
details=f"{mapping.injected_flight.uss_participant_id}'s flight with injection ID {mapping.injected_flight.flight.injection_id} in test {mapping.injected_flight.test_id} had telemetry index {mapping.telemetry_index} at {injected_telemetry.timestamp} with vertical speed {injected_telemetry.vertical_speed}, but Service Provider reported vertical speed {mapping.observed_flight.flight.raw.current_state.vertical_speed} at {mapping.observed_flight.query.query.request.initiated_at}",
)
+ if mapping.observed_flight.flight.raw.current_state is not None:
+ with self._test_scenario.check(
+ "Service Provider speed",
+ [mapping.injected_flight.uss_participant_id],
+ ) as check:
+ # Based on the spec, expecting a precision of 0.05 m/s is reasonable: the sample value is '1.9'
+ # and the maximal value is '254.25' (to be used if the speed is > 254.25 m/s).
+ if (
+ abs(
+ injected_telemetry.speed
+ - mapping.observed_flight.flight.raw.current_state.speed
+ )
+ > SPEED_PRECISION
+ ):
+ check.record_failed(
+ "Speed reported by Service Provider does not match injected speed",
+ details=f"{mapping.injected_flight.uss_participant_id}'s flight with injection ID {mapping.injected_flight.flight.injection_id} in test {mapping.injected_flight.test_id} had telemetry index {mapping.telemetry_index} at {injected_telemetry.timestamp} with speed={injected_telemetry.speed}, but Service Provider reported speed={mapping.observed_flight.flight.raw.current_state.speed} at {mapping.observed_flight.query.query.request.initiated_at}",
+ )
+
# Verify that flight details queries succeeded and returned correctly-formatted data
for mapping in mappings.values():
details_queries = [
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 6b71b5651..1f6e188d2 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/nominal_behavior.md
@@ -92,6 +92,10 @@ The identity of flights is determined by precisely matching the known injected p
**[astm.f3411.v19.NET0260,Table1,20](../../../../requirements/astm/f3411/v19.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider. Injected flight data had a specified vertical speed that was different from the reported one.
+#### ⚠️ Service Provider speed check
+
+**[astm.f3411.v19.NET0260,Table1,19](../../../../requirements/astm/f3411/v19.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider. Injected flight data had a specified speed that was different from the reported one.
+
#### Successful flight details query check
**[astm.f3411.v19.NET0710,2](../../../../requirements/astm/f3411/v19.md)** and **[astm.f3411.v19.NET0340](../../../../requirements/astm/f3411/v19.md)** require a Service Provider to implement the GET flight details endpoint. This check will fail if uss_qualifier cannot query that endpoint (specified in the ISA present in the DSS) successfully.
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 6b728bf9a..d06ae6f38 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/nominal_behavior.md
@@ -92,6 +92,10 @@ The identity of flights is determined by precisely matching the known injected p
**[astm.f3411.v22a.NET0260,Table1,21](../../../../requirements/astm/f3411/v22a.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider. Injected flight data had a specified vertical speed that was different from the reported one.
+#### ⚠️ Service Provider speed check
+
+**[astm.f3411.v22a.NET0260,Table1,20](../../../../requirements/astm/f3411/v22a.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider. Injected flight data had a specified speed that was different from the reported one.
+
#### Successful flight details query check
**[astm.f3411.v22a.NET0710,2](../../../../requirements/astm/f3411/v22a.md)** and **[astm.f3411.v22a.NET0340](../../../../requirements/astm/f3411/v22a.md) require a Service Provider to implement the GET flight details endpoint. This check will fail if uss_qualifier cannot query that endpoint (specified in the ISA present in the DSS) successfully.
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index bbe1e5ddb..261fa76bc 100644
--- a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
+++ b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
@@ -21,7 +21,7 @@
| Checked in |
- astm
.f3411
.v19 |
+ astm
.f3411
.v19 |
DSS0010 |
Implemented |
ASTM NetRID DSS: Token Validation |
@@ -251,6 +251,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,19 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,20 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index da5c26460..43ee9f472 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 |
@@ -271,6 +271,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,20 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,21 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index 978433bee..347e731f2 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 |
@@ -267,6 +267,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,20 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,21 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index 50a717451..b3a24cb34 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 |
@@ -268,6 +268,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,20 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,21 |
Implemented |