From e12193c351f67bc90dfe0dca1e604a50a75c7ac8 Mon Sep 17 00:00:00 2001
From: Julien Perrochet <julien.perrochet@orbitalize.com>
Date: Thu, 12 Oct 2023 10:04:24 +0200
Subject: [PATCH 1/8] [uss_qualifier] attach participant id to net0210 check,
 fix Issue #244

---
 monitoring/monitorlib/fetch/rid.py            |  15 +-
 .../resources/netrid/service_providers.py     |  24 +--
 .../astm/netrid/common/aggregate_checks.py    |   5 +-
 .../astm/netrid/common/misbehavior.py         | 139 ++++++++++--------
 .../astm/netrid/display_data_evaluator.py     |  13 +-
 .../scenarios/astm/netrid/v19/misbehavior.md  |   2 +-
 .../scenarios/astm/netrid/v22a/misbehavior.md |   2 +-
 .../suites/astm/netrid/f3411_19.md            |   7 +-
 .../suites/astm/netrid/f3411_22a.md           |   7 +-
 .../suites/uspace/network_identification.md   |   7 +-
 .../suites/uspace/required_services.md        |   7 +-
 11 files changed, 141 insertions(+), 87 deletions(-)

diff --git a/monitoring/monitorlib/fetch/rid.py b/monitoring/monitorlib/fetch/rid.py
index 8d3867af11..8baeca8814 100644
--- a/monitoring/monitorlib/fetch/rid.py
+++ b/monitoring/monitorlib/fetch/rid.py
@@ -1,15 +1,16 @@
 from __future__ import annotations
+
 import datetime
 from typing import Dict, List, Optional, Any, Union
 
-from implicitdict import ImplicitDict, StringBasedDateTime
 import s2sphere
-from uas_standards.astm.f3411 import v19, v22a
 import uas_standards.astm.f3411.v19.api
 import uas_standards.astm.f3411.v19.constants
 import uas_standards.astm.f3411.v22a.api
 import uas_standards.astm.f3411.v22a.constants
 import yaml
+from implicitdict import ImplicitDict, StringBasedDateTime
+from uas_standards.astm.f3411 import v19, v22a
 from uas_standards.astm.f3411.v22a.api import RIDHeight
 from yaml.representer import Representer
 
@@ -1163,7 +1164,7 @@ def all_flights(
     session: UTMClientSession,
     dss_base_url: str = "",
     enhanced_details: bool = False,
-    server_id: Optional[str] = None,
+    dss_server_id: Optional[str] = None,
 ) -> FetchedFlights:
     t = datetime.datetime.utcnow()
     isa_list = isas(
@@ -1173,7 +1174,7 @@ def all_flights(
         rid_version,
         session,
         dss_base_url,
-        server_id=server_id,
+        server_id=dss_server_id,
     )
 
     uss_flight_queries: Dict[str, FetchedUSSFlights] = {}
@@ -1185,7 +1186,9 @@ def all_flights(
             include_recent_positions,
             rid_version,
             session,
-            server_id=server_id,
+            # Note that we have no clue at this point which participant the flights_url is for,
+            # this can only be determined later by comparing injected and observed flights.
+            server_id=None,
         )
         uss_flight_queries[flights_url] = flights_for_url
 
@@ -1197,7 +1200,7 @@ def all_flights(
                     enhanced_details,
                     rid_version,
                     session,
-                    server_id=server_id,
+                    server_id=None,
                 )
                 uss_flight_details_queries[flight.id] = details
 
diff --git a/monitoring/uss_qualifier/resources/netrid/service_providers.py b/monitoring/uss_qualifier/resources/netrid/service_providers.py
index 76c02a981f..b7d6b4528b 100644
--- a/monitoring/uss_qualifier/resources/netrid/service_providers.py
+++ b/monitoring/uss_qualifier/resources/netrid/service_providers.py
@@ -41,25 +41,27 @@ class NetRIDServiceProvidersSpecification(ImplicitDict):
 
 class NetRIDServiceProvider(object):
     participant_id: str
-    base_url: str
-    client: infrastructure.UTMClientSession
+    injection_base_url: str
+    flights_injection_client: infrastructure.UTMClientSession
     local_debug: bool
 
     def __init__(
         self,
         participant_id: str,
-        base_url: str,
+        injection_base_url: str,
         auth_adapter: infrastructure.AuthAdapter,
         local_debug: bool,
     ):
         self.participant_id = participant_id
-        self.base_url = base_url
-        self.client = infrastructure.UTMClientSession(base_url, auth_adapter)
+        self.injection_base_url = injection_base_url
+        self.flights_injection_client = infrastructure.UTMClientSession(
+            injection_base_url, auth_adapter
+        )
         self.local_debug = local_debug
 
     def submit_test(self, request: CreateTestParameters, test_id: str) -> fetch.Query:
         return fetch.query_and_describe(
-            self.client,
+            self.flights_injection_client,
             "PUT",
             url=f"/tests/{test_id}",
             json=request,
@@ -69,7 +71,7 @@ def submit_test(self, request: CreateTestParameters, test_id: str) -> fetch.Quer
 
     def delete_test(self, test_id: str, version: str) -> fetch.Query:
         return fetch.query_and_describe(
-            self.client,
+            self.flights_injection_client,
             "DELETE",
             url=f"/tests/{test_id}/{version}",
             scope=SCOPE_RID_QUALIFIER_INJECT,
@@ -87,10 +89,10 @@ def __init__(
     ):
         self.service_providers = [
             NetRIDServiceProvider(
-                s.participant_id,
-                s.injection_base_url,
-                auth_adapter.adapter,
-                s.get("local_debug", False),
+                participant_id=s.participant_id,
+                injection_base_url=s.injection_base_url,
+                auth_adapter=auth_adapter.adapter,
+                local_debug=s.get("local_debug", False),
             )
             for s in specification.service_providers
         ]
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
index 9edd3b416e..01196fc52e 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
@@ -51,8 +51,9 @@ def __init__(
 
         # identify SPs and observers by their base URL
         self._participants_by_base_url.update(
-            {sp.base_url: sp.participant_id for sp in self._service_providers}
+            {sp.injection_base_url: sp.participant_id for sp in self._service_providers}
         )
+
         self._participants_by_base_url.update(
             {dp.base_url: dp.participant_id for dp in self._observers}
         )
@@ -101,7 +102,7 @@ def run(self):
         for sp in self._service_providers:
             self.record_note(
                 "service_providers",
-                f"configured service providers: {sp.participant_id} - {sp.base_url}",
+                f"configured service providers: {sp.participant_id} - {sp.injection_base_url}",
             )
 
         for o in self._observers:
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
index a6fada8caf..e89377589c 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
@@ -1,23 +1,17 @@
 import time
 import traceback
-import uuid
-from typing import List
+from typing import List, Dict
 
 import arrow
 import s2sphere
-from implicitdict import ImplicitDict
 from loguru import logger
 from requests.exceptions import RequestException
-from uas_standards.interuss.automated_testing.rid.v1.injection import ChangeTestResponse
 
 from monitoring.monitorlib import fetch
 from monitoring.monitorlib.fetch import rid
+from monitoring.monitorlib.fetch.rid import FetchedFlights
 from monitoring.monitorlib.infrastructure import UTMClientSession
 from monitoring.monitorlib.rid import RIDVersion
-from monitoring.monitorlib.rid_automated_testing.injection_api import (
-    CreateTestParameters,
-)
-from monitoring.monitorlib.rid_automated_testing.injection_api import TestFlight
 from monitoring.uss_qualifier.common_data_definitions import Severity
 from monitoring.uss_qualifier.resources.astm.f3411.dss import DSSInstancesResource
 from monitoring.uss_qualifier.resources.netrid import (
@@ -25,18 +19,15 @@
     NetRIDServiceProviders,
     EvaluationConfigurationResource,
 )
-from monitoring.uss_qualifier.scenarios.astm.netrid import display_data_evaluator
 from monitoring.uss_qualifier.scenarios.astm.netrid.common import nominal_behavior
-from monitoring.uss_qualifier.scenarios.astm.netrid.injected_flight_collection import (
-    InjectedFlightCollection,
+from monitoring.uss_qualifier.scenarios.astm.netrid.display_data_evaluator import (
+    DPObservedFlight,
+    map_observations_to_injected_flights,
 )
 from monitoring.uss_qualifier.scenarios.astm.netrid.injection import (
     InjectedFlight,
     InjectedTest,
 )
-from monitoring.uss_qualifier.scenarios.astm.netrid.virtual_observer import (
-    VirtualObserver,
-)
 from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
 
 
@@ -167,67 +158,78 @@ def _evaluate_and_test_authentication(
         no flights were yet returned by the authenticated queries.
         """
 
-        with self.check("Missing credentials") as check:
-            # We grab all flights from the SP's. This is authenticated
-            # and is expected to succeed
-            sp_observation = rid.all_flights(
-                rect,
-                include_recent_positions=True,
-                get_details=True,
-                rid_version=self._rid_version,
-                session=self._dss.client,
-                server_id=self._dss.participant_id,
-            )
-            # We fish out the queries that were used to grab the flights from the SP,
-            # and attempt to re-query without credentials. This should fail.
+        # We grab all flights from the SP's (which we know how to reach by first querying the DSS).
+        # This is authenticated and is expected to succeed
+        sp_observation = rid.all_flights(
+            rect,
+            include_recent_positions=True,
+            get_details=True,
+            rid_version=self._rid_version,
+            session=self._dss.client,
+            dss_server_id=self._dss.participant_id,
+        )
 
-            unauthenticated_session = UTMClientSession(
-                prefix_url=self._dss.client.get_prefix_url(),
-                auth_adapter=None,
-                timeout_seconds=self._dss.client.timeout_seconds,
-            )
+        # Set the participant ID on the SP queries wherever possible
+        _attribute_sp_queries_to_participant_id(self._injected_flights, sp_observation)
 
-            queries_to_repeat = list(sp_observation.uss_flight_queries.values()) + list(
-                sp_observation.uss_flight_details_queries.values()
-            )
+        # We fish out the queries that were used to grab the flights from the SP,
+        # and attempt to re-query without credentials. This should fail.
+        unauthenticated_session = UTMClientSession(
+            prefix_url=self._dss.client.get_prefix_url(),
+            auth_adapter=None,
+            timeout_seconds=self._dss.client.timeout_seconds,
+        )
 
-            if len(queries_to_repeat) == 0:
-                logger.debug("no flights queries to repeat at this point.")
-                return False
+        queries_to_repeat = list(sp_observation.uss_flight_queries.values()) + list(
+            sp_observation.uss_flight_details_queries.values()
+        )
 
-            logger.debug(
-                f"about to repeat {len(queries_to_repeat)} flights queries without credentials"
-            )
+        if len(queries_to_repeat) == 0:
+            logger.debug("no flights queries to repeat at this point.")
+            return False
 
-            # Attempt to re-query the flights and flight details URLs:
-            for fq in queries_to_repeat:
-                failed_q = fetch.query_and_describe(
-                    client=unauthenticated_session,
-                    verb=fq.query.request.method,
-                    url=fq.query.request.url,
-                    json=fq.query.request.json,
-                    data=fq.query.request.body,
-                    server_id=self._dss.participant_id,
-                )
-                logger.info(
-                    f"Repeating query to {fq.query.request.url} without credentials"
-                )
-                server_id = fq.query.get("server_id", "unknown")
+        logger.debug(
+            f"about to repeat {len(queries_to_repeat)} flights queries without credentials"
+        )
+
+        # Attempt to re-query the flights and flight details URLs:
+        for fq in queries_to_repeat:
+            sp_server_id = fq.query.get("server_id", "unknown")
+            # We may well have queried SP's for real flights that happen
+            # to be present in the area in which we inject flights;
+            if sp_server_id == "unknown":
+                # TODO we could skip these once development on the qualifier has stopped,
+                # however, unattributed queries are likely the cause of a bug,
+                # and we want to find out.
+                logger.error(f"got unattributed SP query to: {fq.query.request.url}")
+
+            failed_q = fetch.query_and_describe(
+                client=unauthenticated_session,
+                verb=fq.query.request.method,
+                url=fq.query.request.url,
+                json=fq.query.request.json,
+                data=fq.query.request.body,
+                server_id=sp_server_id,
+            )
+            logger.info(
+                f"Repeating query to {fq.query.request.url} without credentials"
+            )
+            with self.check("Missing credentials", [sp_server_id]) as check:
                 if failed_q.response.code not in [401, 403]:
                     check.record_failed(
                         "unauthenticated request was fulfilled",
-                        participants=[server_id],
+                        participants=[sp_server_id],
                         severity=Severity.MEDIUM,
                         details=f"queried flights on {fq.query.request.url} with no credentials, expected a failure but got a success reply",
                     )
                 else:
                     logger.info(
-                        f"participant with id {server_id} properly authenticated the request"
+                        f"participant with id {sp_server_id} properly authenticated the request"
                     )
                 # Keep track of the failed queries, too
                 self.record_query(failed_q)
 
-            return True
+        return True
 
     def cleanup(self):
         self.begin_cleanup()
@@ -263,3 +265,24 @@ def cleanup(self):
                     details=f"While trying to delete a test flight from {sp.participant_id}, encountered error:\n{stacktrace}",
                 )
         self.end_cleanup()
+
+
+def _attribute_sp_queries_to_participant_id(
+    injected_flights: List[InjectedFlight],
+    fetched_flights: FetchedFlights,
+):
+    observed_flights = []
+    for uss_query in fetched_flights.uss_flight_queries.values():
+        for f in range(len(uss_query.flights)):
+            observed_flights.append(DPObservedFlight(query=uss_query, flight=f))
+
+    mapping_by_injection_id = map_observations_to_injected_flights(
+        injected_flights, observed_flights
+    )
+
+    for telemetry_mapping in mapping_by_injection_id.values():
+        # For flights that were mapped to an injection ID,
+        # update the observation queries with the participant id for future use in the aggregate checks
+        telemetry_mapping.observed_flight.query.set_server_id(
+            telemetry_mapping.injected_flight.uss_participant_id
+        )
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 c64257741f..89aa0536b5 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -114,7 +114,7 @@ class TelemetryMapping(object):
     observed_flight: ObservationType
 
 
-def _make_flight_mapping(
+def map_observations_to_injected_flights(
     injected_flights: List[InjectedFlight],
     observed_flights: List[ObservationType],
 ) -> Dict[str, TelemetryMapping]:
@@ -239,11 +239,14 @@ def evaluate_system_instantaneously(
                 get_details=True,
                 rid_version=self._rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                dss_server_id=self._dss.participant_id,
             )
             for q in sp_observation.queries:
                 self._test_scenario.record_query(q)
 
+            # Evaluate observations
+            # (Note this also takes care of setting the server_id to the relevant
+            # participant_id on queries where possible)
             self._evaluate_sp_observation(sp_observation, rect)
 
             step_report = self._test_scenario.end_test_step()
@@ -341,9 +344,11 @@ def _evaluate_normal_observation(
                     query_timestamps=[query.request.timestamp],
                 )
 
-        mapping_by_injection_id = _make_flight_mapping(
+        mapping_by_injection_id = map_observations_to_injected_flights(
             self._injected_flights, observation.flights
         )
+        # TODO check if we need to set some server ids on observation
+        #  queries here (if we have unattributed queries this might be a source)
 
         self._evaluate_flight_presence(
             observer.participant_id,
@@ -839,7 +844,7 @@ def _evaluate_sp_observation(
         for uss_query in sp_observation.uss_flight_queries.values():
             for f in range(len(uss_query.flights)):
                 observed_flights.append(DPObservedFlight(query=uss_query, flight=f))
-        mapping_by_injection_id = _make_flight_mapping(
+        mapping_by_injection_id = map_observations_to_injected_flights(
             self._injected_flights, observed_flights
         )
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
index 0602647f31..537364b92f 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
@@ -48,7 +48,7 @@ It then repeats the exact same request while omitting the credentials, and expec
 
 #### Missing credentials check
 
-This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v19.NET0500](../../../../requirements/astm/f3411/v19.md)**,
+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 missing or incorrect credentials fail.
 
 ## Cleanup
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
index d94a021a73..5089d9d23c 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
@@ -48,7 +48,7 @@ It then repeats the exact same request while omitting the credentials, and expec
 
 #### Missing credentials check
 
-This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0500](../../../../requirements/astm/f3411/v22a.md)**,
+This check ensures that all requests are properly authenticated, as required by **[astm.f3411.v22a.NET0210](../../../../requirements/astm/f3411/v22a.md)**,
 and that requests for existing flights that are executed with missing or incorrect credentials fail.
 
 ## Cleanup
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_19.md
index 4a00bf06f7..c354bb768e 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 @@
     <th><a href="../../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="52" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
+    <td rowspan="53" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v19.md">astm<br>.f3411<br>.v19</a></td>
     <td><a href="../../../requirements/astm/f3411/v19.md">A2-6-1,1a</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/netrid/v19/dss_interoperability.md">ASTM F3411-19 NetRID DSS interoperability</a></td>
@@ -186,6 +186,11 @@
     <td>TODO</td>
     <td><a href="../../../scenarios/astm/netrid/v19/operator_interactions.md">ASTM NetRID: Operator interactions</a></td>
   </tr>
+  <tr>
+    <td><a href="../../../requirements/astm/f3411/v19.md">NET0210</a></td>
+    <td>Implemented</td>
+    <td><a href="../../../scenarios/astm/netrid/v19/misbehavior.md">ASTM NetRID SP clients misbehavior handling</a></td>
+  </tr>
   <tr>
     <td><a href="../../../requirements/astm/f3411/v19.md">NET0220</a></td>
     <td>Implemented</td>
diff --git a/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md b/monitoring/uss_qualifier/suites/astm/netrid/f3411_22a.md
index b0d5e2fbc9..d605e67cea 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 @@
     <th><a href="../../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="74" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
+    <td rowspan="75" style="vertical-align:top;"><a href="../../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
     <td><a href="../../../requirements/astm/f3411/v22a.md">A2-6-1,1a</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
@@ -186,6 +186,11 @@
     <td>TODO</td>
     <td><a href="../../../scenarios/astm/netrid/v22a/operator_interactions.md">ASTM NetRID: Operator interactions</a></td>
   </tr>
+  <tr>
+    <td><a href="../../../requirements/astm/f3411/v22a.md">NET0210</a></td>
+    <td>Implemented</td>
+    <td><a href="../../../scenarios/astm/netrid/v22a/misbehavior.md">ASTM NetRID SP clients misbehavior handling</a></td>
+  </tr>
   <tr>
     <td><a href="../../../requirements/astm/f3411/v22a.md">NET0220</a></td>
     <td>Implemented</td>
diff --git a/monitoring/uss_qualifier/suites/uspace/network_identification.md b/monitoring/uss_qualifier/suites/uspace/network_identification.md
index ddee175bc9..b9390d4cf8 100644
--- a/monitoring/uss_qualifier/suites/uspace/network_identification.md
+++ b/monitoring/uss_qualifier/suites/uspace/network_identification.md
@@ -16,7 +16,7 @@
     <th><a href="../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="74" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
+    <td rowspan="75" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
     <td><a href="../../requirements/astm/f3411/v22a.md">A2-6-1,1a</a></td>
     <td>Implemented</td>
     <td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
@@ -181,6 +181,11 @@
     <td>TODO</td>
     <td><a href="../../scenarios/astm/netrid/v22a/operator_interactions.md">ASTM NetRID: Operator interactions</a></td>
   </tr>
+  <tr>
+    <td><a href="../../requirements/astm/f3411/v22a.md">NET0210</a></td>
+    <td>Implemented</td>
+    <td><a href="../../scenarios/astm/netrid/v22a/misbehavior.md">ASTM NetRID SP clients misbehavior handling</a></td>
+  </tr>
   <tr>
     <td><a href="../../requirements/astm/f3411/v22a.md">NET0220</a></td>
     <td>Implemented</td>
diff --git a/monitoring/uss_qualifier/suites/uspace/required_services.md b/monitoring/uss_qualifier/suites/uspace/required_services.md
index 7997e33f9c..6250f43cf0 100644
--- a/monitoring/uss_qualifier/suites/uspace/required_services.md
+++ b/monitoring/uss_qualifier/suites/uspace/required_services.md
@@ -17,7 +17,7 @@
     <th><a href="../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="74" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
+    <td rowspan="75" style="vertical-align:top;"><a href="../../requirements/astm/f3411/v22a.md">astm<br>.f3411<br>.v22a</a></td>
     <td><a href="../../requirements/astm/f3411/v22a.md">A2-6-1,1a</a></td>
     <td>Implemented</td>
     <td><a href="../../scenarios/astm/netrid/v22a/dss_interoperability.md">ASTM F3411-22a NetRID DSS interoperability</a></td>
@@ -182,6 +182,11 @@
     <td>TODO</td>
     <td><a href="../../scenarios/astm/netrid/v22a/operator_interactions.md">ASTM NetRID: Operator interactions</a></td>
   </tr>
+  <tr>
+    <td><a href="../../requirements/astm/f3411/v22a.md">NET0210</a></td>
+    <td>Implemented</td>
+    <td><a href="../../scenarios/astm/netrid/v22a/misbehavior.md">ASTM NetRID SP clients misbehavior handling</a></td>
+  </tr>
   <tr>
     <td><a href="../../requirements/astm/f3411/v22a.md">NET0220</a></td>
     <td>Implemented</td>

From ebc73debaf522f6e067deb1594b3e4e661f15f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 10:25:25 +0200
Subject: [PATCH 2/8] rename server_id -> participant_id

---
 monitoring/monitorlib/fetch/__init__.py       | 16 ++---
 monitoring/monitorlib/fetch/rid.py            | 68 +++++++++++--------
 monitoring/monitorlib/mutate/rid.py           | 30 ++++----
 monitoring/monitorlib/mutate/scd.py           | 13 ++--
 .../uss_qualifier/reports/sequence_view.py    |  6 +-
 .../templates/sequence_view/scenario.html     |  2 +-
 .../resources/astm/f3548/v21/dss.py           |  4 +-
 .../resources/interuss/mock_uss/client.py     |  6 +-
 .../resources/netrid/observers.py             |  6 +-
 .../resources/netrid/service_providers.py     |  4 +-
 .../astm/netrid/common/aggregate_checks.py    |  8 +--
 .../astm/netrid/common/dss/isa_simple.py      |  4 +-
 .../scenarios/astm/netrid/dss_wrapper.py      | 34 +++++-----
 .../monitoring/monitorlib/fetch/Query.json    | 14 ++--
 14 files changed, 116 insertions(+), 99 deletions(-)

diff --git a/monitoring/monitorlib/fetch/__init__.py b/monitoring/monitorlib/fetch/__init__.py
index b99816b69a..40fc6458eb 100644
--- a/monitoring/monitorlib/fetch/__init__.py
+++ b/monitoring/monitorlib/fetch/__init__.py
@@ -232,7 +232,7 @@ class Query(ImplicitDict):
     request: RequestDescription
     response: ResponseDescription
 
-    server_id: Optional[str]
+    participant_id: Optional[str]
     """If specified, identifier of the USS/participant hosting the server involved in this query."""
 
     query_type: Optional[QueryType]
@@ -273,7 +273,7 @@ def describe_query(
     resp: requests.Response,
     initiated_at: datetime.datetime,
     query_type: Optional[QueryType] = None,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> Query:
     query = Query(
         request=describe_request(resp.request, initiated_at),
@@ -281,8 +281,8 @@ def describe_query(
     )
     if query_type is not None:
         query.query_type = query_type
-    if server_id is not None:
-        query.server_id = server_id
+    if participant_id is not None:
+        query.participant_id = participant_id
     return query
 
 
@@ -291,7 +291,7 @@ def query_and_describe(
     verb: str,
     url: str,
     query_type: Optional[QueryType] = None,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
     **kwargs,
 ) -> Query:
     """Attempt to perform a query, and then describe the results of that attempt.
@@ -304,7 +304,7 @@ def query_and_describe(
         verb: HTTP verb to perform at the specified URL.
         url: URL to query.
         query_type: If specified, the known type of query that this is.
-        server_id: If specified, the participant identifier of the server being queried.
+        participant_id: If specified, the participant identifier of the server being queried.
         **kwargs: Any keyword arguments that should be applied to the <session>.request method when invoking it.
 
     Returns:
@@ -340,7 +340,7 @@ def query_and_describe(
                 client.request(verb, url, **req_kwargs),
                 t0,
                 query_type=query_type,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         except (requests.Timeout, urllib3.exceptions.ReadTimeoutError) as e:
             failure_message = f"query_and_describe attempt {attempt + 1} from PID {os.getpid()} to {verb} {url} failed with timeout {type(e).__name__}: {str(e)}"
@@ -370,7 +370,7 @@ def query_and_describe(
             elapsed_s=(t1 - t0).total_seconds(),
             reported=StringBasedDateTime(t1),
         ),
-        server_id=server_id,
+        participant_id=participant_id,
     )
     if query_type is not None:
         result.query_type = query_type
diff --git a/monitoring/monitorlib/fetch/rid.py b/monitoring/monitorlib/fetch/rid.py
index 8baeca8814..3ba0224fb2 100644
--- a/monitoring/monitorlib/fetch/rid.py
+++ b/monitoring/monitorlib/fetch/rid.py
@@ -124,7 +124,7 @@ def query_flights(
         session: UTMClientSession,
         area: s2sphere.LatLngRect,
         include_recent_positions: bool = True,
-        server_id: Optional[str] = None,
+        participant_id: Optional[str] = None,
     ) -> FetchedUSSFlights:
         return uss_flights(
             self.flights_url,
@@ -132,7 +132,7 @@ def query_flights(
             include_recent_positions,
             self.rid_version,
             session,
-            server_id=server_id,
+            participant_id=participant_id,
         )
 
 
@@ -640,13 +640,25 @@ def success(self) -> bool:
     def errors(self) -> List[str]:
         raise NotImplementedError("RIDQuery.errors must be overriden")
 
-    def set_server_id(self, server_id: str):
+    @property
+    def participant_id(self) -> Optional[str]:
+        if self.rid_version == RIDVersion.f3411_19:
+            return self.v19_query.participant_id
+        elif self.rid_version == RIDVersion.f3411_22a:
+            return self.v22a_query.participant_id
+        else:
+            raise NotImplementedError(
+                f"Cannot retrieve participant_id using RID version {self.rid_version}"
+            )
+
+    @participant_id.setter
+    def participant_id(self, participant_id: str) -> None:
         if self.v19_query is not None:
-            self.v19_query.server_id = server_id
+            self.v19_query.participant_id = participant_id
         elif self.v22a_query is not None:
-            self.v22a_query.server_id = server_id
+            self.v22a_query.participant_id = participant_id
         else:
-            raise NotImplementedError(f"Cannot set server_id")
+            raise NotImplementedError(f"Cannot set participant_id")
 
 
 class FetchedISA(RIDQuery):
@@ -722,7 +734,7 @@ def isa(
     rid_version: RIDVersion,
     session: UTMClientSession,
     dss_base_url: str = "",
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedISA:
     if rid_version == RIDVersion.f3411_19:
         op = v19.api.OPERATIONS[v19.api.OperationID.GetIdentificationServiceArea]
@@ -733,7 +745,7 @@ def isa(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -745,7 +757,7 @@ def isa(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     else:
@@ -857,7 +869,7 @@ def isas(
     rid_version: RIDVersion,
     session: UTMClientSession,
     dss_base_url: str = "",
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedISAs:
     url_time_params = ""
     if start_time is not None:
@@ -875,7 +887,7 @@ def isas(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -888,7 +900,7 @@ def isas(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     else:
@@ -965,7 +977,7 @@ def uss_flights(
     include_recent_positions: bool,
     rid_version: RIDVersion,
     session: UTMClientSession,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedUSSFlights:
     if rid_version == RIDVersion.f3411_19:
         query = fetch.query_and_describe(
@@ -984,7 +996,7 @@ def uss_flights(
                 else "false",
             },
             scope=v19.constants.Scope.Read,
-            server_id=server_id,
+            participant_id=participant_id,
         )
         query.query_type = QueryType.F3411v19Flights
         return FetchedUSSFlights(v19_query=query)
@@ -1005,7 +1017,7 @@ def uss_flights(
             flights_url,
             params=params,
             scope=v22a.constants.Scope.DisplayProvider,
-            server_id=server_id,
+            participant_id=participant_id,
         )
         query.query_type = QueryType.F3411v22aFlights
         return FetchedUSSFlights(v22a_query=query)
@@ -1092,11 +1104,11 @@ def flight_details(
     enhanced_details: bool,
     rid_version: RIDVersion,
     session: UTMClientSession,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedUSSFlightDetails:
     url = f"{flights_url}/{flight_id}/details"
     if rid_version == RIDVersion.f3411_19:
-        kwargs = {"server_id": server_id}
+        kwargs = {"participant_id": participant_id}
         if enhanced_details:
             kwargs["params"] = {"enhanced": "true"}
             kwargs["scope"] = (
@@ -1112,7 +1124,7 @@ def flight_details(
             "GET",
             url,
             scope=v22a.constants.Scope.DisplayProvider,
-            server_id=server_id,
+            participant_id=participant_id,
         )
         return FetchedUSSFlightDetails(v22a_query=query)
     else:
@@ -1164,7 +1176,7 @@ def all_flights(
     session: UTMClientSession,
     dss_base_url: str = "",
     enhanced_details: bool = False,
-    dss_server_id: Optional[str] = None,
+    dss_participant_id: Optional[str] = None,
 ) -> FetchedFlights:
     t = datetime.datetime.utcnow()
     isa_list = isas(
@@ -1174,7 +1186,7 @@ def all_flights(
         rid_version,
         session,
         dss_base_url,
-        server_id=dss_server_id,
+        participant_id=dss_participant_id,
     )
 
     uss_flight_queries: Dict[str, FetchedUSSFlights] = {}
@@ -1188,7 +1200,7 @@ def all_flights(
             session,
             # Note that we have no clue at this point which participant the flights_url is for,
             # this can only be determined later by comparing injected and observed flights.
-            server_id=None,
+            participant_id=None,
         )
         uss_flight_queries[flights_url] = flights_for_url
 
@@ -1200,7 +1212,7 @@ def all_flights(
                     enhanced_details,
                     rid_version,
                     session,
-                    server_id=None,
+                    participant_id=None,
                 )
                 uss_flight_details_queries[flight.id] = details
 
@@ -1278,7 +1290,7 @@ def subscription(
     rid_version: RIDVersion,
     session: UTMClientSession,
     dss_base_url: str = "",
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedSubscription:
     if rid_version == RIDVersion.f3411_19:
         op = v19.api.OPERATIONS[v19.api.OperationID.GetSubscription]
@@ -1289,7 +1301,7 @@ def subscription(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -1301,7 +1313,7 @@ def subscription(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     else:
@@ -1385,7 +1397,7 @@ def subscriptions(
     rid_version: RIDVersion,
     session: UTMClientSession,
     dss_base_url: str = "",
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> FetchedSubscriptions:
     if rid_version == RIDVersion.f3411_19:
         op = v19.api.OPERATIONS[v19.api.OperationID.SearchSubscriptions]
@@ -1396,7 +1408,7 @@ def subscriptions(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -1408,7 +1420,7 @@ def subscriptions(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             )
         )
     else:
diff --git a/monitoring/monitorlib/mutate/rid.py b/monitoring/monitorlib/mutate/rid.py
index dd42e2cfc4..1661fd41ee 100644
--- a/monitoring/monitorlib/mutate/rid.py
+++ b/monitoring/monitorlib/mutate/rid.py
@@ -104,7 +104,7 @@ def upsert_subscription(
     rid_version: RIDVersion,
     utm_client: infrastructure.UTMClientSession,
     subscription_version: Optional[str] = None,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> ChangedSubscription:
     mutation = "create" if subscription_version is None else "update"
     if rid_version == RIDVersion.f3411_19:
@@ -137,7 +137,7 @@ def upsert_subscription(
                 url,
                 json=body,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -165,7 +165,7 @@ def upsert_subscription(
                 url,
                 json=body,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     else:
@@ -179,7 +179,7 @@ def delete_subscription(
     subscription_version: str,
     rid_version: RIDVersion,
     utm_client: infrastructure.UTMClientSession,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> ChangedSubscription:
     if rid_version == RIDVersion.f3411_19:
         op = v19.api.OPERATIONS[v19.api.OperationID.DeleteSubscription]
@@ -191,7 +191,7 @@ def delete_subscription(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Read,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -204,7 +204,7 @@ def delete_subscription(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.DisplayProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     else:
@@ -259,7 +259,7 @@ def notify(
         isa_id: str,
         utm_session: infrastructure.UTMClientSession,
         isa: Optional[ISA] = None,
-        server_id: Optional[str] = None,
+        participant_id: Optional[str] = None,
     ) -> ISAChangeNotification:
         # Note that optional `extents` are not specified
         if self.rid_version == RIDVersion.f3411_19:
@@ -276,7 +276,7 @@ def notify(
                     url,
                     json=body,
                     scope=v19.constants.Scope.Write,
-                    server_id=server_id,
+                    participant_id=participant_id,
                 )
             )
         elif self.rid_version == RIDVersion.f3411_22a:
@@ -294,7 +294,7 @@ def notify(
                     url,
                     json=body,
                     scope=v22a.constants.Scope.ServiceProvider,
-                    server_id=server_id,
+                    participant_id=participant_id,
                 )
             )
         else:
@@ -450,7 +450,7 @@ def put_isa(
     rid_version: RIDVersion,
     utm_client: infrastructure.UTMClientSession,
     isa_version: Optional[str] = None,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> ISAChange:
     mutation = "create" if isa_version is None else "update"
     if rid_version == RIDVersion.f3411_19:
@@ -479,7 +479,7 @@ def put_isa(
                 url,
                 json=body,
                 scope=v19.constants.Scope.Write,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -511,7 +511,7 @@ def put_isa(
                 url,
                 json=body,
                 scope=v22a.constants.Scope.ServiceProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     else:
@@ -534,7 +534,7 @@ def delete_isa(
     isa_version: str,
     rid_version: RIDVersion,
     utm_client: infrastructure.UTMClientSession,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> ISAChange:
     if rid_version == RIDVersion.f3411_19:
         op = v19.api.OPERATIONS[v19.api.OperationID.DeleteIdentificationServiceArea]
@@ -546,7 +546,7 @@ def delete_isa(
                 op.verb,
                 url,
                 scope=v19.constants.Scope.Write,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     elif rid_version == RIDVersion.f3411_22a:
@@ -559,7 +559,7 @@ def delete_isa(
                 op.verb,
                 url,
                 scope=v22a.constants.Scope.ServiceProvider,
-                server_id=server_id,
+                participant_id=participant_id,
             ),
         )
     else:
diff --git a/monitoring/monitorlib/mutate/scd.py b/monitoring/monitorlib/mutate/scd.py
index 179e2b29e0..cc22914331 100644
--- a/monitoring/monitorlib/mutate/scd.py
+++ b/monitoring/monitorlib/mutate/scd.py
@@ -57,7 +57,7 @@ def put_subscription(
     min_alt_m: float = 0,
     max_alt_m: float = 3048,
     version: Optional[str] = None,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> MutatedSubscription:
     body = {
         "extents": Volume4D.from_values(
@@ -76,7 +76,12 @@ def put_subscription(
         url += f"/{version}"
     result = MutatedSubscription(
         fetch.query_and_describe(
-            utm_client, "PUT", url, json=body, scope=scd.SCOPE_SC, server_id=server_id
+            utm_client,
+            "PUT",
+            url,
+            json=body,
+            scope=scd.SCOPE_SC,
+            participant_id=participant_id,
         )
     )
     result.mutation = "update" if version else "create"
@@ -87,12 +92,12 @@ def delete_subscription(
     utm_client: infrastructure.UTMClientSession,
     subscription_id: str,
     version: str,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ) -> MutatedSubscription:
     url = f"/dss/v1/subscriptions/{subscription_id}/{version}"
     result = MutatedSubscription(
         fetch.query_and_describe(
-            utm_client, "DELETE", url, scope=scd.SCOPE_SC, server_id=server_id
+            utm_client, "DELETE", url, scope=scd.SCOPE_SC, participant_id=participant_id
         )
     )
     result.mutation = "delete"
diff --git a/monitoring/uss_qualifier/reports/sequence_view.py b/monitoring/uss_qualifier/reports/sequence_view.py
index 40c19c774d..bae7ea0d75 100644
--- a/monitoring/uss_qualifier/reports/sequence_view.py
+++ b/monitoring/uss_qualifier/reports/sequence_view.py
@@ -255,11 +255,11 @@ def append_notes(new_notes):
             if "queries" in step and step.queries:
                 for query in step.queries:
                     events.append(Event(query=query))
-                    if "server_id" in query and query.server_id:
+                    if "participant_id" in query and query.participant_id:
                         p = scenario_participants.get(
-                            query.server_id, TestedParticipant(has_failures=False)
+                            query.participant_id, TestedParticipant(has_failures=False)
                         )
-                        scenario_participants[query.server_id] = p
+                        scenario_participants[query.participant_id] = p
             if "notes" in report and report.notes:
                 for key, note in report.notes.items():
                     if step.start_time.datetime <= note.timestamp.datetime:
diff --git a/monitoring/uss_qualifier/reports/templates/sequence_view/scenario.html b/monitoring/uss_qualifier/reports/templates/sequence_view/scenario.html
index c2fafc2f73..e7322a5707 100644
--- a/monitoring/uss_qualifier/reports/templates/sequence_view/scenario.html
+++ b/monitoring/uss_qualifier/reports/templates/sequence_view/scenario.html
@@ -146,7 +146,7 @@ <h3>{{ test_scenario.type }}</h3>
                   {% set collapsible.queries = collapsible.queries + [query_id] %}
                 </td>
                 {% for participant_id in all_participants %}
-                  {% if participant_id == event.query.get("server_id", None) %}
+                  {% if participant_id == event.query.get("participant_id", None) %}
                     <td>&#x1F310;</td>
                   {% else %}
                     <td></td>
diff --git a/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py b/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py
index c0b99aac18..b416ad3121 100644
--- a/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py
+++ b/monitoring/uss_qualifier/resources/astm/f3548/v21/dss.py
@@ -66,7 +66,7 @@ def find_op_intent(
             url,
             scope=SCOPE_SC,
             json=req,
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
         if query.status_code != 200:
             result = None
@@ -81,7 +81,7 @@ def get_full_op_intent(
     ) -> Tuple[OperationalIntent, fetch.Query]:
         url = f"{op_intent_ref.uss_base_url}/uss/v1/operational_intents/{op_intent_ref.id}"
         query = fetch.query_and_describe(
-            self.client, "GET", url, scope=SCOPE_SC, server_id=self.participant_id
+            self.client, "GET", url, scope=SCOPE_SC, participant_id=self.participant_id
         )
         if query.status_code != 200:
             result = None
diff --git a/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py b/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py
index e70ab45d10..2c6fd7f534 100644
--- a/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py
+++ b/monitoring/uss_qualifier/resources/interuss/mock_uss/client.py
@@ -38,7 +38,7 @@ def get_status(self) -> fetch.Query:
             "GET",
             "/scdsc/v1/status",
             scope=SCOPE_SCD_QUALIFIER_INJECT,
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
 
     def get_locality(self) -> Tuple[Optional[LocalityCode], fetch.Query]:
@@ -46,7 +46,7 @@ def get_locality(self) -> Tuple[Optional[LocalityCode], fetch.Query]:
             self.session,
             "GET",
             "/configuration/locality",
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
         if query.status_code != 200:
             return None, query
@@ -62,7 +62,7 @@ def set_locality(self, locality_code: LocalityCode) -> fetch.Query:
             "PUT",
             "/configuration/locality",
             scope=MOCK_USS_CONFIG_SCOPE,
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
             json=PutLocalityRequest(locality_code=locality_code),
         )
 
diff --git a/monitoring/uss_qualifier/resources/netrid/observers.py b/monitoring/uss_qualifier/resources/netrid/observers.py
index 2448df2c79..b172672225 100644
--- a/monitoring/uss_qualifier/resources/netrid/observers.py
+++ b/monitoring/uss_qualifier/resources/netrid/observers.py
@@ -49,7 +49,7 @@ def observe_system(
             # TODO replace with 'uas_standards.interuss.automated_testing.rid.v1.constants.Scope.Observe' once
             #  the standard is updated with https://github.com/interuss/uas_standards/pull/11/files
             scope="dss.read.identification_service_areas",
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
         try:
             result = (
@@ -74,10 +74,10 @@ def observe_flight_details(
             # TODO replace with 'uas_standards.interuss.automated_testing.rid.v1.constants.Scope.Observe' once
             #  the standard is updated with https://github.com/interuss/uas_standards/pull/11/files
             scope="dss.read.identification_service_areas",
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
         # Record query metadata for later use in the aggregate checks
-        query.server_id = self.participant_id
+        query.participant_id = self.participant_id
         query.query_type = QueryType.flight_details(rid_version)
         try:
             result = (
diff --git a/monitoring/uss_qualifier/resources/netrid/service_providers.py b/monitoring/uss_qualifier/resources/netrid/service_providers.py
index b7d6b4528b..ced5c50a00 100644
--- a/monitoring/uss_qualifier/resources/netrid/service_providers.py
+++ b/monitoring/uss_qualifier/resources/netrid/service_providers.py
@@ -66,7 +66,7 @@ def submit_test(self, request: CreateTestParameters, test_id: str) -> fetch.Quer
             url=f"/tests/{test_id}",
             json=request,
             scope=SCOPE_RID_QUALIFIER_INJECT,
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
 
     def delete_test(self, test_id: str, version: str) -> fetch.Query:
@@ -75,7 +75,7 @@ def delete_test(self, test_id: str, version: str) -> fetch.Query:
             "DELETE",
             url=f"/tests/{test_id}/{version}",
             scope=SCOPE_RID_QUALIFIER_INJECT,
-            server_id=self.participant_id,
+            participant_id=self.participant_id,
         )
 
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
index 01196fc52e..3bd3cfe942 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/aggregate_checks.py
@@ -86,12 +86,12 @@ def __init__(
                     break
 
             # Only consider queries with the participant/server explicitly identified
-            if query.has_field_with_value("server_id"):
+            if query.has_field_with_value("participant_id"):
                 participant_queries = self._queries_by_participant.get(
-                    query.server_id, []
+                    query.participant_id, []
                 )
                 participant_queries.append(query)
-                self._queries_by_participant[query.server_id] = participant_queries
+                self._queries_by_participant[query.participant_id] = participant_queries
 
     def run(self):
         self.begin_test_scenario()
@@ -152,7 +152,7 @@ def _verify_https_everywhere(self):
         unattr_queries = [
             query.request.url
             for query in self._queries
-            if query.get("server_id") is None
+            if query.get("participant_id") is None
         ]
         if len(unattr_queries) > 0:
             self.record_note(
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
index 24f43a1a26..b7ff7fa10e 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_simple.py
@@ -76,7 +76,7 @@ def _delete_isa_if_exists(self):
             self._isa_id,
             rid_version=self._dss.rid_version,
             session=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
         self.record_query(fetched.query)
         with self.check("Successful ISA query", [self._dss.participant_id]) as check:
@@ -94,7 +94,7 @@ def _delete_isa_if_exists(self):
                 fetched.isa.version,
                 self._dss.rid_version,
                 self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
             self.record_query(deleted.dss_query.query)
             for subscriber_id, notification in deleted.notifications.items():
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py b/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
index dd8b8cbb0b..c22206a364 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
@@ -118,7 +118,7 @@ def search_isas(
             end_time=end_time,
             rid_version=self._dss.rid_version,
             session=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
         self._handle_query_result(
             main_check,
@@ -168,7 +168,7 @@ def search_isas_expect_response_code(
             end_time=end_time,
             rid_version=self._dss.rid_version,
             session=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
 
         self._handle_query_result(
@@ -198,7 +198,7 @@ def get_isa(
                 isa_id=isa_id,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(check, isa, f"Failed to get ISA {isa_id}")
@@ -237,7 +237,7 @@ def get_isa_expect_response_code(
             isa_id=isa_id,
             rid_version=self._dss.rid_version,
             session=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
 
         self._handle_query_result(
@@ -281,7 +281,7 @@ def put_isa(
             isa_version=isa_version,
             rid_version=self._dss.rid_version,
             utm_client=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
         self._handle_query_result(
             main_check, mutated_isa.dss_query, f"Failed to insert ISA {isa_id}"
@@ -412,7 +412,7 @@ def del_isa(
             isa_version=isa_version,
             rid_version=self._dss.rid_version,
             utm_client=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
         self._handle_query_result(
             main_check, del_isa.dss_query, f"Failed to delete ISA {isa_id}"
@@ -497,7 +497,7 @@ def del_isa_expect_response_code(
             isa_version=isa_version,
             rid_version=self._dss.rid_version,
             utm_client=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
 
         self._handle_query_result(
@@ -525,7 +525,7 @@ def cleanup_isa(
                 isa_id=isa_id,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -540,7 +540,7 @@ def cleanup_isa(
                 isa_version=isa.isa.version,
                 rid_version=self._dss.rid_version,
                 utm_client=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -575,7 +575,7 @@ def search_subs(
                 area=area,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -606,7 +606,7 @@ def get_sub(
                 subscription_id=sub_id,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -646,7 +646,7 @@ def no_sub(
                 subscription_id=sub_id,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -689,7 +689,7 @@ def put_sub_expect_response_code(
                 subscription_version=sub_version,
                 rid_version=self._dss.rid_version,
                 utm_client=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -738,7 +738,7 @@ def put_sub(
                 subscription_version=sub_version,
                 rid_version=self._dss.rid_version,
                 utm_client=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -770,7 +770,7 @@ def del_sub(
                 subscription_version=sub_version,
                 rid_version=self._dss.rid_version,
                 utm_client=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -809,7 +809,7 @@ def cleanup_sub(
                 subscription_id=sub_id,
                 rid_version=self._dss.rid_version,
                 session=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
@@ -828,7 +828,7 @@ def cleanup_sub(
                 subscription_version=sub.subscription.version,
                 rid_version=self._dss.rid_version,
                 utm_client=self._dss.client,
-                server_id=self._dss.participant_id,
+                participant_id=self._dss.participant_id,
             )
 
             self._handle_query_result(
diff --git a/schemas/monitoring/monitorlib/fetch/Query.json b/schemas/monitoring/monitorlib/fetch/Query.json
index 6c33dc6ede..6049fbd45f 100644
--- a/schemas/monitoring/monitorlib/fetch/Query.json
+++ b/schemas/monitoring/monitorlib/fetch/Query.json
@@ -7,6 +7,13 @@
       "description": "Path to content that replaces the $ref",
       "type": "string"
     },
+    "participant_id": {
+      "description": "If specified, identifier of the USS/participant hosting the server involved in this query.",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "query_type": {
       "description": "If specified, the recognized type of this query.",
       "enum": [
@@ -49,13 +56,6 @@
     },
     "response": {
       "$ref": "ResponseDescription.json"
-    },
-    "server_id": {
-      "description": "If specified, identifier of the USS/participant hosting the server involved in this query.",
-      "type": [
-        "string",
-        "null"
-      ]
     }
   },
   "required": [

From 2d94d2ec9f9f42324a051a67ba82c85db275b6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 10:27:21 +0200
Subject: [PATCH 3/8] factor out polling; refactor some parts of scenarios

---
 monitoring/monitorlib/geo.py                  |  28 ++
 .../astm/netrid/common/misbehavior.py         | 244 ++++++++----------
 .../astm/netrid/common/nominal_behavior.py    | 186 ++-----------
 .../astm/netrid/display_data_evaluator.py     | 127 ++++-----
 .../scenarios/astm/netrid/injection.py        | 122 ++++++++-
 .../scenarios/astm/netrid/virtual_observer.py |  51 +++-
 6 files changed, 383 insertions(+), 375 deletions(-)

diff --git a/monitoring/monitorlib/geo.py b/monitoring/monitorlib/geo.py
index 5d6c138bcb..f06be05c73 100644
--- a/monitoring/monitorlib/geo.py
+++ b/monitoring/monitorlib/geo.py
@@ -7,12 +7,20 @@
 import s2sphere
 import shapely.geometry
 from uas_standards.astm.f3548.v21 import api as f3548v21
+from uas_standards.astm.f3411.v19 import api as f3411v19
+from uas_standards.astm.f3411.v22a import api as f3411v22a
+from uas_standards.interuss.automated_testing.rid.v1 import (
+    injection as f3411testing_injection,
+)
 
 EARTH_CIRCUMFERENCE_KM = 40075
 EARTH_CIRCUMFERENCE_M = EARTH_CIRCUMFERENCE_KM * 1000
 EARTH_RADIUS_M = 40075 * 1000 / (2 * math.pi)
 EARTH_AREA_M2 = 4 * math.pi * math.pow(EARTH_RADIUS_M, 2)
 
+DISTANCE_TOLERANCE_M = 0.01
+COORD_TOLERANCE_DEG = 360 / EARTH_CIRCUMFERENCE_M * DISTANCE_TOLERANCE_M
+
 
 class DistanceUnits(str, Enum):
     M = "M"
@@ -31,9 +39,29 @@ class LatLngPoint(ImplicitDict):
     lng: float
     """Longitude (degrees)"""
 
+    @staticmethod
+    def from_f3411(
+        position: Union[
+            f3411v19.RIDAircraftPosition,
+            f3411v22a.RIDAircraftPosition,
+            f3411testing_injection.RIDAircraftPosition,
+        ]
+    ):
+        return LatLngPoint(
+            lat=position.lat,
+            lng=position.lng,
+        )
+
     def as_s2sphere(self) -> s2sphere.LatLng:
         return s2sphere.LatLng.from_degrees(self.lat, self.lng)
 
+    def match(self, other: LatLngPoint) -> bool:
+        """Determine whether two points may be mistaken for each other."""
+        return (
+            abs(self.lat - other.lat) < COORD_TOLERANCE_DEG
+            and abs(self.lng - other.lng) < COORD_TOLERANCE_DEG
+        )
+
 
 class Radius(ImplicitDict):
     value: float
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
index e89377589c..1aa3ae1e29 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
@@ -1,15 +1,11 @@
-import time
 import traceback
-from typing import List, Dict
+from typing import List, Set
 
-import arrow
 import s2sphere
-from loguru import logger
 from requests.exceptions import RequestException
+from s2sphere import LatLngRect
 
-from monitoring.monitorlib import fetch
 from monitoring.monitorlib.fetch import rid
-from monitoring.monitorlib.fetch.rid import FetchedFlights
 from monitoring.monitorlib.infrastructure import UTMClientSession
 from monitoring.monitorlib.rid import RIDVersion
 from monitoring.uss_qualifier.common_data_definitions import Severity
@@ -19,15 +15,20 @@
     NetRIDServiceProviders,
     EvaluationConfigurationResource,
 )
-from monitoring.uss_qualifier.scenarios.astm.netrid.common import nominal_behavior
-from monitoring.uss_qualifier.scenarios.astm.netrid.display_data_evaluator import (
-    DPObservedFlight,
-    map_observations_to_injected_flights,
+from monitoring.uss_qualifier.scenarios.astm.netrid import (
+    injection,
+    display_data_evaluator,
+)
+from monitoring.uss_qualifier.scenarios.astm.netrid.injected_flight_collection import (
+    InjectedFlightCollection,
 )
 from monitoring.uss_qualifier.scenarios.astm.netrid.injection import (
     InjectedFlight,
     InjectedTest,
 )
+from monitoring.uss_qualifier.scenarios.astm.netrid.virtual_observer import (
+    VirtualObserver,
+)
 from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
 
 
@@ -39,6 +40,7 @@ class Misbehavior(GenericTestScenario):
     _flights_data: FlightDataResource
     _service_providers: NetRIDServiceProviders
     _evaluation_configuration: EvaluationConfigurationResource
+
     _injected_flights: List[InjectedFlight]
     _injected_tests: List[InjectedTest]
 
@@ -53,8 +55,6 @@ def __init__(
         self._flights_data = flights_data
         self._service_providers = service_providers
         self._evaluation_configuration = evaluation_configuration
-        self._injected_flights = []
-        self._injected_tests = []
         if len(dss_pool.dss_instances) == 0:
             raise ValueError(
                 "The Misbehavior Scenario requires at least one DSS instance"
@@ -85,77 +85,53 @@ def run(self):
         self.end_test_scenario()
 
     def _inject_flights(self):
-        (
-            self._injected_flights,
-            self._injected_tests,
-        ) = nominal_behavior.inject_flights(
-            test_scenario=self,
-            flights_data=self._flights_data,
-            service_providers=self._service_providers,
-            evaluation_configuration=self._evaluation_configuration,
-            realtime_period=self._rid_version.realtime_period,
+        (self._injected_flights, self._injected_tests) = injection.inject_flights(
+            self, self._flights_data, self._service_providers
         )
 
     def _poll_unauthenticated_during_flights(self):
         config = self._evaluation_configuration.configuration
+        virtual_observer = VirtualObserver(
+            injected_flights=InjectedFlightCollection(self._injected_flights),
+            repeat_query_rect_period=config.repeat_query_rect_period,
+            min_query_diagonal_m=config.min_query_diagonal,
+            relevant_past_data_period=self._rid_version.realtime_period
+            + config.max_propagation_latency.timedelta,
+        )
 
-        t_end = self._virtual_observer.get_last_time_of_interest()
-        t_now = arrow.utcnow()
+        remaining_injection_ids = set(
+            inj_flight.flight.injection_id for inj_flight in self._injected_flights
+        )
 
-        if t_now > t_end:
-            raise RuntimeError(
-                f"Cannot evaluate RID system: injected test flights ended at {t_end}, which is before now ({t_now})"
-            )
+        def poll_fct(rect: LatLngRect) -> bool:
+            nonlocal remaining_injection_ids
 
-        logger.debug(f"Polling from {t_now} until {t_end}")
-        for f in self._injected_flights:
-            span = f.flight.get_span()
-            logger.debug(
-                f"Flight {f.uss_participant_id}/{f.flight.injection_id} {span[0].isoformat()} to {span[1].isoformat()}",
-            )
+            tested_inj_ids = self._evaluate_and_test_authentication(rect)
+            remaining_injection_ids -= tested_inj_ids
 
-        t_next = arrow.utcnow()
-        dt = config.min_polling_interval.timedelta
-        while arrow.utcnow() < t_end:
-            # Evaluate the system at an instant in time for various areas
-            diagonals_m = [
+            # interrupt polling if there are no more injection IDs to cover
+            return len(remaining_injection_ids) == 0
+
+        virtual_observer.start_polling(
+            config.min_polling_interval.timedelta,
+            [
                 self._rid_version.max_diagonal_km * 1000 + 500,  # too large
                 self._rid_version.max_diagonal_km * 1000 - 100,  # clustered
                 self._rid_version.max_details_diagonal_km * 1000 - 100,  # details
-            ]
-            auth_tests = []
-            for diagonal_m in diagonals_m:
-                rect = self._virtual_observer.get_query_rect(diagonal_m)
-                auth_tests.append(self._evaluate_and_test_authentication(rect))
-
-            # If we checked for all diagonals that flights queries are properly authenticated,
-            # we can stop polling
-            if all(auth_tests):
-                logger.debug(
-                    "Authentication check is complete, ending polling now.",
-                )
-                break
-
-            # Wait until minimum polling interval elapses
-            while t_next < arrow.utcnow():
-                t_next += dt
-            if t_next > t_end:
-                break
-            delay = t_next - arrow.utcnow()
-            if delay.total_seconds() > 0:
-                logger.debug(
-                    f"Waiting {delay.total_seconds()} seconds before polling RID system again..."
-                )
-                time.sleep(delay.total_seconds())
+            ],
+            poll_fct,
+        )
 
     def _evaluate_and_test_authentication(
         self,
         rect: s2sphere.LatLngRect,
-    ) -> bool:
+    ) -> Set[str]:
         """Queries all flights in the expected way, then repeats the queries to SPs without credentials.
 
         returns true once queries to SPS have been made without credentials. False otherwise, such as when
         no flights were yet returned by the authenticated queries.
+
+        :returns: set of injection IDs that were encountered and tested
         """
 
         # We grab all flights from the SP's (which we know how to reach by first querying the DSS).
@@ -166,70 +142,83 @@ def _evaluate_and_test_authentication(
             get_details=True,
             rid_version=self._rid_version,
             session=self._dss.client,
-            dss_server_id=self._dss.participant_id,
+            dss_participant_id=self._dss.participant_id,
         )
 
-        # Set the participant ID on the SP queries wherever possible
-        _attribute_sp_queries_to_participant_id(self._injected_flights, sp_observation)
-
-        # We fish out the queries that were used to grab the flights from the SP,
-        # and attempt to re-query without credentials. This should fail.
-        unauthenticated_session = UTMClientSession(
-            prefix_url=self._dss.client.get_prefix_url(),
-            auth_adapter=None,
-            timeout_seconds=self._dss.client.timeout_seconds,
+        mapping_by_injection_id = (
+            display_data_evaluator.map_fetched_to_injected_flights(
+                self._injected_flights, list(sp_observation.uss_flight_queries.values())
+            )
         )
+        for q in sp_observation.queries:
+            self.record_query(q)
 
-        queries_to_repeat = list(sp_observation.uss_flight_queries.values()) + list(
-            sp_observation.uss_flight_details_queries.values()
-        )
+        for injection_id, mapping in mapping_by_injection_id.items():
+            participant_id = mapping.injected_flight.uss_participant_id
+            flights_url = mapping.observed_flight.query.flights_url
+            unauthenticated_session = UTMClientSession(flights_url, None)
 
-        if len(queries_to_repeat) == 0:
-            logger.debug("no flights queries to repeat at this point.")
-            return False
+            self.record_note(
+                f"{participant_id}/{injection_id}/missing_credentials_queries",
+                f"Will attempt querying with missing credentials at flights URL {flights_url} for a flights list and {len(mapping.observed_flight.query.flights)} flight details.",
+            )
 
-        logger.debug(
-            f"about to repeat {len(queries_to_repeat)} flights queries without credentials"
-        )
+            with self.check("Missing credentials", [participant_id]) as check:
 
-        # Attempt to re-query the flights and flight details URLs:
-        for fq in queries_to_repeat:
-            sp_server_id = fq.query.get("server_id", "unknown")
-            # We may well have queried SP's for real flights that happen
-            # to be present in the area in which we inject flights;
-            if sp_server_id == "unknown":
-                # TODO we could skip these once development on the qualifier has stopped,
-                # however, unattributed queries are likely the cause of a bug,
-                # and we want to find out.
-                logger.error(f"got unattributed SP query to: {fq.query.request.url}")
-
-            failed_q = fetch.query_and_describe(
-                client=unauthenticated_session,
-                verb=fq.query.request.method,
-                url=fq.query.request.url,
-                json=fq.query.request.json,
-                data=fq.query.request.body,
-                server_id=sp_server_id,
-            )
-            logger.info(
-                f"Repeating query to {fq.query.request.url} without credentials"
-            )
-            with self.check("Missing credentials", [sp_server_id]) as check:
-                if failed_q.response.code not in [401, 403]:
+                # check uss flights query
+                uss_flights_query = rid.uss_flights(
+                    flights_url,
+                    rect,
+                    True,
+                    self._rid_version,
+                    unauthenticated_session,
+                    participant_id,
+                )
+                self.record_query(uss_flights_query.query)
+
+                if uss_flights_query.success:
                     check.record_failed(
-                        "unauthenticated request was fulfilled",
-                        participants=[sp_server_id],
-                        severity=Severity.MEDIUM,
-                        details=f"queried flights on {fq.query.request.url} with no credentials, expected a failure but got a success reply",
+                        "Unauthenticated request for flights to USS was fulfilled",
+                        participants=[participant_id],
+                        severity=Severity.Medium,
+                        details=f"Queried flights on {flights_url} for USS {participant_id} with no credentials, expected a failure but got a success reply.",
                     )
-                else:
-                    logger.info(
-                        f"participant with id {sp_server_id} properly authenticated the request"
+                elif uss_flights_query.status_code != 401:
+                    check.record_failed(
+                        "Unauthenticated request for flights failed with wrong HTTP code",
+                        participants=[participant_id],
+                        severity=Severity.Medium,
+                        details=f"Queried flights on {flights_url} for USS {participant_id} with no credentials, expected an HTTP 401 but got an HTTP {uss_flights_query.status_code}.",
                     )
-                # Keep track of the failed queries, too
-                self.record_query(failed_q)
 
-        return True
+                # check flight details query
+                for flight in mapping.observed_flight.query.flights:
+                    uss_flight_details_query = rid.flight_details(
+                        flights_url,
+                        flight.id,
+                        False,
+                        self._rid_version,
+                        unauthenticated_session,
+                        participant_id,
+                    )
+                    self.record_query(uss_flight_details_query.query)
+
+                    if uss_flight_details_query.success:
+                        check.record_failed(
+                            "Unauthenticated request for flight details to USS was fulfilled",
+                            participants=[participant_id],
+                            severity=Severity.Medium,
+                            details=f"Queried flight details on {flights_url} for USS {participant_id} for flight {flight.id} with no credentials, expected a failure but got a success reply.",
+                        )
+                    elif uss_flight_details_query.status_code != 401:
+                        check.record_failed(
+                            "Unauthenticated request for flight details failed with wrong HTTP code",
+                            participants=[participant_id],
+                            severity=Severity.Medium,
+                            details=f"Queried flight details on {flights_url} for USS {participant_id} for flight {flight.id} with no credentials, expected an HTTP 401 but got an HTTP {uss_flight_details_query.status_code}.",
+                        )
+
+        return set(mapping_by_injection_id.keys())
 
     def cleanup(self):
         self.begin_cleanup()
@@ -265,24 +254,3 @@ def cleanup(self):
                     details=f"While trying to delete a test flight from {sp.participant_id}, encountered error:\n{stacktrace}",
                 )
         self.end_cleanup()
-
-
-def _attribute_sp_queries_to_participant_id(
-    injected_flights: List[InjectedFlight],
-    fetched_flights: FetchedFlights,
-):
-    observed_flights = []
-    for uss_query in fetched_flights.uss_flight_queries.values():
-        for f in range(len(uss_query.flights)):
-            observed_flights.append(DPObservedFlight(query=uss_query, flight=f))
-
-    mapping_by_injection_id = map_observations_to_injected_flights(
-        injected_flights, observed_flights
-    )
-
-    for telemetry_mapping in mapping_by_injection_id.values():
-        # For flights that were mapped to an injection ID,
-        # update the observation queries with the participant id for future use in the aggregate checks
-        telemetry_mapping.observed_flight.query.set_server_id(
-            telemetry_mapping.injected_flight.uss_participant_id
-        )
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 928954c285..0bbca48d26 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/nominal_behavior.py
@@ -1,20 +1,10 @@
-import time
 import traceback
-import uuid
-from datetime import timedelta
-from typing import List, Optional, Tuple
+from typing import List, Optional
 
-import arrow
-from implicitdict import ImplicitDict
-from loguru import logger
 from requests.exceptions import RequestException
-from uas_standards.interuss.automated_testing.rid.v1.injection import ChangeTestResponse
+from s2sphere import LatLngRect
 
 from monitoring.monitorlib.rid import RIDVersion
-from monitoring.monitorlib.rid_automated_testing.injection_api import (
-    CreateTestParameters,
-)
-from monitoring.monitorlib.rid_automated_testing.injection_api import TestFlight
 from monitoring.uss_qualifier.common_data_definitions import Severity
 from monitoring.uss_qualifier.resources.astm.f3411.dss import DSSInstancesResource
 from monitoring.uss_qualifier.resources.netrid import (
@@ -23,7 +13,10 @@
     NetRIDObserversResource,
     EvaluationConfigurationResource,
 )
-from monitoring.uss_qualifier.scenarios.astm.netrid import display_data_evaluator
+from monitoring.uss_qualifier.scenarios.astm.netrid import (
+    display_data_evaluator,
+    injection,
+)
 from monitoring.uss_qualifier.scenarios.astm.netrid.injected_flight_collection import (
     InjectedFlightCollection,
 )
@@ -34,10 +27,7 @@
 from monitoring.uss_qualifier.scenarios.astm.netrid.virtual_observer import (
     VirtualObserver,
 )
-from monitoring.uss_qualifier.scenarios.scenario import (
-    GenericTestScenario,
-    TestScenario,
-)
+from monitoring.uss_qualifier.scenarios.scenario import GenericTestScenario
 
 
 class NominalBehavior(GenericTestScenario):
@@ -62,8 +52,6 @@ def __init__(
         self._service_providers = service_providers
         self._observers = observers
         self._evaluation_configuration = evaluation_configuration
-        self._injected_flights = []
-        self._injected_tests = []
         self._dss_pool = dss_pool
 
     @property
@@ -86,18 +74,19 @@ def run(self):
         self.end_test_scenario()
 
     def _inject_flights(self):
-        (self._injected_flights, self._injected_tests) = inject_flights(
-            test_scenario=self,
-            flights_data=self._flights_data,
-            service_providers=self._service_providers,
-            evaluation_configuration=self._evaluation_configuration,
-            realtime_period=self._rid_version.realtime_period,
+        (self._injected_flights, self._injected_tests) = injection.inject_flights(
+            self, self._flights_data, self._service_providers
         )
 
     def _poll_during_flights(self):
         config = self._evaluation_configuration.configuration
-
-        # Evaluate observed RID system states
+        virtual_observer = VirtualObserver(
+            injected_flights=InjectedFlightCollection(self._injected_flights),
+            repeat_query_rect_period=config.repeat_query_rect_period,
+            min_query_diagonal_m=config.min_query_diagonal,
+            relevant_past_data_period=self._rid_version.realtime_period
+            + config.max_propagation_latency.timedelta,
+        )
         evaluator = display_data_evaluator.RIDObservationEvaluator(
             self,
             self._injected_flights,
@@ -106,46 +95,19 @@ def _poll_during_flights(self):
             self._dss_pool.dss_instances[0] if self._dss_pool else None,
         )
 
-        t_end = self._virtual_observer.get_last_time_of_interest()
-        t_now = arrow.utcnow()
-        if t_now > t_end:
-            raise RuntimeError(
-                f"Cannot evaluate RID system: injected test flights ended at {t_end}, which is before now ({t_now})"
-            )
-
-        logger.debug(f"Polling from {t_now} until {t_end}")
-        for f in self._injected_flights:
-            span = f.flight.get_span()
-            logger.debug(
-                f"Flight {f.uss_participant_id}/{f.flight.injection_id} {span[0].isoformat()} to {span[1].isoformat()}",
-            )
+        def poll_fct(rect: LatLngRect) -> bool:
+            evaluator.evaluate_system_instantaneously(self._observers.observers, rect)
+            return False
 
-        t_next = arrow.utcnow()
-        dt = config.min_polling_interval.timedelta
-        while arrow.utcnow() < t_end:
-            # Evaluate the system at an instant in time for various areas
-            diagonals_m = [
+        virtual_observer.start_polling(
+            config.min_polling_interval.timedelta,
+            [
                 self._rid_version.max_diagonal_km * 1000 + 500,  # too large
                 self._rid_version.max_diagonal_km * 1000 - 100,  # clustered
                 self._rid_version.max_details_diagonal_km * 1000 - 100,  # details
-            ]
-            for diagonal_m in diagonals_m:
-                rect = self._virtual_observer.get_query_rect(diagonal_m)
-                evaluator.evaluate_system_instantaneously(
-                    self._observers.observers, rect
-                )
-
-            # Wait until minimum polling interval elapses
-            while t_next < arrow.utcnow():
-                t_next += dt
-            if t_next > t_end:
-                break
-            delay = t_next - arrow.utcnow()
-            if delay.total_seconds() > 0:
-                logger.debug(
-                    f"Waiting {delay.total_seconds()} seconds before polling RID system again..."
-                )
-                time.sleep(delay.total_seconds())
+            ],
+            poll_fct,
+        )
 
     def cleanup(self):
         self.begin_cleanup()
@@ -181,101 +143,3 @@ def cleanup(self):
                     details=f"While trying to delete a test flight from {sp.participant_id}, encountered error:\n{stacktrace}",
                 )
         self.end_cleanup()
-
-
-def inject_flights(
-    test_scenario: TestScenario,
-    flights_data: FlightDataResource,
-    service_providers: NetRIDServiceProviders,
-    evaluation_configuration: EvaluationConfigurationResource,
-    realtime_period: timedelta,
-) -> Tuple[List[InjectedFlight], List[InjectedTest]]:
-    test_id = str(uuid.uuid4())
-    test_flights = flights_data.get_test_flights()
-    service_providers = service_providers.service_providers
-
-    injected_flights: List[InjectedFlight] = []
-    injected_tests: List[InjectedTest] = []
-
-    if len(service_providers) > len(test_flights):
-        raise ValueError(
-            "{} service providers were specified, but data for only {} test flights were provided".format(
-                len(service_providers), len(test_flights)
-            )
-        )
-    for i, target in enumerate(service_providers):
-        p = CreateTestParameters(requested_flights=[test_flights[i]])
-        check = test_scenario.check("Successful injection", [target.participant_id])
-        try:
-            query = target.submit_test(p, test_id)
-        except RequestException as e:
-            stacktrace = "".join(
-                traceback.format_exception(type(e), value=e, tb=e.__traceback__)
-            )
-            check.record_failed(
-                summary="Error while trying to inject test flight",
-                severity=Severity.High,
-                details=f"While trying to inject a test flight into {target.participant_id}, encountered error:\n{stacktrace}",
-            )
-            raise RuntimeError("High-severity issue did not abort test scenario")
-        test_scenario.record_query(query)
-        try:
-            if query.status_code != 200:
-                raise ValueError(
-                    f"Expected response code 200 but received {query.status_code} instead"
-                )
-            if "json" not in query.response:
-                raise ValueError("Response did not contain a JSON body")
-            changed_test: ChangeTestResponse = ImplicitDict.parse(
-                query.response.json, ChangeTestResponse
-            )
-            injected_tests.append(
-                InjectedTest(
-                    participant_id=target.participant_id,
-                    test_id=test_id,
-                    version=changed_test.version,
-                )
-            )
-            injections = changed_test.injected_flights
-            check.record_passed()
-        except ValueError as e:
-            check.record_failed(
-                summary="Error injecting test flight",
-                severity=Severity.High,
-                details=f"Attempting to inject a test flight into {target.participant_id}, encountered status code {query.status_code}: {str(e)}",
-                query_timestamps=[query.request.timestamp],
-            )
-            raise RuntimeError("High-severity issue did not abort test scenario")
-
-        for flight in injections:
-            injected_flights.append(
-                InjectedFlight(
-                    uss_participant_id=target.participant_id,
-                    test_id=test_id,
-                    flight=TestFlight(flight),
-                    query_timestamp=query.request.timestamp,
-                )
-            )
-
-    # Make sure the injected flights can be identified correctly by the test harness
-    with test_scenario.check("Identifiable flights") as check:
-        errors = display_data_evaluator.injected_flights_errors(injected_flights)
-        if errors:
-            check.record_failed(
-                "Injected flights not suitable for test",
-                Severity.High,
-                details="When checking the suitability of the flights (as injected) for the test, found:\n"
-                + "\n".join(errors),
-                query_timestamps=[f.query_timestamp for f in injected_flights],
-            )
-            raise RuntimeError("High-severity issue did not abort test scenario")
-
-    config = evaluation_configuration.configuration
-    test_scenario._virtual_observer = VirtualObserver(
-        injected_flights=InjectedFlightCollection(injected_flights),
-        repeat_query_rect_period=config.repeat_query_rect_period,
-        min_query_diagonal_m=config.min_query_diagonal,
-        relevant_past_data_period=realtime_period
-        + config.max_propagation_latency.timedelta,
-    )
-    return injected_flights, injected_tests
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 89aa0536b5..0db59a97f5 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -6,11 +6,12 @@
 import math
 import s2sphere
 from s2sphere import LatLng, LatLngRect
+
 from monitoring.uss_qualifier.scenarios.astm.netrid.common_dictionary_evaluator import (
     RIDCommonDictionaryEvaluator,
 )
 
-from monitoring.monitorlib.fetch import Query, QueryType
+from monitoring.monitorlib.fetch import Query
 from monitoring.monitorlib.fetch.rid import (
     all_flights,
     FetchedFlights,
@@ -18,7 +19,6 @@
     Position,
 )
 from monitoring.uss_qualifier.resources.astm.f3411.dss import DSSInstance
-from uas_standards.interuss.automated_testing.rid.v1.injection import RIDAircraftState
 from uas_standards.interuss.automated_testing.rid.v1.observation import (
     Flight,
     GetDisplayDataResponse,
@@ -36,15 +36,9 @@
 from monitoring.uss_qualifier.scenarios.astm.netrid.virtual_observer import (
     VirtualObserver,
 )
-from monitoring.uss_qualifier.scenarios.scenario import (
-    TestScenarioType,
-    TestScenario,
-)
+from monitoring.uss_qualifier.scenarios.scenario import TestScenario
 from monitoring.uss_qualifier.scenarios.astm.netrid.injection import InjectedFlight
 
-DISTANCE_TOLERANCE_M = 0.01
-COORD_TOLERANCE_DEG = 360 / geo.EARTH_CIRCUMFERENCE_M * DISTANCE_TOLERANCE_M
-
 
 def _rect_str(rect) -> str:
     return "({}, {})-({}, {})".format(
@@ -55,41 +49,6 @@ def _rect_str(rect) -> str:
     )
 
 
-def _telemetry_match(t1: RIDAircraftState, t2: RIDAircraftState) -> bool:
-    """Determine whether two telemetry points may be mistaken for each other."""
-    return (
-        abs(t1.position.lat - t2.position.lat) < COORD_TOLERANCE_DEG
-        and abs(t1.position.lng == t2.position.lng) < COORD_TOLERANCE_DEG
-    )
-
-
-def injected_flights_errors(injected_flights: List[InjectedFlight]) -> List[str]:
-    """Determine whether each telemetry in each injected flight can be easily distinguished from each other.
-
-    Args:
-        injected_flights: Full set of flights injected into Service Providers.
-
-    Returns: List of error messages, or an empty list if no errors.
-    """
-    errors: List[str] = []
-    for f1, injected_flight in enumerate(injected_flights):
-        for t1, injected_telemetry in enumerate(injected_flight.flight.telemetry):
-            for t2, other_telmetry in enumerate(
-                injected_flight.flight.telemetry[t1 + 1 :]
-            ):
-                if _telemetry_match(injected_telemetry, other_telmetry):
-                    errors.append(
-                        f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at indices {t1} and {t1 + 1 + t2} which can be mistaken for each other"
-                    )
-            for f2, other_flight in enumerate(injected_flights[f1 + 1 :]):
-                for t2, other_telemetry in enumerate(other_flight.flight.telemetry):
-                    if _telemetry_match(injected_telemetry, other_telemetry):
-                        errors.append(
-                            f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at index {t1} that can be mistaken for telemetry index {t2} in {other_flight.uss_participant_id}'s flight with injection ID {other_flight.flight.injection_id} in test {other_flight.test_id}"
-                        )
-    return errors
-
-
 @dataclass
 class DPObservedFlight(object):
     query: FetchedUSSFlights
@@ -128,7 +87,7 @@ def map_observations_to_injected_flights(
         injected_flights: Flights injected into RID Service Providers under test.
         observed_flights: Flight observed from an RID Display Provider under test.
 
-    Returns: Mapping betweenInjectedFlight and observed Flight, indexed by injection_id.
+    Returns: Mapping between InjectedFlight and observed Flight, indexed by injection_id.
     """
     mapping: Dict[str, TelemetryMapping] = {}
     for injected_flight in injected_flights:
@@ -154,7 +113,7 @@ def map_observations_to_injected_flights(
             for t1, injected_telemetry in enumerate(injected_flight.flight.telemetry):
                 dlat = abs(p.lat - injected_telemetry.position.lat)
                 dlng = abs(p.lng - injected_telemetry.position.lng)
-                if dlat < COORD_TOLERANCE_DEG and dlng < COORD_TOLERANCE_DEG:
+                if dlat < geo.COORD_TOLERANCE_DEG and dlng < geo.COORD_TOLERANCE_DEG:
                     new_distance = math.sqrt(math.pow(dlat, 2) + math.pow(dlng, 2))
                     if new_distance < smallest_distance:
                         best_match = TelemetryMapping(
@@ -181,6 +140,37 @@ def map_observations_to_injected_flights(
     return mapping
 
 
+def map_fetched_to_injected_flights(
+    injected_flights: List[InjectedFlight],
+    fetched_flights: List[FetchedUSSFlights],
+) -> Dict[str, TelemetryMapping]:
+    """Identify which of the fetched flights (if any) matches to each of the injected flights.
+
+    See `map_observations_to_injected_flights`.
+    If it is not already set, sets the observation flight's server ID to the one of the matching injected flight.
+
+    :param injected_flights: Flights injected into RID Service Providers under test.
+    :param fetched_flights: Flight observed from an RID Display Provider under test.
+    :return: Mapping between InjectedFlight and observed Flight, indexed by injection_id.
+    """
+    observed_flights = []
+    for uss_query in fetched_flights:
+        for f in range(len(uss_query.flights)):
+            observed_flights.append(DPObservedFlight(query=uss_query, flight=f))
+
+    tel_mapping = map_observations_to_injected_flights(
+        injected_flights, observed_flights
+    )
+
+    for mapping in tel_mapping.values():
+        if mapping.observed_flight.query.participant_id is None:
+            mapping.observed_flight.query.participant_id = (
+                mapping.injected_flight.uss_participant_id
+            )
+
+    return tel_mapping
+
+
 class RIDObservationEvaluator(object):
     """Evaluates observations of an RID system over time.
 
@@ -239,15 +229,18 @@ def evaluate_system_instantaneously(
                 get_details=True,
                 rid_version=self._rid_version,
                 session=self._dss.client,
-                dss_server_id=self._dss.participant_id,
+                dss_participant_id=self._dss.participant_id,
+            )
+
+            # 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())
             )
             for q in sp_observation.queries:
                 self._test_scenario.record_query(q)
 
             # Evaluate observations
-            # (Note this also takes care of setting the server_id to the relevant
-            # participant_id on queries where possible)
-            self._evaluate_sp_observation(sp_observation, rect)
+            self._evaluate_sp_observation(rect, sp_observation, mapping_by_injection_id)
 
             step_report = self._test_scenario.end_test_step()
             perform_observation = step_report.successful()
@@ -347,8 +340,6 @@ def _evaluate_normal_observation(
         mapping_by_injection_id = map_observations_to_injected_flights(
             self._injected_flights, observation.flights
         )
-        # TODO check if we need to set some server ids on observation
-        #  queries here (if we have unattributed queries this might be a source)
 
         self._evaluate_flight_presence(
             observer.participant_id,
@@ -384,7 +375,7 @@ def _evaluate_normal_observation(
                 ) as check:
                     if (
                         abs(observed_position.alt - injected_position.alt)
-                        > DISTANCE_TOLERANCE_M
+                        > geo.DISTANCE_TOLERANCE_M
                     ):
                         check.record_failed(
                             "Observed altitude does not match injected altitude",
@@ -785,7 +776,7 @@ def _evaluate_obfuscated_clusters_observation(
                             * geo.EARTH_CIRCUMFERENCE_M
                             / 360
                         )
-                        if distance <= DISTANCE_TOLERANCE_M:
+                        if distance <= geo.DISTANCE_TOLERANCE_M:
                             # Flight was not obfuscated
                             check.record_failed(
                                 summary="Error while evaluating obfuscation of individual flights. Flight was not obfuscated: it is at the center of the cluster.",
@@ -818,8 +809,9 @@ def _evaluate_obfuscated_clusters_observation(
 
     def _evaluate_sp_observation(
         self,
+        requested_area: s2sphere.LatLngRect,
         sp_observation: FetchedFlights,
-        rect: s2sphere.LatLngRect,
+        mappings: Dict[str, TelemetryMapping],
     ) -> None:
         # Note: This step currently uses the DSS endpoint to perform a one-time query for ISAs, but this
         # endpoint is not strictly required.  The PUT Subscription endpoint, followed immediately by the
@@ -840,31 +832,18 @@ def _evaluate_sp_observation(
                 )
                 return
 
-        observed_flights = []
-        for uss_query in sp_observation.uss_flight_queries.values():
-            for f in range(len(uss_query.flights)):
-                observed_flights.append(DPObservedFlight(query=uss_query, flight=f))
-        mapping_by_injection_id = map_observations_to_injected_flights(
-            self._injected_flights, observed_flights
-        )
-
-        for telemetry_mapping in mapping_by_injection_id.values():
-            # For flights that were mapped to an injection ID,
-            # update the observation queries with the participant id for future use in the aggregate checks
-            telemetry_mapping.observed_flight.query.set_server_id(
-                telemetry_mapping.injected_flight.uss_participant_id
-            )
-
         diagonal_km = (
-            rect.lo().get_distance(rect.hi()).degrees * geo.EARTH_CIRCUMFERENCE_KM / 360
+            requested_area.lo().get_distance(requested_area.hi()).degrees
+            * geo.EARTH_CIRCUMFERENCE_KM
+            / 360
         )
         if diagonal_km > self._rid_version.max_diagonal_km:
             self._evaluate_area_too_large_sp_observation(
-                mapping_by_injection_id, rect, diagonal_km
+                mappings, requested_area, diagonal_km
             )
         else:
             self._evaluate_normal_sp_observation(
-                rect, sp_observation, mapping_by_injection_id
+                requested_area, sp_observation, mappings
             )
 
     def _evaluate_normal_sp_observation(
@@ -933,7 +912,7 @@ def _evaluate_normal_sp_observation(
                 ) as check:
                     if (
                         abs(observed_position.alt - injected_position.alt)
-                        > DISTANCE_TOLERANCE_M
+                        > geo.DISTANCE_TOLERANCE_M
                     ):
                         check.record_failed(
                             "Altitude reported by Service Provider does not match injected altitude",
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py b/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
index 618613b581..799f5098bb 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
@@ -1,8 +1,21 @@
+import uuid
 from datetime import datetime
+from typing import List, Tuple
 
 from implicitdict import ImplicitDict
+from uas_standards.interuss.automated_testing.rid.v1.injection import ChangeTestResponse
 
-from monitoring.monitorlib.rid_automated_testing.injection_api import TestFlight
+from monitoring.monitorlib import geo
+from monitoring.monitorlib.rid_automated_testing.injection_api import (
+    TestFlight,
+    CreateTestParameters,
+)
+from monitoring.uss_qualifier.common_data_definitions import Severity
+from monitoring.uss_qualifier.resources.netrid import (
+    FlightDataResource,
+    NetRIDServiceProviders,
+)
+from monitoring.uss_qualifier.scenarios.scenario import TestScenario
 
 
 class InjectedFlight(ImplicitDict):
@@ -16,3 +29,110 @@ class InjectedTest(ImplicitDict):
     participant_id: str
     test_id: str
     version: str
+
+
+def inject_flights(
+    test_scenario: TestScenario,
+    flights_data_res: FlightDataResource,
+    service_providers_res: NetRIDServiceProviders,
+) -> Tuple[List[InjectedFlight], List[InjectedTest]]:
+    test_id = str(uuid.uuid4())
+    test_flights = flights_data_res.get_test_flights()
+    service_providers = service_providers_res.service_providers
+
+    injected_flights: List[InjectedFlight] = []
+    injected_tests: List[InjectedTest] = []
+
+    if len(service_providers) > len(test_flights):
+        raise ValueError(
+            f"{len(service_providers)} service providers were specified, but data for only {len(test_flights)} test flights were provided"
+        )
+    for i, target in enumerate(service_providers):
+        p = CreateTestParameters(requested_flights=[test_flights[i]])
+        with test_scenario.check(
+            "Successful injection", [target.participant_id]
+        ) as check:
+            query = target.submit_test(p, test_id)
+            test_scenario.record_query(query)
+
+            if query.status_code != 200:
+                check.record_failed(
+                    summary="Error while trying to inject test flight",
+                    severity=Severity.High,
+                    details=f"Expected response code 200 from {target.participant_id} but received {query.status_code} while trying to inject a test flight",
+                    query_timestamps=[query.request.timestamp],
+                )
+
+            if "json" not in query.response or query.response.json is None:
+                check.record_failed(
+                    summary="Response to test flight injection request did not contain a JSON body",
+                    severity=Severity.High,
+                    details=f"Expected a JSON body in response to flight injection request",
+                    query_timestamps=[query.request.timestamp],
+                )
+
+        changed_test: ChangeTestResponse = ImplicitDict.parse(
+            query.response.json, ChangeTestResponse
+        )
+        injected_tests.append(
+            InjectedTest(
+                participant_id=target.participant_id,
+                test_id=test_id,
+                version=changed_test.version,
+            )
+        )
+
+        for flight in changed_test.injected_flights:
+            injected_flights.append(
+                InjectedFlight(
+                    uss_participant_id=target.participant_id,
+                    test_id=test_id,
+                    flight=TestFlight(flight),
+                    query_timestamp=query.request.timestamp,
+                )
+            )
+
+    # Make sure the injected flights can be identified correctly by the test harness
+    with test_scenario.check("Identifiable flights") as check:
+        errors = injected_flights_errors(injected_flights)
+        if errors:
+            check.record_failed(
+                summary="Injected flights not suitable for test",
+                severity=Severity.High,
+                details="When checking the suitability of the flights (as injected) for the test, found:\n"
+                + "\n".join(errors),
+                query_timestamps=[f.query_timestamp for f in injected_flights],
+            )
+
+    return injected_flights, injected_tests
+
+
+def injected_flights_errors(injected_flights: List[InjectedFlight]) -> List[str]:
+    """Determine whether each telemetry in each injected flight can be easily distinguished from each other.
+
+    Args:
+        injected_flights: Full set of flights injected into Service Providers.
+
+    Returns: List of error messages, or an empty list if no errors.
+    """
+    errors: List[str] = []
+    for f1, injected_flight in enumerate(injected_flights):
+        for t1, injected_telemetry in enumerate(injected_flight.flight.telemetry):
+            for t2, other_telemetry in enumerate(
+                injected_flight.flight.telemetry[t1 + 1 :]
+            ):
+                if geo.LatLngPoint.from_f3411(injected_telemetry).match(
+                    geo.LatLngPoint.from_f3411(other_telemetry)
+                ):
+                    errors.append(
+                        f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at indices {t1} and {t1 + 1 + t2} which can be mistaken for each other"
+                    )
+            for f2, other_flight in enumerate(injected_flights[f1 + 1 :]):
+                for t2, other_telemetry in enumerate(other_flight.flight.telemetry):
+                    if geo.LatLngPoint.from_f3411(injected_telemetry).match(
+                        geo.LatLngPoint.from_f3411(other_telemetry)
+                    ):
+                        errors.append(
+                            f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at index {t1} that can be mistaken for telemetry index {t2} in {other_flight.uss_participant_id}'s flight with injection ID {other_flight.flight.injection_id} in test {other_flight.test_id}"
+                        )
+    return errors
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/virtual_observer.py b/monitoring/uss_qualifier/scenarios/astm/netrid/virtual_observer.py
index fad4ca7759..4c7033cf21 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/virtual_observer.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/virtual_observer.py
@@ -1,5 +1,7 @@
+import time
 from datetime import timedelta, datetime
-from typing import Optional
+from typing import Optional, Callable, List
+from loguru import logger
 
 import arrow
 from s2sphere import LatLngRect
@@ -69,3 +71,50 @@ def get_last_time_of_interest(self) -> datetime:
             self._injected_flights.get_end_of_injected_data()
             + self._relevant_past_data_period
         )
+
+    def start_polling(
+        self,
+        interval: timedelta,
+        diagonals_m: List[float],
+        poll_fct: Callable[[LatLngRect], bool],
+    ) -> None:
+        """
+        Start polling of the RID system.
+
+        :param interval: polling interval.
+        :param diagonals_m: list of the query rectangle diagonals (in meters).
+        :param poll_fct: polling function to invoke. If it returns True, the polling will be immediately interrupted before the end.
+        """
+        t_end = self.get_last_time_of_interest()
+        t_now = arrow.utcnow()
+        if t_now > t_end:
+            raise ValueError(
+                f"Cannot poll RID system: instructed to poll until {t_end}, which is before now ({t_now})"
+            )
+
+        logger.info(f"Polling from {t_now} until {t_end} every {interval}")
+        t_next = arrow.utcnow()
+        while arrow.utcnow() < t_end:
+            interrupt_polling = False
+            for diagonal_m in diagonals_m:
+                rect = self.get_query_rect(diagonal_m)
+                interrupt_polling = poll_fct(rect)
+                if interrupt_polling:
+                    break
+
+            if interrupt_polling:
+                logger.info(f"Polling ended early at {arrow.utcnow()}.")
+                break
+
+            # Wait until minimum polling interval elapses
+            while t_next < arrow.utcnow():
+                t_next += interval
+            if t_next > t_end:
+                logger.info(f"Polling ended normally at {t_end}.")
+                break
+            delay = t_next - arrow.utcnow()
+            if delay.total_seconds() > 0:
+                logger.debug(
+                    f"Waiting {delay.total_seconds()} seconds before polling RID system again..."
+                )
+                time.sleep(delay.total_seconds())

From 37a25bd56d266f11ae6d8d784343dc6500d9d991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 12:13:46 +0200
Subject: [PATCH 4/8] add aud override in NoAuth

---
 monitoring/monitorlib/auth.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/monitoring/monitorlib/auth.py b/monitoring/monitorlib/auth.py
index edd75c66d1..d1df97f29f 100644
--- a/monitoring/monitorlib/auth.py
+++ b/monitoring/monitorlib/auth.py
@@ -53,25 +53,29 @@ class NoAuth(AuthAdapter):
 
     EXPIRATION = 3600  # seconds
 
-    def __init__(self, sub: str = "uss_noauth"):
+    def __init__(self, sub: str = "uss_noauth", aud_override: Optional[str] = None):
         super().__init__()
         self.sub = sub
+        self._aud_override = aud_override
 
     # Overrides method in AuthAdapter
     def issue_token(self, intended_audience: str, scopes: List[str]) -> str:
         timestamp = int((datetime.datetime.utcnow() - _UNIX_EPOCH).total_seconds())
+        claims = {
+            "sub": self.sub,
+            "client_id": self.sub,
+            "scope": " ".join(scopes),
+            "aud": intended_audience,
+            "nbf": timestamp - 1,
+            "exp": timestamp + NoAuth.EXPIRATION,
+            "iss": "NoAuth",
+            "jti": str(uuid.uuid4()),
+        }
+        if self._aud_override is not None:
+            claims["aud"] = self._aud_override
         jwt = jwcrypto.jwt.JWT(
             header={"typ": "JWT", "alg": "RS256"},
-            claims={
-                "sub": self.sub,
-                "client_id": self.sub,
-                "scope": " ".join(scopes),
-                "aud": intended_audience,
-                "nbf": timestamp - 1,
-                "exp": timestamp + NoAuth.EXPIRATION,
-                "iss": "NoAuth",
-                "jti": str(uuid.uuid4()),
-            },
+            claims=claims,
             algs=["RS256"],
         )
         jwt.make_signed_token(NoAuth.dummy_private_key)

From 2ed9e29ca6556ce8b05273a89f93b581fc5e5fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 12:14:05 +0200
Subject: [PATCH 5/8] fix participant_id setter

---
 monitoring/monitorlib/fetch/rid.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/monitoring/monitorlib/fetch/rid.py b/monitoring/monitorlib/fetch/rid.py
index 3ba0224fb2..e30abb8e3b 100644
--- a/monitoring/monitorlib/fetch/rid.py
+++ b/monitoring/monitorlib/fetch/rid.py
@@ -643,16 +643,21 @@ def errors(self) -> List[str]:
     @property
     def participant_id(self) -> Optional[str]:
         if self.rid_version == RIDVersion.f3411_19:
-            return self.v19_query.participant_id
+            if "participant_id" in self.v19_query:
+                return self.v19_query.participant_id
+            else:
+                return None
         elif self.rid_version == RIDVersion.f3411_22a:
-            return self.v22a_query.participant_id
+            if "participant_id" in self.v22a_query:
+                return self.v22a_query.participant_id
+            else:
+                return None
         else:
             raise NotImplementedError(
                 f"Cannot retrieve participant_id using RID version {self.rid_version}"
             )
 
-    @participant_id.setter
-    def participant_id(self, participant_id: str) -> None:
+    def set_participant_id(self, participant_id: str) -> None:
         if self.v19_query is not None:
             self.v19_query.participant_id = participant_id
         elif self.v22a_query is not None:

From bf646183d6d6a930aefa55c0d6c4e49a02666cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 12:14:42 +0200
Subject: [PATCH 6/8] fix several issues

---
 .../scenarios/astm/netrid/common/misbehavior.py           | 5 ++++-
 .../scenarios/astm/netrid/display_data_evaluator.py       | 2 +-
 .../uss_qualifier/scenarios/astm/netrid/injection.py      | 8 ++++----
 .../scenarios/astm/netrid/v22a/misbehavior.md             | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
index 1aa3ae1e29..52280c88f4 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/misbehavior.py
@@ -5,6 +5,7 @@
 from requests.exceptions import RequestException
 from s2sphere import LatLngRect
 
+from monitoring.monitorlib import auth
 from monitoring.monitorlib.fetch import rid
 from monitoring.monitorlib.infrastructure import UTMClientSession
 from monitoring.monitorlib.rid import RIDVersion
@@ -156,7 +157,9 @@ def _evaluate_and_test_authentication(
         for injection_id, mapping in mapping_by_injection_id.items():
             participant_id = mapping.injected_flight.uss_participant_id
             flights_url = mapping.observed_flight.query.flights_url
-            unauthenticated_session = UTMClientSession(flights_url, None)
+            unauthenticated_session = UTMClientSession(
+                flights_url, auth.NoAuth(aud_override="")
+            )
 
             self.record_note(
                 f"{participant_id}/{injection_id}/missing_credentials_queries",
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 08e5570ed2..1f8c0ce9a9 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -164,7 +164,7 @@ def map_fetched_to_injected_flights(
 
     for mapping in tel_mapping.values():
         if mapping.observed_flight.query.participant_id is None:
-            mapping.observed_flight.query.participant_id = (
+            mapping.observed_flight.query.set_participant_id(
                 mapping.injected_flight.uss_participant_id
             )
 
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py b/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
index d6631313cc..96452d4c26 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/injection.py
@@ -137,16 +137,16 @@ def injected_flights_errors(injected_flights: List[InjectedFlight]) -> List[str]
             for t2, other_telemetry in enumerate(
                 injected_flight.flight.telemetry[t1 + 1 :]
             ):
-                if geo.LatLngPoint.from_f3411(injected_telemetry).match(
-                    geo.LatLngPoint.from_f3411(other_telemetry)
+                if geo.LatLngPoint.from_f3411(injected_telemetry.position).match(
+                    geo.LatLngPoint.from_f3411(other_telemetry.position)
                 ):
                     errors.append(
                         f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at indices {t1} and {t1 + 1 + t2} which can be mistaken for each other; (lat={injected_telemetry.position.lat}, lng={injected_telemetry.position.lng}) and (lat={other_telemetry.position.lat}, lng={other_telemetry.position.lng}) respectively"
                     )
             for f2, other_flight in enumerate(injected_flights[f1 + 1 :]):
                 for t2, other_telemetry in enumerate(other_flight.flight.telemetry):
-                    if geo.LatLngPoint.from_f3411(injected_telemetry).match(
-                        geo.LatLngPoint.from_f3411(other_telemetry)
+                    if geo.LatLngPoint.from_f3411(injected_telemetry.position).match(
+                        geo.LatLngPoint.from_f3411(other_telemetry.position)
                     ):
                         errors.append(
                             f"{injected_flight.uss_participant_id}'s flight with injection ID {injected_flight.flight.injection_id} in test {injected_flight.test_id} has telemetry at index {t1} that can be mistaken for telemetry index {t2} in {other_flight.uss_participant_id}'s flight with injection ID {other_flight.flight.injection_id} in test {other_flight.test_id}; (lat={injected_telemetry.position.lat}, lng={injected_telemetry.position.lng}) and (lat={other_telemetry.position.lat}, lng={other_telemetry.position.lng}) respectively"
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
index 5089d9d23c..698084d61d 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/misbehavior.md
@@ -44,7 +44,7 @@ This particular test requires each flight to be uniquely identifiable by its 2D
 In order to properly test whether the SP handles authentication correctly, this step will first attempt to do a request with the proper credentials
 to confirm that the requested data is indeed available to any authorized query.
 
-It then repeats the exact same request while omitting the credentials, and expects this to fail.
+It then repeats the exact same request with incorrect credentials, and expects this to fail.
 
 #### Missing credentials check
 

From 23db813a18ebeaa9c2b1a1663857332ad17872cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 14:05:46 +0200
Subject: [PATCH 7/8] fix small issues

---
 .../clients/versioning/client_interuss.py          |  6 +++---
 monitoring/monitorlib/fetch/rid.py                 |  4 ++--
 .../resources/netrid/service_providers.py          |  8 ++++----
 .../astm/netrid/common/dss/isa_validation.py       |  2 +-
 .../scenarios/astm/netrid/common/dss/utils.py      | 14 +++++++-------
 .../scenarios/astm/netrid/dss_wrapper.py           |  2 +-
 .../scenarios/astm/netrid/v19/misbehavior.md       |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/monitoring/monitorlib/clients/versioning/client_interuss.py b/monitoring/monitorlib/clients/versioning/client_interuss.py
index 07fe95d9f2..8fa9f7a328 100644
--- a/monitoring/monitorlib/clients/versioning/client_interuss.py
+++ b/monitoring/monitorlib/clients/versioning/client_interuss.py
@@ -18,7 +18,7 @@ class InterUSSVersioningClient(VersioningClient):
     def __init__(self, session: UTMClientSession, participant_id: ParticipantID):
         super(InterUSSVersioningClient, self).__init__(participant_id)
         self._session = session
-        self._server_id = participant_id
+        self._participant_id = participant_id
 
     def get_version(self, version_type: Optional[str]) -> GetVersionResponse:
         op = api.OPERATIONS[api.OperationID.GetVersion]
@@ -29,8 +29,8 @@ def get_version(self, version_type: Optional[str]) -> GetVersionResponse:
             "query_type": QueryType.InterUSSVersioningGetVersion,
             "scope": Scope.ReadSystemVersions,
         }
-        if self._server_id:
-            kwargs["server_id"] = self._server_id
+        if self._participant_id:
+            kwargs["participant_id"] = self._participant_id
         query = query_and_describe(**kwargs)
         if query.status_code != 200:
             raise VersionQueryError(
diff --git a/monitoring/monitorlib/fetch/rid.py b/monitoring/monitorlib/fetch/rid.py
index e30abb8e3b..e6b26c046e 100644
--- a/monitoring/monitorlib/fetch/rid.py
+++ b/monitoring/monitorlib/fetch/rid.py
@@ -1001,9 +1001,9 @@ def uss_flights(
                 else "false",
             },
             scope=v19.constants.Scope.Read,
+            query_type=QueryType.F3411v19Flights,
             participant_id=participant_id,
         )
-        query.query_type = QueryType.F3411v19Flights
         return FetchedUSSFlights(v19_query=query)
     elif rid_version == RIDVersion.f3411_22a:
         params = {
@@ -1022,9 +1022,9 @@ def uss_flights(
             flights_url,
             params=params,
             scope=v22a.constants.Scope.DisplayProvider,
+            query_type=QueryType.F3411v22aFlights,
             participant_id=participant_id,
         )
-        query.query_type = QueryType.F3411v22aFlights
         return FetchedUSSFlights(v22a_query=query)
     else:
         raise NotImplementedError(
diff --git a/monitoring/uss_qualifier/resources/netrid/service_providers.py b/monitoring/uss_qualifier/resources/netrid/service_providers.py
index ced5c50a00..cdbc5a36ea 100644
--- a/monitoring/uss_qualifier/resources/netrid/service_providers.py
+++ b/monitoring/uss_qualifier/resources/netrid/service_providers.py
@@ -42,7 +42,7 @@ class NetRIDServiceProvidersSpecification(ImplicitDict):
 class NetRIDServiceProvider(object):
     participant_id: str
     injection_base_url: str
-    flights_injection_client: infrastructure.UTMClientSession
+    injection_client: infrastructure.UTMClientSession
     local_debug: bool
 
     def __init__(
@@ -54,14 +54,14 @@ def __init__(
     ):
         self.participant_id = participant_id
         self.injection_base_url = injection_base_url
-        self.flights_injection_client = infrastructure.UTMClientSession(
+        self.injection_client = infrastructure.UTMClientSession(
             injection_base_url, auth_adapter
         )
         self.local_debug = local_debug
 
     def submit_test(self, request: CreateTestParameters, test_id: str) -> fetch.Query:
         return fetch.query_and_describe(
-            self.flights_injection_client,
+            self.injection_client,
             "PUT",
             url=f"/tests/{test_id}",
             json=request,
@@ -71,7 +71,7 @@ def submit_test(self, request: CreateTestParameters, test_id: str) -> fetch.Quer
 
     def delete_test(self, test_id: str, version: str) -> fetch.Query:
         return fetch.query_and_describe(
-            self.flights_injection_client,
+            self.injection_client,
             "DELETE",
             url=f"/tests/{test_id}/{version}",
             scope=SCOPE_RID_QUALIFIER_INJECT,
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_validation.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_validation.py
index 3616dfec5c..8a4f355856 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_validation.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_validation.py
@@ -111,7 +111,7 @@ def _delete_isa_if_exists(self):
             isa_id=self._isa_id,
             rid_version=self._dss.rid_version,
             session=self._dss.client,
-            server_id=self._dss_wrapper.participant_id,
+            participant_id=self._dss_wrapper.participant_id,
         )
 
     def _isa_huge_area_check(self) -> (str, Dict[str, Any]):
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/utils.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/utils.py
index c108b93f96..ea314377e9 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/utils.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/utils.py
@@ -13,21 +13,21 @@ def delete_isa_if_exists(
     isa_id: str,
     rid_version: RIDVersion,
     session: UTMClientSession,
-    server_id: Optional[str] = None,
+    participant_id: Optional[str] = None,
 ):
     fetched = fetch.isa(
         isa_id,
         rid_version=rid_version,
         session=session,
-        server_id=server_id,
+        participant_id=participant_id,
     )
     scenario.record_query(fetched.query)
-    with scenario.check("Successful ISA query", [server_id]) as check:
+    with scenario.check("Successful ISA query", [participant_id]) as check:
         if not fetched.success and fetched.status_code != 404:
             check.record_failed(
                 "ISA information could not be retrieved",
                 Severity.High,
-                f"{server_id} DSS instance returned {fetched.status_code} when queried for ISA {isa_id}",
+                f"{participant_id} DSS instance returned {fetched.status_code} when queried for ISA {isa_id}",
                 query_timestamps=[fetched.query.request.timestamp],
             )
 
@@ -37,17 +37,17 @@ def delete_isa_if_exists(
             fetched.isa.version,
             rid_version,
             session,
-            server_id=server_id,
+            participant_id=participant_id,
         )
         scenario.record_query(deleted.dss_query.query)
         for subscriber_id, notification in deleted.notifications.items():
             scenario.record_query(notification.query)
-        with scenario.check("Removed pre-existing ISA", [server_id]) as check:
+        with scenario.check("Removed pre-existing ISA", [participant_id]) as check:
             if not deleted.dss_query.success:
                 check.record_failed(
                     "Could not delete pre-existing ISA",
                     Severity.High,
-                    f"Attempting to delete ISA {isa_id} from the {server_id} DSS returned error {deleted.dss_query.status_code}",
+                    f"Attempting to delete ISA {isa_id} from the {participant_id} DSS returned error {deleted.dss_query.status_code}",
                     query_timestamps=[deleted.dss_query.query.request.timestamp],
                 )
         for subscriber_url, notification in deleted.notifications.items():
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py b/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
index 7911e630ce..e49500a326 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
@@ -282,7 +282,7 @@ def put_isa_expect_response_code(
             isa_version=isa_version,
             rid_version=self._dss.rid_version,
             utm_client=self._dss.client,
-            server_id=self._dss.participant_id,
+            participant_id=self._dss.participant_id,
         )
 
         self._handle_query_result(
diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
index 537364b92f..af43f8b57f 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/misbehavior.md
@@ -44,7 +44,7 @@ This particular test requires each flight to be uniquely identifiable by its 2D
 In order to properly test whether the SP handles authentication correctly, this step will first attempt to do a request with the proper credentials
 to confirm that the requested data is indeed available to any authorized query.
 
-It then repeats the exact same request while omitting the credentials, and expects this to fail.
+It then repeats the exact same request with incorrect credentials, and expects this to fail.
 
 #### Missing credentials check
 

From da4f8629d2138ca92efe15eebf58cdb9b775aff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Misbach?= <mickael@misba.ch>
Date: Fri, 20 Oct 2023 14:06:16 +0200
Subject: [PATCH 8/8] add TODO

---
 .../scenarios/astm/netrid/display_data_evaluator.py              | 1 +
 1 file changed, 1 insertion(+)

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 1f8c0ce9a9..956da71fda 100644
--- a/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
+++ b/monitoring/uss_qualifier/scenarios/astm/netrid/display_data_evaluator.py
@@ -162,6 +162,7 @@ def map_fetched_to_injected_flights(
         injected_flights, observed_flights
     )
 
+    # TODO: a better approach here would be to separately map flights URL to participant IDs based on all TelemetryMapping encountered, and set retroactively the participant ID on all queries
     for mapping in tel_mapping.values():
         if mapping.observed_flight.query.participant_id is None:
             mapping.observed_flight.query.set_participant_id(