[uss_qualifier] adapt SCD subscription sync documentation to correct …

…convention

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/create.md

@@ -7,18 +7,14 @@ This test step fragment validates that subscriptions can be created.
 As per **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**, the DSS API must allow callers to create a subscription with either one or both of the
 start and end time missing, provided all the required parameters are valid.
 
-## 🛑 Create subscription response is correct check
-
-A successful subscription creation query is expected to return a well-defined body, the content of which reflects the created subscription.
-If the format and content of the response are not conforming, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
-
-## ⚠️ Create subscription response format conforms to spec check
+## 🛑 Create subscription response format conforms to spec check
 
 The response to a successful subscription creation query is expected to conform to the format defined by the OpenAPI specification under the `A3.1` Annex of ASTM F3548−21.
 
 If it does not, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
 
-## 🛑 Response to subscription creation contains a subscription check
+## 🛑 Create subscription response content is correct check
+
+A successful subscription creation query is expected to return a well-defined body, the content of which reflects the created subscription.
 
-As per **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**, upon creation of a subscription,
-the newly created subscription must be part of its response.
+If the content of the response does not correspond to the requested content, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/delete.md

@@ -6,8 +6,14 @@ This test step fragment validates that subscriptions can be deleted.
 
 An attempt to delete a subscription when the correct version is provided should succeed, otherwise the DSS is in violation of **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
 
-## ⚠️ Delete subscription response format conforms to spec check
+## 🛑 Delete subscription response format conforms to spec check
 
 The response to a successful subscription deletion query is expected to conform to the format defined by the OpenAPI specification under the `A3.1` Annex of ASTM F3548−21.
 
 If it does not, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
+
+## 🛑 Delete subscription response content is correct check
+
+A successful subscription deletion query is expected to return a well-defined body, the content of which reflects the deleted subscription.
+
+If the content of the response does not correspond to the subscription at the time of deletion, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/read.md

@@ -6,7 +6,7 @@ This test step fragment validates that subscriptions can be read.
 
 If a subscription cannot be queried using its ID, the DSS is failing to meet **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
 
-## ⚠️ Get subscription response format conforms to spec check
+## 🛑 Get subscription response format conforms to spec check
 
 The response to a successful get subscription query is expected to conform to the format defined by the OpenAPI specification under the `A3.1` Annex of ASTM F3548−21.
 

monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/update.md

@@ -6,13 +6,14 @@ This test step fragment validates that subscriptions can be updated.
 
 If a subscription cannot be modified with a valid set of parameters, the DSS is failing to meet **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
 
-## 🛑 Response to subscription mutation contains a subscription check
-
-As per **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**, upon mutation of a subscription,
-the newly created subscription must be part of its response.
-
-## ⚠️ Mutate subscription response format conforms to spec check
+## 🛑 Mutate subscription response format conforms to spec check
 
 The response to a successful subscription mutation query is expected to conform to the format defined by the OpenAPI specification under the `A3.1` Annex of ASTM F3548−21.
 
 If it does not, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.
+
+## 🛑 Mutate subscription response content is correct check
+
+A successful subscription mutation query is expected to return a well-defined body, the content of which reflects the mutated subscription.
+
+If the content of the response does correspond to the requested mutation, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**.

monitoring/uss_qualifier/scenarios/astm/utm/dss/synchronization/subscription_synchronization.py

@@ -5,10 +5,11 @@
 from uas_standards.astm.f3548.v21.api import Subscription, SubscriptionID
 from uas_standards.astm.f3548.v21.constants import Scope
 
-from monitoring.monitorlib import geo
+from monitoring.monitorlib import geo, schema_validation
 from monitoring.monitorlib.geo import Volume3D
 from monitoring.monitorlib.geotemporal import Volume4D
 from monitoring.monitorlib.mutate.scd import MutatedSubscription
+from monitoring.monitorlib.schema_validation import F3548_21
 from monitoring.prober.infrastructure import register_resource_type
 from monitoring.uss_qualifier.resources.astm.f3548.v21 import PlanningAreaResource
 from monitoring.uss_qualifier.resources.astm.f3548.v21.dss import (
@@ -21,6 +22,9 @@
 )
 from monitoring.uss_qualifier.resources.interuss.id_generator import IDGeneratorResource
 from monitoring.uss_qualifier.scenarios.astm.utm.dss import test_step_fragments
+from monitoring.uss_qualifier.scenarios.astm.utm.dss.validators import (
+    _fail_with_schema_errors,
+)
 from monitoring.uss_qualifier.scenarios.astm.utm.dss.validators.subscription_validator import (
     SubscriptionValidator,
 )
@@ -252,7 +256,7 @@ def _create_sub_with_params(
                 )
 
         with self.check(
-            "Create subscription response is correct", [self._primary_pid]
+            "Create subscription response content is correct", [self._primary_pid]
         ) as check:
             SubscriptionValidator(
                 check,
@@ -488,22 +492,18 @@ def _validate_get_sub_from_secondary(
                     query_timestamps=[fetched_sub.request.timestamp],
                 )
 
+        # Finally, validate the response schema
         with self.check(
-            "Subscription returned by a secondary DSS is valid and correct",
-            [secondary_dss.participant_id, self._primary_pid],
+            "Get subscription response format conforms to spec",
+            secondary_dss.participant_id,
         ) as check:
-            # Do a full validation of the subscription as a sanity check
-            SubscriptionValidator(
-                check,
-                self,
-                [secondary_dss.participant_id],
-                expected_sub_params,
-            ).validate_fetched_subscription(
-                expected_sub_id=expected_sub_params.sub_id,
-                fetched_sub=fetched_sub,
-                expected_version=self._current_subscription.version,
-                is_implicit=False,
+            errors = schema_validation.validate(
+                F3548_21.OpenAPIPath,
+                F3548_21.GetSubscriptionResponse,
+                fetched_sub.response.json,
             )
+            if errors:
+                _fail_with_schema_errors(check, errors, fetched_sub.request.timestamp)
 
     def _compare_upsert_resp_with_params(
         self,
@@ -516,25 +516,19 @@ def _compare_upsert_resp_with_params(
         Verify that the response of the server is conforming to the spec and the parameters we used in the request.
         """
         check_name = (
-            "Response to subscription mutation contains a subscription"
+            "Mutate subscription response content is correct"
             if was_mutated
-            else "Response to subscription creation contains a subscription"
+            else "Create subscription response content is correct"
         )
-        with self.check(
-            check_name,
-            [self._primary_pid],
-        ) as check:
+
+        with self.check(check_name, [self._primary_pid]) as check:
             if not creation_resp_under_test.subscription:
                 check.record_failed(
                     "Response to subscription creation did not contain a subscription",
-                    details="A subscription is expected to be returned in the response to a subscription creation request."
+                    details=f"A subscription is expected to be returned in the response. "
                     f"Parameters used: {creation_params}",
                     query_timestamps=[creation_resp_under_test.request.timestamp],
                 )
-
-        with self.check(
-            "Mutate subscription response format conforms to spec", [self._primary_pid]
-        ) as check:
             SubscriptionValidator(
                 check,
                 self,
@@ -630,7 +624,7 @@ def _delete_sub_from_dss(
                 return False
 
         with self.check(
-            "Delete subscription response format conforms to spec",
+            "Delete subscription response content is correct",
             [dss_instance.participant_id],
         ) as check:
             SubscriptionValidator(

monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/__init__.py

@@ -0,0 +1,22 @@
+from datetime import datetime
+from typing import List
+
+from monitoring.monitorlib import schema_validation
+from monitoring.uss_qualifier.scenarios.scenario import PendingCheck
+
+
+def _fail_with_schema_errors(
+    check: PendingCheck,
+    errors: List[schema_validation.ValidationError],
+    t_dss: datetime,
+) -> None:
+    """
+    Fail the passed check with the passed schema validation errors.
+    """
+    details = "\n".join(f"[{e.json_path}] {e.message}" for e in errors)
+    check.record_failed(
+        summary="Response format was invalid",
+        details="Found the following schema validation errors in the DSS response:\n"
+        + details,
+        query_timestamps=[t_dss],
+    )

monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/oir_validator.py

@@ -14,6 +14,9 @@
 
 from monitoring.monitorlib import schema_validation, fetch
 from monitoring.monitorlib.schema_validation import F3548_21
+from monitoring.uss_qualifier.scenarios.astm.utm.dss.validators import (
+    _fail_with_schema_errors,
+)
 from monitoring.uss_qualifier.scenarios.scenario import PendingCheck, TestScenario
 
 TIME_TOLERANCE_SEC = 1
@@ -494,23 +497,3 @@ def validate_deleted_oir(
             previous_version=None,
             expected_version=expected_version,
         )
-
-
-def _fail_with_schema_errors(
-    check: PendingCheck,
-    errors: List[schema_validation.ValidationError],
-    t_dss: datetime,
-) -> None:
-    """
-    Fail the passed check with the passed schema validation errors.
-    Note:
-        The main check IS NOT failed:
-        The main check pertains to the CONTENT of the response but not its FORMAT.
-    """
-    details = "\n".join(f"[{e.json_path}] {e.message}" for e in errors)
-    check.record_failed(
-        summary="Response format was invalid",
-        details="Found the following schema validation errors in the DSS response:\n"
-        + details,
-        query_timestamps=[t_dss],
-    )

monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/subscription_validator.py

@@ -10,6 +10,9 @@
 from monitoring.uss_qualifier.resources.astm.f3548.v21.subscription_params import (
     SubscriptionParams,
 )
+from monitoring.uss_qualifier.scenarios.astm.utm.dss.validators import (
+    _fail_with_schema_errors,
+)
 from monitoring.uss_qualifier.scenarios.scenario import PendingCheck, TestScenario
 
 TIME_TOLERANCE_SEC = 1
@@ -71,23 +74,6 @@ def _fail_sub_check(
             query_timestamps=[t_dss],
         )
 
-    def _fail_with_schema_errors(
-        self,
-        check: PendingCheck,
-        errors: List[schema_validation.ValidationError],
-        t_dss: datetime,
-    ) -> None:
-        """Fail the passed check with the passed schema validation errors, and fail
-        the main check with the passed details."""
-        details = "\n".join(f"[{e.json_path}] {e.message}" for e in errors)
-        self._fail_sub_check(
-            check,
-            summary="Response format was invalid",
-            details="Found the following schema validation errors in the DSS response:\n"
-            + details,
-            t_dss=t_dss,
-        )
-
     def _validate_sub(
         self,
         expected_sub_id: SubscriptionID,
@@ -304,7 +290,7 @@ def _validate_put_sub_response_schema(
                 new_sub.response.json,
             )
             if errors:
-                self._fail_with_schema_errors(check, errors, t_dss)
+                _fail_with_schema_errors(check, errors, t_dss)
 
     def validate_created_subscription(
         self, expected_sub_id: SubscriptionID, new_sub: MutatedSubscription
@@ -407,7 +393,7 @@ def validate_fetched_subscription(
                 fetched_sub.response.json,
             )
             if errors:
-                self._fail_with_schema_errors(check, errors, t_dss)
+                _fail_with_schema_errors(check, errors, t_dss)
 
         # Validate the subscription itself
         self._validate_sub(
@@ -482,7 +468,7 @@ def validate_searched_subscriptions_format(
                 searched_subscriptions.response.json,
             )
             if errors:
-                self._fail_with_schema_errors(check, errors, t_dss)
+                _fail_with_schema_errors(check, errors, t_dss)
 
     def validate_deleted_subscription(
         self,
@@ -509,7 +495,7 @@ def validate_deleted_subscription(
                 deleted_subscription.response.json,
             )
             if errors:
-                self._fail_with_schema_errors(check, errors, t_dss)
+                _fail_with_schema_errors(check, errors, t_dss)
 
         # Validate the subscription itself
         self._validate_sub(

monitoring/uss_qualifier/suites/astm/utm/dss_probing.md

@@ -23,7 +23,7 @@
     <th><a href="../../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="20" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
+    <td rowspan="21" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
     <td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,1</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/utm/dss/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/dss/authentication/authentication_validation.md">ASTM SCD DSS: Interfaces authentication</a><br><a href="../../../scenarios/astm/utm/dss/subscription_simple.md">ASTM SCD DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/utm/dss/synchronization/subscription_synchronization.md">ASTM SCD DSS: Subscription Synchronization</a><br><a href="../../../scenarios/astm/utm/dss/subscription_validation.md">ASTM SCD DSS: Subscription Validation</a></td>

monitoring/uss_qualifier/suites/astm/utm/f3548_21.md

@@ -35,7 +35,7 @@
     <th><a href="../../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="46" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
+    <td rowspan="47" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
     <td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,1</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/dss/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/dss/authentication/authentication_validation.md">ASTM SCD DSS: Interfaces authentication</a><br><a href="../../../scenarios/astm/utm/dss/subscription_simple.md">ASTM SCD DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/utm/dss/synchronization/subscription_synchronization.md">ASTM SCD DSS: Subscription Synchronization</a><br><a href="../../../scenarios/astm/utm/dss/subscription_validation.md">ASTM SCD DSS: Subscription Validation</a><br><a href="../../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../../scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md">Off-Nominal planning: down USS with equal priority conflicts not permitted</a></td>

monitoring/uss_qualifier/suites/faa/uft/message_signing.md

@@ -18,7 +18,7 @@
     <th><a href="../../README.md#checked-in">Checked in</a></th>
   </tr>
   <tr>
-    <td rowspan="46" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
+    <td rowspan="47" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
     <td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,1</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/dss/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/dss/authentication/authentication_validation.md">ASTM SCD DSS: Interfaces authentication</a><br><a href="../../../scenarios/astm/utm/dss/subscription_simple.md">ASTM SCD DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/utm/dss/synchronization/subscription_synchronization.md">ASTM SCD DSS: Subscription Synchronization</a><br><a href="../../../scenarios/astm/utm/dss/subscription_validation.md">ASTM SCD DSS: Subscription Validation</a><br><a href="../../../scenarios/astm/utm/off_nominal_planning/down_uss.md">Off-Nominal planning: down USS</a><br><a href="../../../scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md">Off-Nominal planning: down USS with equal priority conflicts not permitted</a></td>

monitoring/uss_qualifier/suites/interuss/dss/all_tests.md

@@ -408,7 +408,7 @@
     <td><a href="../../../scenarios/astm/netrid/v22a/dss/heavy_traffic_concurrent.md">ASTM NetRID DSS: Concurrent Requests</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/isa_expiry.md">ASTM NetRID DSS: ISA Expiry</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md">ASTM NetRID DSS: ISA Subscription Interactions</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/isa_simple.md">ASTM NetRID DSS: Simple ISA</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/isa_validation.md">ASTM NetRID DSS: Submitted ISA Validations</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/subscription_simple.md">ASTM NetRID DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/subscription_validation.md">ASTM NetRID DSS: Subscription Validation</a><br><a href="../../../scenarios/astm/netrid/v22a/dss/token_validation.md">ASTM NetRID DSS: Token Validation</a></td>
   </tr>
   <tr>
-    <td rowspan="20" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
+    <td rowspan="21" style="vertical-align:top;"><a href="../../../requirements/astm/f3548/v21.md">astm<br>.f3548<br>.v21</a></td>
     <td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,1</a></td>
     <td>Implemented</td>
     <td><a href="../../../scenarios/astm/utm/dss/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/dss/authentication/authentication_validation.md">ASTM SCD DSS: Interfaces authentication</a><br><a href="../../../scenarios/astm/utm/dss/subscription_simple.md">ASTM SCD DSS: Subscription Simple</a><br><a href="../../../scenarios/astm/utm/dss/synchronization/subscription_synchronization.md">ASTM SCD DSS: Subscription Synchronization</a><br><a href="../../../scenarios/astm/utm/dss/subscription_validation.md">ASTM SCD DSS: Subscription Validation</a></td>