Merge branch 'main' into interactions_and_invalid_op_checks

monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py

@@ -164,7 +164,7 @@ def _ensure_no_active_subs_exist(self):
         we want to avoid potentially reaching the limit during this scenario."""
 
         with self.check(
-            "Search for all subscriptions in ISA area",
+            "Successful subscription search query",
             [self._dss_wrapper.participant_id],
         ) as check:
             subs_in_area = self._dss_wrapper.search_subs(

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_expiry.md

@@ -20,22 +20,10 @@ Perform basic operations on a single DSS instance in order to verify that it han
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID. This step ensures that the ISA does not exist when the main part of the test starts.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,b](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## ISA Expiry test case
 
 This test case creates an ISA with a short lifetime and verifies that it is not returned in search results after it expires.

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_simple.md

@@ -25,23 +25,11 @@ after its time of applicability.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID.  This step ensures that ISA does not exist before the start of the main
 part of the test.
 
-#### Successful ISA query check
-
-While F3411-19 does not explicitly require the implementation of a specific ISA retrieval endpoint, Annex A4 specifies the explicit format for this endpoint.  If this format is not followed and the error isn't a 404, this check will fail per **[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,b](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## Create and check ISA test case
 
 ### [Create ISA test step](test_steps/put_isa.md)

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md

@@ -20,32 +20,12 @@ Verifies that interactions between ISAs and subscriptions happen as expected.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID. This step ensures that the ISA does not exist when the main part of the test starts.
 
 Any previously created subscriptions for the test ISA's area that might still exist will be deleted.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,d](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
-
-#### Successful subscription search query check
-
-**[astm.f3411.v19.DSS0030,f](../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created.
-
-#### Subscription can be deleted check
-
-**[astm.f3411.v19.DSS0030,d](../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to delete subscriptions they created.
-
 ## ISA Subscription Interactions test case
 
 This test case will do the following, using the DSS being tested:

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_validation.md

@@ -25,23 +25,11 @@ after its time of applicability.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID.  This step ensures that ISA does not exist before the start of the main
 part of the test.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,b](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## ISA Validation test case
 
 ### ISA Validation test step

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_simple.md

@@ -28,22 +28,10 @@ Perform basic operations on a single DSS instance to create, update and delete s
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This step ensures that no subscription with the known test ID exists in the DSS.
 
-#### Search for all subscriptions in ISA area check
-
-If the DSS fails to let us search in the area for which test subscriptions will be created, it is failing to properly implement **[astm.f3411.v19.DSS0030,f](../../../../../requirements/astm/f3411/v19.md)**.
-
-#### Subscription can be queried by ID check
-
-If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v19.DSS0030,e](../../../../../requirements/astm/f3411/v19.md)** correctly.
-
-#### Subscription can be deleted check
-
-An attempt to delete a subscription when the correct version is provided should succeed, otherwise the DSS is in violation of **[astm.f3411.v19.DSS0030,d](../../../../../requirements/astm/f3411/v19.md)**.
-
 ## Subscription Simple test case
 
 This test case creates multiple subscriptions, goes on to query and search for them, then deletes and searches for them again.

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_validation.md

@@ -20,18 +20,10 @@ Perform basic operations on a single DSS instance to create subscriptions and ch
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This step ensures that we remove any subscription that may already exist for the service area.  First, the DSS is queried for any applicable existing subscriptions, and then any subscriptions found are deleted.
 
-#### Successful subscription search query check
-
-If the search query for subscriptions fails, **[astm.f3411.v19.DSS0030,f](../../../../../requirements/astm/f3411/v19.md)** was not met.
-
-#### Subscription can be deleted check
-
-If the deletion attempt fails, **[astm.f3411.v19.DSS0030,d](../../../../../requirements/astm/f3411/v19.md)** was not met.
-
 ## Subscription quantity limitations test case
 
 ### Create maximum number of subscriptions test step

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/test_steps/clean_workspace.md

@@ -0,0 +1,27 @@
+# Ensure clean workspace test step
+
+This page describes the content of a common test step that ensures a clean workspace for testing interactions with a DSS
+
+## Successful ISA query check
+
+**[interuss.f3411.dss_endpoints.GetISA](../../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
+
+## Removed pre-existing ISA check
+
+If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,d](../../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
+
+## Notified subscriber check
+
+When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
+
+## Successful subscription search query check
+
+**[astm.f3411.v19.DSS0030,f](../../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created.
+
+## Subscription can be queried by ID check
+
+If the DSS cannot be queried for the existing test ID, the DSS is likely not implementing **[astm.f3411.v19.DSS0030,e](../../../../../../requirements/astm/f3411/v19.md)** correctly.
+
+## Subscription can be deleted check
+
+**[astm.f3411.v19.DSS0030,d](../../../../../../requirements/astm/f3411/v19.md)** requires the implementation of the DSS endpoint to allow callers to delete subscriptions they created.

monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/token_validation.md

@@ -20,23 +20,11 @@ Checks that the DSS properly validates the provided client token on all its endp
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID.  This step ensures that ISA does not exist before the start of the main
 part of the test.
 
-#### Successful ISA query check
-
-While F3411-19 does not explicitly require the implementation of a specific ISA retrieval endpoint, Annex A4 specifies the explicit format for this endpoint.  If this format is not followed and the error isn't a 404, this check will fail per **[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v19.DSS0030,b](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v19.NET0730](../../../../../requirements/astm/f3411/v19.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## Token validation test case
 
 ### [Token validation test step](test_steps/put_isa.md)

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_expiry.md

@@ -20,22 +20,10 @@ Perform basic operations on a single DSS instance in order to verify that it han
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID. This step ensures that the ISA does not exist when the main part of the test starts.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v22a.DSS0030,b](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v22a.NET0730](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## ISA Expiry test case
 
 This test case creates an ISA with a short lifetime and verifies that it is not returned in search results after it expires.

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_simple.md

@@ -25,23 +25,11 @@ after its time of applicability.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID.  This step ensures that ISA does not exist before the start of the main
 part of the test.
 
-#### Successful ISA query check
-
-While F3411-22a does not explicitly require the implementation of a specific ISA retrieval endpoint, Annex A4 specifies the explicit format for this endpoint.  If this format is not followed and the error isn't a 404, this check will fail per **[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v22a.DSS0030,b](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v22a.NET0730](../../../../../requirements/astm/f3411/v22a.md)** and **[astm.f3411.v22a.NET0340](../../../../../requirements/astm/f3411/v22a.md)** requirements to implement the POST ISAs endpoint aren't met.
-
 ## Create and check ISA test case
 
 ### [Create ISA test step](test_steps/put_isa.md)

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md

@@ -20,32 +20,12 @@ Verifies that interactions between ISAs and subscriptions happen as expected.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID. This step ensures that the ISA does not exist when the main part of the test starts.
 
 Any previously created subscriptions for the test ISA's area that might still exist will be deleted.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v22a.DSS0030,d](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v22a.NET0730](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the POST ISAs endpoint isn't met.
-
-#### Successful subscription search query check
-
-**[astm.f3411.v22a.DSS0030,f](../../../../../requirements/astm/f3411/v22a.md)** requires the implementation of the DSS endpoint to allow callers to retrieve the subscriptions they created.
-
-#### Subscription can be deleted check
-
-**[astm.f3411.v22a.DSS0030,d](../../../../../requirements/astm/f3411/v22a.md)** requires the implementation of the DSS endpoint to allow callers to delete subscriptions they created.
-
 ## ISA Subscription Interactions test case
 
 This test case will do the following, using the DSS being tested:

monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_validation.md

@@ -25,23 +25,11 @@ after its time of applicability.
 
 ## Setup test case
 
-### Ensure clean workspace test step
+### [Ensure clean workspace test step](test_steps/clean_workspace.md)
 
 This scenario creates an ISA with a known ID.  This step ensures that ISA does not exist before the start of the main
 part of the test.
 
-#### Successful ISA query check
-
-**[interuss.f3411.dss_endpoints.GetISA](../../../../../requirements/interuss/f3411/dss_endpoints.md)** requires the implementation of the DSS endpoint enabling retrieval of information about a specific ISA; if the individual ISA cannot be retrieved and the error isn't a 404, then this requirement isn't met.
-
-#### Removed pre-existing ISA check
-
-If an ISA with the intended ID is already present in the DSS, it needs to be removed before proceeding with the test.  If that ISA cannot be deleted, then the **[astm.f3411.v22a.DSS0030,b](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the ISA deletion endpoint might not be met.
-
-#### Notified subscriber check
-
-When a pre-existing ISA needs to be deleted to ensure a clean workspace, any subscribers to ISAs in that area must be notified (as specified by the DSS).  If a notification cannot be delivered, then the **[astm.f3411.v22a.NET0730](../../../../../requirements/astm/f3411/v22a.md)** requirement to implement the POST ISAs endpoint isn't met.
-
 ## ISA Validation test case
 
 ### ISA Validation test step