[uss_qualifier/scenarios/netrid/nominal_behavior] Add checks for UA t…

…ype in SP (NET0260)

monitoring/uss_qualifier/scenarios/astm/netrid/common_dictionary_evaluator.py

@@ -1,3 +1,4 @@
+import datetime
 import math
 from typing import List, Optional
 
@@ -47,11 +48,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],
@@ -651,3 +661,74 @@ 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],
+                )
+
+            try:
+                injected_val_enum = injection.UAType(injected_val)
+            except ValueError:
+                if observed_val != injection.UAType.NotDeclared:
+                    check.record_failed(
+                        "UA type is inconsistent, expected 'NotDeclared' since no or invalid value was injected",
+                        details=f"USS returned the UA type {observed_val}, yet no value or an invalid value was injected ({injected_val}) which should have been mapped to 'NotDeclared'.",
+                        query_timestamps=[query_timestamp],
+                    )
+
+            if injected_val_enum:
+                equivalent = {injection.UAType.HybridLift, injection.UAType.VTOL}
+                if injected_val != observed_val and not (
+                    injected_val in equivalent and observed_val 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.",
+                        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],
+                )

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
@@ -890,6 +890,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 +902,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 +922,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 +937,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

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.

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.

monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md

@@ -311,6 +311,11 @@
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/netrid/v19/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
   </tr>
+  <tr>
+    <td><a href="../../../requirements/astm/f3411/v19.md">NET0260,Table1,3</a></td>
+    <td>Implemented</td>
+    <td><a href="../../../scenarios/astm/netrid/v19/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
+  </tr>
   <tr>
     <td><a href="../../../requirements/astm/f3411/v19.md">NET0260,Table1,5</a></td>
     <td>Implemented</td>

monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md

@@ -321,6 +321,11 @@
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
   </tr>
+  <tr>
+    <td><a href="../../../requirements/astm/f3411/v22a.md">NET0260,Table1,2</a></td>
+    <td>Implemented</td>
+    <td><a href="../../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
+  </tr>
   <tr>
     <td><a href="../../../requirements/astm/f3411/v22a.md">NET0260,Table1,20</a></td>
     <td>Implemented</td>

monitoring/uss_qualifier/suites/uspace/network_identification.md

@@ -317,6 +317,11 @@
     <td>Implemented</td>
     <td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
   </tr>
+  <tr>
+    <td><a href="../../requirements/astm/f3411/v22a.md">NET0260,Table1,2</a></td>
+    <td>Implemented</td>
+    <td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
+  </tr>
   <tr>
     <td><a href="../../requirements/astm/f3411/v22a.md">NET0260,Table1,20</a></td>
     <td>Implemented</td>

monitoring/uss_qualifier/suites/uspace/required_services.md

@@ -318,6 +318,11 @@
     <td>Implemented</td>
     <td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
   </tr>
+  <tr>
+    <td><a href="../../requirements/astm/f3411/v22a.md">NET0260,Table1,2</a></td>
+    <td>Implemented</td>
+    <td><a href="../../scenarios/astm/netrid/v22a/nominal_behavior.md">ASTM NetRID nominal behavior</a></td>
+  </tr>
   <tr>
     <td><a href="../../requirements/astm/f3411/v22a.md">NET0260,Table1,20</a></td>
     <td>Implemented</td>