revisit naming of flight intents

interuss · Dec 8, 2023 · a5a602d · a5a602d
1 parent 1fee047
commit a5a602d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 46 deletions.
diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.md
@@ -27,7 +27,7 @@ FlightIntentsResource that provides the following flight intents:
 
 
 ### tested_uss
-FlightPlannerResource that is under test and will manage flight 1.
+FlightPlannerResource that is under test and will manage Flight 1.
 
 ### dss
 DSSInstanceResource that provides access to a DSS instance where:
@@ -50,7 +50,7 @@ Delete any leftover operational intents created at DSS by virtual USS.
 If the search for own operational intents or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005](../../../../requirements/astm/f3548/v21.md)**.
 
 
-## Plan flight in conflict with planned flight managed by down USS test case
+## Plan Flight 1 in conflict with accepted operational intent managed by down USS test case
 This test case aims at testing requirement **[astm.f3548.v21.SCD0005](../../../../requirements/astm/f3548/v21.md)**.
 
 ### Virtual USS creates conflicting operational intent test step
@@ -62,43 +62,43 @@ If the creation of the operational intent reference at the DSS fails, this check
 
 ### [Declare virtual USS as down at DSS test step](../set_uss_down.md)
 
-### Tested USS attempts to plan low-priority flight 1 test step
-The low-priority flight 1 of the tested USS conflicts with the operational intent of the virtual USS.
+### Tested USS attempts to plan low-priority Flight 1 test step
+The low-priority Flight 1 of the tested USS conflicts with the operational intent of the virtual USS.
 However, since:
 - the virtual USS is declared as down at the DSS,
 - it does not respond for operational intent details, and
 - the conflicting operational intent is in the 'Accepted' state,
 The tested USS should evaluate the conflicting operational intent as having the lowest bound priority status, i.e. a priority strictly lower than the lowest priority allowed by the local regulation.
 
 As such, the tested USS may either:
-- Successfully plan flight 1 over the conflicting operational intent, or
-- Decide to be more conservative and reject the planning of flight 1.
+- Successfully plan Flight 1 over the conflicting operational intent, or
+- Decide to be more conservative and reject the planning of Flight 1.
 
 #### Successful planning check
-All flight intent data provided is correct and the USS should have either successfully planned the flight per **[astm.f3548.v21.SCD0005](../../../../requirements/astm/f3548/v21.md)**,
+All flight intent data provided is correct and the USS should have either successfully planned Flight 1 per **[astm.f3548.v21.SCD0005](../../../../requirements/astm/f3548/v21.md)**,
 or rejected properly the planning if it decided to be more conservative with such conflicts.
 If the USS indicates that the injection attempt failed, this check will fail.
 
 Do take note that if the USS rejects the planning, this check will not fail, but the following *Rejected planning check*
 will. Refer to this check for more information.
 
 #### Rejected planning check
-All flight intent data provided is correct and the USS should have either successfully planned the flight or rejected
+All flight intent data provided is correct and the USS should have either successfully planned Flight 1 or rejected
 properly the planning if it decided to be more conservative with such conflicts.
 If the USS rejects the planning, this check will fail with a low severity per **[astm.f3548.v21.SCD0005](../../../../requirements/astm/f3548/v21.md)**.
 This won't actually fail the test but will serve as a warning.
 
 #### Failure check
 All flight intent data provided was complete and correct. It should have been processed successfully, allowing the USS
-to reject or accept the flight. If the USS indicates that the injection attempt failed, this check will fail per
+to reject or accept Flight 1. If the USS indicates that the injection attempt failed, this check will fail per
 **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../requirements/interuss/automated_testing/flight_planning.md)**.
 
-### [Validate low-priority flight 1 status test step](../validate_shared_operational_intent.md)
+### [Validate low-priority Flight 1 status test step](../validate_shared_operational_intent.md)
 This step validates that the response of the USS is consistent with the flight shared, i.e. either it was properly
 planned, or the USS rejected the planning.
 
-If the planning was accepted, flight 1 should have been shared.
-If the planning was rejected, flight 1 should not have been shared, thus should not exist.
+If the planning was accepted, Flight 1 should have been shared.
+If the planning was rejected, Flight 1 should not have been shared, thus should not exist.
 
 ## Cleanup
 ### Availability of virtual USS restored check

diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py b/monitoring/uss_qualifier/scenarios/astm/utm/off_nominal_planning/down_uss.py
@@ -118,7 +118,7 @@ def run(self, context: ExecutionContext):
         self.end_test_case()
 
         self.begin_test_case(
-            "Plan flight in conflict with planned flight managed by down USS"
+            "Plan Flight 1 in conflict with accepted operational intent managed by down USS"
         )
         self._plan_flight_conflict_planned()
         self.end_test_case()
@@ -225,7 +225,7 @@ def _plan_flight_conflict_planned(self):
             self,
             self.tested_uss,
             self.dss,
-            "Validate low-priority flight 1 status",
+            "Validate low-priority Flight 1 status",
             self._intents_extent,
         ) as validator:
             expected_results = {
@@ -248,7 +248,7 @@ def _plan_flight_conflict_planned(self):
 
             resp, flight_id = submit_flight_intent(
                 self,
-                "Tested USS attempts to plan low-priority flight 1",
+                "Tested USS attempts to plan low-priority Flight 1",
                 "Successful planning",
                 expected_results,
                 failed_checks,

diff --git a/...cenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md b/...cenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.md
@@ -28,7 +28,7 @@ FlightIntentsResource that provides the following flight intents:
 
 
 ### tested_uss
-FlightPlannerResource that is under test and will manage flight 2.
+FlightPlannerResource that is under test and will manage Flight 2.
 
 ### dss
 DSSInstanceResource that provides access to a DSS instance where:
@@ -50,7 +50,7 @@ Delete any leftover operational intents created at DSS by virtual USS.
 #### Successful operational intents cleanup check
 If the search for own operational intents or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005](../../../../requirements/astm/f3548/v21.md)**.
 
-## Plan flight in conflict with activated flight managed by down USS test case
+## Plan Flight 2 in conflict with activated operational intent managed by down USS test case
 This test case aims at testing requirement **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 
 ### Virtual USS creates conflicting operational intent test step
@@ -69,32 +69,32 @@ If the activation of the operational intent reference at the DSS fails, this che
 
 ### [Declare virtual USS as down at DSS test step](../set_uss_down.md)
 
-### Tested USS attempts to plan high-priority flight 2 test step
-The high-priority flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
+### Tested USS attempts to plan high-priority Flight 2 test step
+The high-priority Flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
 However, since:
 - the virtual USS is declared as down at the DSS,
 - it does not respond for operational intent details, and
 - the conflicting operational intent is in the 'Activated' state,
 - the local regulation does not allow for equal priority conflicts at the highest priority level,
 The tested USS should evaluate the conflicting operational intent as having the highest priority status allowed by the local regulation.
-As such, the tested USS should reject the planning of flight 2.
+As such, the tested USS should reject the planning of Flight 2.
 
 #### Incorrectly planned check
 All flight intent data provided is correct and the USS should have rejected properly the planning per **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 If the USS indicates that the injection attempt failed, this check will fail.
-If the USS successfully plans the flight or otherwise fails to indicate a conflict, this check will fail.
+If the USS successfully plans Flight 2 or otherwise fails to indicate a conflict, this check will fail.
 
 #### Failure check
 All flight intent data provided was complete and correct. It should have been processed successfully, allowing the USS
-to reject or accept the flight. If the USS indicates that the injection attempt failed, this check will fail per
+to reject or accept Flight 2. If the USS indicates that the injection attempt failed, this check will fail per
 **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../requirements/interuss/automated_testing/flight_planning.md)**.
 
-### [Validate high-priority flight 2 not shared test step](../validate_not_shared_operational_intent.md)
+### [Validate high-priority Flight 2 not shared test step](../validate_not_shared_operational_intent.md)
 
 ### [Restore virtual USS availability at DSS test step](../set_uss_available.md)
 
 
-## Plan flight in conflict with nonconforming flight managed by down USS test case
+## Plan Flight 2 in conflict with nonconforming operational intent managed by down USS test case
 This test case aims at testing requirement **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 
 ### Virtual USS transitions to Nonconforming conflicting operational intent test step
@@ -106,32 +106,32 @@ If the transition of the operational intent reference at the DSS fails, this che
 
 ### [Declare virtual USS as down at DSS test step](../set_uss_down.md)
 
-### Tested USS attempts to plan high-priority flight 2 test step
-The high-priority flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
+### Tested USS attempts to plan high-priority Flight 2 test step
+The high-priority Flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
 However, since:
 - the virtual USS is declared as down at the DSS,
 - it does not respond for operational intent details, and
 - the conflicting operational intent is in the 'Nonconforming' state,
 - the local regulation does not allow for equal priority conflicts at the highest priority level,
 The tested USS should evaluate the conflicting operational intent as having the highest priority status allowed by the local regulation.
-As such, the tested USS should reject the planning of flight 2.
+As such, the tested USS should reject the planning of Flight 2.
 
 #### Incorrectly planned check
 All flight intent data provided is correct and the USS should have rejected properly the planning per **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 If the USS indicates that the injection attempt failed, this check will fail.
-If the USS successfully plans the flight or otherwise fails to indicate a conflict, this check will fail.
+If the USS successfully plans Flight 2 or otherwise fails to indicate a conflict, this check will fail.
 
 #### Failure check
 All flight intent data provided was complete and correct. It should have been processed successfully, allowing the USS
-to reject or accept the flight. If the USS indicates that the injection attempt failed, this check will fail per
+to reject or accept Flight 2. If the USS indicates that the injection attempt failed, this check will fail per
 **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../requirements/interuss/automated_testing/flight_planning.md)**.
 
-### [Validate high-priority flight 2 not shared test step](../validate_not_shared_operational_intent.md)
+### [Validate high-priority Flight 2 not shared test step](../validate_not_shared_operational_intent.md)
 
 ### [Restore virtual USS availability at DSS test step](../set_uss_available.md)
 
 
-## Plan flight in conflict with contingent flight managed by down USS test case
+## Plan Flight 2 in conflict with contingent operational intent managed by down USS test case
 This test case aims at testing requirement **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 
 ### Virtual USS transitions to Contingent conflicting operational intent test step
@@ -143,27 +143,27 @@ If the transition of the operational intent reference at the DSS fails, this che
 
 ### [Declare virtual USS as down at DSS test step](../set_uss_down.md)
 
-### Tested USS attempts to plan high-priority flight 2 test step
-The high-priority flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
+### Tested USS attempts to plan high-priority Flight 2 test step
+The high-priority Flight 2 of the tested USS conflicts with the operational intent of the virtual USS.
 However, since:
 - the virtual USS is declared as down at the DSS,
 - it does not respond for operational intent details, and
 - the conflicting operational intent is in the 'Contingent' state,
 - the local regulation does not allow for equal priority conflicts at the highest priority level,
 The tested USS should evaluate the conflicting operational intent as having the highest priority status allowed by the local regulation.
-As such, the tested USS should reject the planning of flight 2.
+As such, the tested USS should reject the planning of Flight 2.
 
 #### Incorrectly planned check
 All flight intent data provided is correct and the USS should have rejected properly the planning per **[astm.f3548.v21.SCD0010](../../../../requirements/astm/f3548/v21.md)**.
 If the USS indicates that the injection attempt failed, this check will fail.
-If the USS successfully plans the flight or otherwise fails to indicate a conflict, this check will fail.
+If the USS successfully plans Flight 2 or otherwise fails to indicate a conflict, this check will fail.
 
 #### Failure check
 All flight intent data provided was complete and correct. It should have been processed successfully, allowing the USS
-to reject or accept the flight. If the USS indicates that the injection attempt failed, this check will fail per
+to reject or accept Flight 2. If the USS indicates that the injection attempt failed, this check will fail per
 **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../requirements/interuss/automated_testing/flight_planning.md)**.
 
-### [Validate high-priority flight 2 not shared test step](../validate_not_shared_operational_intent.md)
+### [Validate high-priority Flight 2 not shared test step](../validate_not_shared_operational_intent.md)
 
 
 ## Cleanup

diff --git a/...ualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.py b/...ualifier/scenarios/astm/utm/off_nominal_planning/down_uss_equal_priority_not_permitted.py
@@ -58,19 +58,19 @@ def run(self, context: ExecutionContext):
         self.end_test_case()
 
         self.begin_test_case(
-            "Plan flight in conflict with activated flight managed by down USS"
+            "Plan Flight 2 in conflict with activated operational intent managed by down USS"
         )
         oi_ref = self._plan_flight_conflict_activated()
         self.end_test_case()
 
         self.begin_test_case(
-            "Plan flight in conflict with nonconforming flight managed by down USS"
+            "Plan Flight 2 in conflict with nonconforming operational intent managed by down USS"
         )
         oi_ref = self._plan_flight_conflict_nonconforming(oi_ref)
         self.end_test_case()
 
         self.begin_test_case(
-            "Plan flight in conflict with contingent flight managed by down USS"
+            "Plan Flight 2 in conflict with contingent operational intent managed by down USS"
         )
         self._plan_flight_conflict_contingent(oi_ref)
         self.end_test_case()
@@ -99,12 +99,12 @@ def _plan_flight_conflict_activated(self) -> OperationalIntentReference:
             self,
             self.tested_uss,
             self.dss,
-            "Validate high-priority flight 2 not shared",
+            "Validate high-priority Flight 2 not shared",
             self._intents_extent,
         ) as validator:
             submit_flight_intent(
                 self,
-                "Tested USS attempts to plan high-priority flight 2",
+                "Tested USS attempts to plan high-priority Flight 2",
                 "Incorrectly planned",
                 {
                     InjectFlightResponseResult.Rejected,
@@ -147,12 +147,12 @@ def _plan_flight_conflict_nonconforming(
             self,
             self.tested_uss,
             self.dss,
-            "Validate high-priority flight 2 not shared",
+            "Validate high-priority Flight 2 not shared",
             self._intents_extent,
         ) as validator:
             submit_flight_intent(
                 self,
-                "Tested USS attempts to plan high-priority flight 2",
+                "Tested USS attempts to plan high-priority Flight 2",
                 "Incorrectly planned",
                 {
                     InjectFlightResponseResult.Rejected,
@@ -193,12 +193,12 @@ def _plan_flight_conflict_contingent(self, oi_ref: OperationalIntentReference):
             self,
             self.tested_uss,
             self.dss,
-            "Validate high-priority flight 2 not shared",
+            "Validate high-priority Flight 2 not shared",
             self._intents_extent,
         ) as validator:
             submit_flight_intent(
                 self,
-                "Tested USS attempts to plan high-priority flight 2",
+                "Tested USS attempts to plan high-priority Flight 2",
                 "Incorrectly planned",
                 {
                     InjectFlightResponseResult.Rejected,