Removing else condition, and renaming test step and check as discussed

interuss · Dec 15, 2023 · aa89491 · aa89491
1 parent 7999f53
commit aa89491
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/...qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md b/...qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md
@@ -51,7 +51,7 @@ which is of equal priority and came first.
 ### [Validate flight 1 sharing test step](../validate_shared_operational_intent.md)
 Validate flight 1 is planned.
 
-### [Validate flight2 GET interaction test step](test_steps/validate_get_operational_intent.md)
+### [Validate flight2 GET interaction, if no notification test step](test_steps/validate_get_operational_intent.md)
 Validate that tested_uss makes a GET request for obtaining details of flight 2 from control_uss.
 In a previous step (Precondition - check tested_uss has no subscription in flight 2 area), we ensured that no notification of flight 2 was sent to tested_uss.
 Hence, tested_uss will need to make a GET request to obtain flight 2 details.
@@ -89,7 +89,7 @@ which is of equal priority and came first.
 ### [Validate flight 1 not shared by tested_uss test step](../validate_not_shared_operational_intent.md)
 Validate flight 1 is not shared with DSS, as plan failed.
 
-### [Validate flight 2 GET interaction test step](test_steps/validate_get_operational_intent.md)
+### [Validate flight2 GET interaction, if no notification test step](test_steps/validate_get_operational_intent.md)
 Validate that tested_uss makes a GET request for obtaining details of flight 2 from control_uss.
 In a previous step (Precondition - check tested_uss has no subscription in flight 2 area), we ensured that no notification of flight 2 was sent to tested_uss.
 Hence, tested_uss will need to make a GET request to obtain flight 2 details.

diff --git a/...oring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py b/...oring/uss_qualifier/scenarios/astm/utm/data_exchange_validation/get_op_data_validation.py
@@ -204,16 +204,8 @@ def _tested_uss_plans_deconflicted_flight_near_existing_flight(
                 self.control_uss.base_url,
                 flight_2_oi_ref.id,
                 self.tested_uss_client.participant_id,
-                "Validate flight2 GET interaction",
+                "Validate flight2 GET interaction, if no notification",
             )
-        else:
-            msg = (
-                f"Tested_uss was notified of flight2, due to an existing subscription. Hence, not checking for the GET requests."
-                f"With a notification already sent, if a GET request is made, it would be unclear if tested_uss used the information from notification or GET request for planning."
-                f"As this test is for checking GET requests validation, we cannot continue the test."
-                f"See documentation of test step - Check for notification to tested_uss due to subscription in flight 2 area"
-            )
-            raise ScenarioCannotContinueError(msg)
 
         expect_interuss_post_interactions(
             self,
@@ -307,16 +299,8 @@ def _tested_uss_unable_to_plan_flight_near_invalid_shared_existing_flight(
                 self.control_uss.base_url,
                 flight_2_oi_ref.id,
                 self.tested_uss_client.participant_id,
-                "Validate flight 2 GET interaction",
+                "Validate flight2 GET interaction, if no notification",
             )
-        else:
-            msg = (
-                f"Tested_uss was notified of flight2, due to an existing subscription. Hence, not checking for the GET requests."
-                f"With a notification already sent, if a GET request is made, it would be unclear if tested_uss used the information from notification or GET request for planning."
-                f"As this test is for checking GET requests validation, we cannot continue the test."
-                f"See documentation of test step - Check for notification to tested_uss due to subscription in flight 2 area"
-            )
-            raise ScenarioCannotContinueError(msg)
 
         expect_no_interuss_post_interactions(
             self,

diff --git a/...cenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py b/...cenarios/astm/utm/data_exchange_validation/test_steps/expected_interactions_test_steps.py
@@ -128,7 +128,9 @@ def expect_get_requests_to_mock_uss(
             get_requested = True
             break
     if not get_requested:
-        with scenario.check("Expect GET request", [participant_id]) as check:
+        with scenario.check(
+            "Expect GET request when no notification", [participant_id]
+        ) as check:
             check.record_failed(
                 summary=f"No GET request received at {mock_uss_base_url} for {id} ",
                 severity=Severity.High,

diff --git a/...astm/utm/data_exchange_validation/test_steps/validate_get_operational_intent.md b/...astm/utm/data_exchange_validation/test_steps/validate_get_operational_intent.md
@@ -5,6 +5,6 @@ This step verifies that a USS makes a GET request to get the intent_details of a
 ## MockUSS interactions request check
 **[interuss.mock_uss.hosted_instance.ExposeInterface](../../../../../requirements/interuss/mock_uss/hosted_instance.md)**.
 
-## Expect GET request check
+## Expect GET request when no notification check
 **[astm.f3548.v21.SCD0035](../../../../../requirements/astm/f3548/v21.md)**
 SCD0035 needs a USS to verify before transitioning to Accepted that it does not conflict with a type of operational intent, and the only way to have verified this is by knowing all operational intent details, and (from previous checks of no notifications) the only way to know the operational intent details of flight is to have requested them via a GET details interaction.