[netrid] Check response validity when calling all_flights

Author: the-glu

monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py

@@ -178,18 +178,38 @@ def poll_func(rect: LatLngRect) -> bool:
             poll_func,
         )
 
+    def _is_area_too_large(self, rect: s2sphere.LatLngRect) -> bool:
+        diagonal_km = (
+            rect.lo().get_distance(rect.hi()).degrees * geo.EARTH_CIRCUMFERENCE_KM / 360
+        )
+        return diagonal_km > self._rid_version.max_diagonal_km
+
     def _fetch_flights_from_dss(self, rect: LatLngRect) -> dict[str, TelemetryMapping]:
         # We grab all flights from the SPs (which we know how to reach by first querying the DSS).
         # This is authenticated and is expected to succeed
         # TODO: Add the following requests to the documentation. Possibly split it as a test step.
-        sp_observation = rid.all_flights(
-            rect,
-            include_recent_positions=True,
-            get_details=False,
-            rid_version=self._rid_version,
-            session=self._dss.client,
-            dss_participant_id=self._dss.participant_id,
-        )
+
+        with self.check("ISA query", [self._dss.participant_id]) as check:
+            sp_observation = rid.all_flights(
+                rect,
+                include_recent_positions=True,
+                get_details=False,
+                rid_version=self._rid_version,
+                session=self._dss.client,
+                dss_participant_id=self._dss.participant_id,
+            )
+
+            self.record_queries(sp_observation.queries)
+
+            if not sp_observation.success and not self._is_area_too_large(rect):
+                check.record_failed(
+                    summary="Could not query ISAs from DSS",
+                    details=f"Query to {self._dss.participant_id}'s DSS at failed: {', '.join(sp_observation.errors)}",
+                    query_timestamps=[
+                        query.request.initiated_at.datetime
+                        for query in sp_observation.queries
+                    ],
+                )
 
         mapping_by_injection_id = (
             display_data_evaluator.map_fetched_to_injected_flights(
@@ -198,7 +218,6 @@ def _fetch_flights_from_dss(self, rect: LatLngRect) -> dict[str, TelemetryMappin
                 self._query_cache,
             )
         )
-        self.record_queries(sp_observation.queries)
 
         return mapping_by_injection_id
 

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

@@ -275,23 +275,37 @@ def evaluate_system_instantaneously(
             self._test_scenario.begin_test_step("Service Provider polling")
 
             # Observe Service Provider with uss_qualifier acting as a Display Provider
-            sp_observation = all_flights(
-                rect,
-                include_recent_positions=True,
-                get_details=True,
-                rid_version=self._rid_version,
-                session=self._dss.client,
-                dss_participant_id=self._dss.participant_id,
-            )
+            with self._test_scenario.check(
+                "ISA query", [self._dss.participant_id]
+            ) as check:
+                sp_observation = all_flights(
+                    rect,
+                    include_recent_positions=True,
+                    get_details=True,
+                    rid_version=self._rid_version,
+                    session=self._dss.client,
+                    dss_participant_id=self._dss.participant_id,
+                )
+
+                for q in sp_observation.queries:
+                    self._test_scenario.record_query(q)
+
+                if not sp_observation.success and not self._is_area_too_large(rect):
+                    check.record_failed(
+                        summary="Could not query ISAs from DSS",
+                        details=f"Query to {self._dss.participant_id}'s DSS at failed: {', '.join(sp_observation.errors)}",
+                        query_timestamps=[
+                            query.request.initiated_at.datetime
+                            for query in sp_observation.queries
+                        ],
+                    )
 
             # map observed flights to injected flight and attribute participant ID
             mapping_by_injection_id = map_fetched_to_injected_flights(
                 self._injected_flights,
                 list(sp_observation.uss_flight_queries.values()),
                 self._query_cache,
             )
-            for q in sp_observation.queries:
-                self._test_scenario.record_query(q)
 
             # Evaluate observations
             self._evaluate_sp_observation(rect, sp_observation, mapping_by_injection_id)
@@ -325,6 +339,12 @@ def evaluate_system_instantaneously(
                 # TODO: If bounding rect is smaller than area-too-large threshold, expand slightly above area-too-large threshold and re-observe
             self._test_scenario.end_test_step()
 
+    def _is_area_too_large(self, rect: s2sphere.LatLngRect) -> bool:
+        diagonal_km = (
+            rect.lo().get_distance(rect.hi()).degrees * geo.EARTH_CIRCUMFERENCE_KM / 360
+        )
+        return diagonal_km > self._rid_version.max_diagonal_km
+
     def _evaluate_observation(
         self,
         observer: RIDSystemObserver,
@@ -336,7 +356,7 @@ def _evaluate_observation(
         diagonal_km = (
             rect.lo().get_distance(rect.hi()).degrees * geo.EARTH_CIRCUMFERENCE_KM / 360
         )
-        if diagonal_km > self._rid_version.max_diagonal_km:
+        if self._is_area_too_large(rect):
             self._evaluate_area_too_large_observation(
                 observer, rect, diagonal_km, query
             )
@@ -1061,23 +1081,37 @@ def evaluate_disconnected_flights(
         self._test_scenario.begin_test_step("Service Provider polling")
 
         # Observe Service Provider with uss_qualifier acting as a Display Provider
-        sp_observation = all_flights(
-            rect,
-            include_recent_positions=True,
-            get_details=False,
-            rid_version=self._rid_version,
-            session=self._dss.client,
-            dss_participant_id=self._dss.participant_id,
-        )
+        with self._test_scenario.check(
+            "ISA query", [self._dss.participant_id]
+        ) as check:
+            sp_observation = all_flights(
+                rect,
+                include_recent_positions=True,
+                get_details=False,
+                rid_version=self._rid_version,
+                session=self._dss.client,
+                dss_participant_id=self._dss.participant_id,
+            )
+
+            for q in sp_observation.queries:
+                self._test_scenario.record_query(q)
+
+            if not sp_observation.success:
+                check.record_failed(
+                    summary="Could not query ISAs from DSS",
+                    details=f"Query to {self._dss.participant_id}'s DSS at failed: {', '.join(sp_observation.errors)}",
+                    query_timestamps=[
+                        query.request.initiated_at.datetime
+                        for query in sp_observation.queries
+                    ],
+                )
 
         # map observed flights to injected flight and attribute participant ID
         mapping_by_injection_id = map_fetched_to_injected_flights(
             self._injected_flights,
             list(sp_observation.uss_flight_queries.values()),
             self._query_cache,
         )
-        for q in sp_observation.queries:
-            self._test_scenario.record_query(q)
 
         # Evaluate observations
         self._evaluate_sp_observation(sp_observation, mapping_by_injection_id)

monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md

@@ -43,6 +43,10 @@ This particular test requires each flight to be uniquely identifiable by its 2D
 
 This step will attempt to search for flights in a rectangular area with a diagonal greater than [NetMaxDisplayAreaDiagonal] km.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Area too large check
 
 **[astm.f3411.v19.NET0250](../../../../requirements/astm/f3411/v19.md)** requires that a NetRID Service Provider rejects a request for a very large view area with a diagonal greater than *NetMaxDisplayAreaDiagonal*.  If such a large view is requested and a 400 or 413 error code is not received or the response contains Remote ID data, then this check will fail.
@@ -54,6 +58,10 @@ to confirm that the requested data is indeed available to any authorized query.
 
 It then repeats the exact same request without credentials, and expects this to fail.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Missing credentials check
 
 This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v19.NET0210](../../../../requirements/astm/f3411/v19.md)**,
@@ -63,6 +71,10 @@ and that requests for existing flights that are executed with missing credential
 
 This step is similar to unauthenticated requests, but uses incorrectly-authenticated requests instead.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Invalid credentials check
 This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v19.NET0210](../../../../requirements/astm/f3411/v19.md)**,
 and that requests for existing flights that are executed with incorrect credentials fail.

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md

@@ -30,6 +30,10 @@ A [`DSSInstanceResource`](../../../../resources/astm/f3411/dss.py) is required f
 
 This step will attempt to search for flights in a rectangular area with a diagonal greater than [NetMaxDisplayAreaDiagonal] km.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Area too large check
 
 **[astm.f3411.v22a.NET0250](../../../../requirements/astm/f3411/v22a.md)** requires that a NetRID Service Provider rejects a request for a very large view area with a diagonal greater than *NetMaxDisplayAreaDiagonal*.  If such a large view is requested and a 400 or 413 error code is not received or the response contains Remote ID data, then this check will fail.
@@ -41,6 +45,10 @@ to confirm that the requested data is indeed available to any authorized query.
 
 It then repeats the exact same request without credentials, and expects this to fail.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Missing credentials check
 
 This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0210](../../../../requirements/astm/f3411/v22a.md)**,
@@ -50,6 +58,10 @@ and that requests for existing flights that are executed with missing credential
 
 This step is similar to unauthenticated requests, but uses incorrectly-authenticated requests instead.
 
+#### ⚠️ ISA query check
+
+**[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires a USS providing a DSS instance to implement the DSS endpoints of the OpenAPI specification.  If uss_qualifier is unable to query the DSS for ISAs, this check will fail.
+
 #### ⚠️ Invalid credentials check
 
 This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0210](../../../../requirements/astm/f3411/v22a.md)**,