diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py
index f4232bcda1..b6f5a3ff00 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py
@@ -1,3 +1,4 @@
+import datetime
import math
from typing import List, Optional
@@ -18,7 +19,6 @@
injection,
)
from uas_standards.interuss.automated_testing.rid.v1.injection import (
- RIDAircraftState,
RIDAircraftPosition,
)
@@ -47,11 +47,20 @@ def __init__(
def evaluate_sp_flight(
self,
+ injected_flight: injection.TestFlight,
observed_flight: Flight,
participant_id: ParticipantID,
+ query_timestamp: datetime.datetime,
):
"""Implements fragment documented in `common_dictionary_evaluator_sp_flight.md`."""
+ self._evaluate_ua_type(
+ injected_flight.get("aircraft_type"),
+ observed_flight.aircraft_type,
+ [participant_id],
+ query_timestamp,
+ )
+
self._evaluate_operational_status(
observed_flight.operational_status,
[participant_id],
@@ -59,23 +68,36 @@ def evaluate_sp_flight(
def evaluate_dp_flight(
self,
- injected_flight: RIDAircraftState,
+ injected_telemetry: injection.RIDAircraftState,
+ injected_flight: injection.TestFlight,
observed_flight: observation_api.Flight,
participants: List[str],
+ query_timestamp: datetime.datetime,
):
"""Implements fragment documented in `common_dictionary_evaluator_dp_flight.md`."""
+ self._evaluate_ua_type(
+ injected_flight.get("aircraft_type"),
+ observed_flight.get("aircraft_type"),
+ participants,
+ query_timestamp,
+ )
+
# If the state is present, we do validate its content,
# but its presence is optional
- if injected_flight.has_field_with_value("current_state"):
+ if injected_telemetry.has_field_with_value("current_state"):
self._evaluate_speed(
- injected_flight.speed, observed_flight.current_state.speed, participants
+ injected_telemetry.speed,
+ observed_flight.current_state.speed,
+ participants,
)
self._evaluate_track(
- injected_flight.track, observed_flight.current_state.track, participants
+ injected_telemetry.track,
+ observed_flight.current_state.track,
+ participants,
)
self._evaluate_timestamp(
- injected_flight.timestamp,
+ injected_telemetry.timestamp,
observed_flight.current_state.timestamp,
participants,
)
@@ -87,10 +109,12 @@ def evaluate_dp_flight(
)
self._evaluate_position(
- injected_flight.position, observed_flight.most_recent_position, participants
+ injected_telemetry.position,
+ observed_flight.most_recent_position,
+ participants,
)
self._evaluate_height(
- injected_flight.get("height"),
+ injected_telemetry.get("height"),
observed_flight.most_recent_position.get("height"),
participants,
)
@@ -651,3 +675,77 @@ def _evaluate_operational_status(
key="skip_reason",
message=f"Unsupported version {self._rid_version}: skipping Operational Status evaluation",
)
+
+ def _evaluate_ua_type(
+ self,
+ injected_val: Optional[str],
+ observed_val: Optional[str],
+ participants: List[ParticipantID],
+ query_timestamp: datetime.datetime,
+ ):
+ with self._test_scenario.check(
+ "UA type is present and consistent with injected one",
+ participants,
+ ) as check:
+ if observed_val is None:
+ check.record_failed(
+ "UA type is missing",
+ details="USS did not return any UA type",
+ query_timestamps=[query_timestamp],
+ )
+ elif not observed_val:
+ check.record_failed(
+ "UA type is empty",
+ details="USS returned an empty UA type",
+ query_timestamps=[query_timestamp],
+ )
+
+ equivalent = {injection.UAType.HybridLift, injection.UAType.VTOL}
+ if injected_val is None:
+ if observed_val != injection.UAType.NotDeclared:
+ check.record_failed(
+ "UA type is inconsistent, expected 'NotDeclared' since no value was injected",
+ details=f"USS returned the UA type {observed_val}, yet no value was injected, which should have been mapped to 'NotDeclared'.",
+ query_timestamps=[query_timestamp],
+ )
+
+ elif injected_val in equivalent:
+ if observed_val not in equivalent:
+ check.record_failed(
+ "UA type is inconsistent with injected value",
+ details=f"USS returned the UA type {observed_val}, yet the value {injected_val} was injected, given that {equivalent} are equivalent .",
+ query_timestamps=[query_timestamp],
+ )
+
+ elif injected_val != observed_val:
+ check.record_failed(
+ "UA type is inconsistent with injected value",
+ details=f"USS returned the UA type {observed_val}, yet the value {injected_val} was injected.",
+ query_timestamps=[query_timestamp],
+ )
+
+ with self._test_scenario.check(
+ "UA type is consistent with Common Data Dictionary",
+ participants,
+ ) as check:
+ try:
+ injection.UAType(observed_val)
+ except ValueError:
+ check.record_failed(
+ "UA type is invalid",
+ details=f"USS returned an invalid UA type: {observed_val}.",
+ query_timestamps=[query_timestamp],
+ )
+
+ if (
+ self._rid_version == RIDVersion.f3411_19
+ and observed_val == injection.UAType.HybridLift
+ ) or (
+ self._rid_version == RIDVersion.f3411_22a
+ and observed_val == injection.UAType.VTOL
+ ):
+ check.record_failed(
+ "UA type is inconsistent RID version",
+ details=f"USS returned the UA type {observed_val} which is not supported by the RID version used ({self._rid_version}).",
+ query_timestamps=[query_timestamp],
+ )
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 628645ec7a..b63b337aa9 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -2,7 +2,7 @@
import math
from dataclasses import dataclass
-from typing import List, Optional, Dict, Union, Set, Tuple, cast
+from typing import List, Optional, Dict, Union, Set, Tuple
import arrow
import s2sphere
@@ -406,9 +406,11 @@ def _evaluate_normal_observation(
)
self._common_dictionary_evaluator.evaluate_dp_flight(
- injected_flight=injected_telemetry,
- observed_flight=mapping.observed_flight,
- participants=[observer.participant_id],
+ injected_telemetry,
+ mapping.injected_flight.flight,
+ mapping.observed_flight,
+ [observer.participant_id],
+ query.request.timestamp,
)
# Check that flights using telemetry are not using extrapolated position data
@@ -890,6 +892,7 @@ def _evaluate_normal_sp_observation(
for mapping in mappings.values():
participant_id = mapping.injected_flight.uss_participant_id
+ injected_flight = mapping.injected_flight.flight
observed_flight = mapping.observed_flight.flight
flights_queries = [
q
@@ -901,6 +904,7 @@ def _evaluate_normal_sp_observation(
f"Found {len(flights_queries)} flights queries (instead of the expected 1) for flight {mapping.observed_flight.id} corresponding to injection ID {mapping.injected_flight.flight.injection_id} for {participant_id}"
)
flights_query = flights_queries[0]
+ query_timestamp = flights_query.query.request.timestamp
# Verify that flights queries returned correctly-formatted data
errors = schema_validation.validate(
@@ -920,7 +924,7 @@ def _evaluate_normal_sp_observation(
f"At {e.json_path} in the response: {e.message}"
for e in errors
),
- query_timestamps=[flights_query.query.request.timestamp],
+ query_timestamps=[query_timestamp],
)
# Check recent positions timings
@@ -935,8 +939,10 @@ def _evaluate_normal_sp_observation(
# Check flight consistency with common data dictionary
self._common_dictionary_evaluator.evaluate_sp_flight(
+ injected_flight,
observed_flight,
participant_id,
+ query_timestamp,
)
# Check that required fields are present and match for any observed flights matching injected flights
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_dp_flight.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_dp_flight.md
index 99cfd96720..774eed4639 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_dp_flight.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_dp_flight.md
@@ -2,6 +2,17 @@
This fragment is implemented in `common_dictionary_evaluator.py:RIDCommonDictionaryEvaluator.evaluate_dp_flight`.
-#### Correct up-to-date altitude if present check
+## ⚠️ UA type is present and consistent with injected one check
+
+**[astm.f3411.v19.NET0470](../../../../requirements/astm/f3411/v19.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary.
+The UA type being a required field, this check will fail as per **[astm.f3411.v19.NET0470,Table1,3](../../../../requirements/astm/f3411/v19.md)** if it is missing.
+In addition, if the UA type reported for an observation does not correspond to the injected one, the DP is not providing timely and accurate data and is thus in breach of **[astm.f3411.v19.NET0450](../../../../requirements/astm/f3411/v19.md)**
+
+## ⚠️ UA type is consistent with Common Data Dictionary check
+
+**[astm.f3411.v19.NET0470](../../../../requirements/astm/f3411/v19.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary.
+This check will fail if the observed UA type has an invalid value as per **[astm.f3411.v19.NET0470,Table1,3](../../../../requirements/astm/f3411/v19.md)**.
+
+## Correct up-to-date altitude if present check
If the observed altitude of a flight is reported, but it does not match the altitude of the injected telemetry, the display provider is not providing precise and up-to-date information, and thus does not respect **[astm.f3411.v19.NET0450](../../../../requirements/astm/f3411/v19.md)**.
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_sp_flight.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_sp_flight.md
index e1c7da0830..e716dc7462 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_sp_flight.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/common_dictionary_evaluator_sp_flight.md
@@ -2,6 +2,16 @@
This fragment is implemented in `common_dictionary_evaluator.py:RIDCommonDictionaryEvaluator.evaluate_sp_flight`.
+## ⚠️ UA type is present and consistent with injected one check
+
+**[astm.f3411.v19.NET0260,Table1,3](../../../../requirements/astm/f3411/v19.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider.
+The UA type being a required field, this check will fail if it is missing or if it inconsistent with the injected value.
+
+## ⚠️ UA type is consistent with Common Data Dictionary check
+
+**[astm.f3411.v19.NET0260,Table1,3](../../../../requirements/astm/f3411/v19.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider.
+This check will fail if the observed UA type has an invalid value.
+
## Service Provider altitude check
**[astm.f3411.v19.NET0260,Table1,11](../../../../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 known altitudes, but the altitude reported by the Service Provider did not match those known altitudes.
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_dp_flight.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_dp_flight.md
index a10756b167..ee21d8992e 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_dp_flight.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_dp_flight.md
@@ -2,6 +2,17 @@
This fragment is implemented in `common_dictionary_evaluator.py:RIDCommonDictionaryEvaluator.evaluate_dp_flight`.
+## ⚠️ UA type is present and consistent with injected one check
+
+**[astm.f3411.v22a.NET0470](../../../../requirements/astm/f3411/v22a.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary.
+The UA type being a required field, this check will fail as per **[astm.f3411.v22a.NET0470,Table1,2](../../../../requirements/astm/f3411/v22a.md)** if it is missing.
+In addition, if the UA type reported for an observation does not correspond to the injected one, the DP is not providing timely and accurate data and is thus in breach of **[astm.f3411.v22a.NET0450](../../../../requirements/astm/f3411/v22a.md)**
+
+## ⚠️ UA type is consistent with Common Data Dictionary check
+
+**[astm.f3411.v22a.NET0470](../../../../requirements/astm/f3411/v22a.md)** requires that Net-RID Display Provider shall provide access to required and optional fields to Remote ID Display Applications according to the Common Dictionary.
+This check will fail if the observed UA type has an invalid value as per **[astm.f3411.v22a.NET0470,Table1,2](../../../../requirements/astm/f3411/v22a.md)**.
+
## Correct up-to-date altitude if present check
If the observed altitude of a flight is reported, but it does not match the altitude of the injected telemetry, the display provider is not providing precise and up-to-date information, and thus does not respect **[astm.f3411.v22a.NET0450](../../../../requirements/astm/f3411/v22a.md)**.
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_sp_flight.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_sp_flight.md
index d4ffe022d9..e2451953b7 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_sp_flight.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/common_dictionary_evaluator_sp_flight.md
@@ -2,6 +2,16 @@
This fragment is implemented in `common_dictionary_evaluator.py:RIDCommonDictionaryEvaluator.evaluate_sp_flight`.
+## ⚠️ UA type is present and consistent with injected one check
+
+**[astm.f3411.v22a.NET0260,Table1,2](../../../../requirements/astm/f3411/v22a.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider.
+The UA type being a required field, this check will fail if it is missing or if it inconsistent with the injected value.
+
+## ⚠️ UA type is consistent with Common Data Dictionary check
+
+**[astm.f3411.v22a.NET0260,Table1,2](../../../../requirements/astm/f3411/v22a.md)** requires that relevant Remote ID data, consistent with the common data dictionary, be reported by the Service Provider.
+This check will fail if the observed UA type has an invalid value.
+
## Service Provider altitude check
**[astm.f3411.v22a.NET0260,Table1,12](../../../../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 known altitudes, but the altitude reported by the Service Provider did not match those known altitudes.
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index 11bcf644ac..a7091a2075 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 |
@@ -311,6 +311,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,3 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,5 |
Implemented |
@@ -356,6 +361,16 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0470 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
+
+ | NET0470,Table1,3 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0480 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index 654452ad8c..c26227f405 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 |
@@ -321,6 +321,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,20 |
Implemented |
@@ -441,6 +446,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0470,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0470,Table1,20 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index c01bf40411..76bc82a6d0 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 |
@@ -317,6 +317,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,20 |
Implemented |
@@ -437,6 +442,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0470,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0470,Table1,20 |
Implemented |
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index efcfd7fdfb..d0a2706d0a 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 |
@@ -318,6 +318,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0260,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0260,Table1,20 |
Implemented |
@@ -438,6 +443,11 @@
Implemented |
ASTM NetRID nominal behavior |
+
+ | NET0470,Table1,2 |
+ Implemented |
+ ASTM NetRID nominal behavior |
+
| NET0470,Table1,20 |
Implemented |