Skip to content

Commit 9d22e0f

Browse files
authored
[uss_qualifier/scenarios/utm/conflict_equal_priority_not_permitted] Allow USS to return 'NotSupported' upon Flight 1m modification (#1271)
1 parent 5e37957 commit 9d22e0f

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,13 @@ rejection of the modification does not constitute a violation of a requirement.
251251
not result in a failure per **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../../requirements/interuss/automated_testing/flight_planning.md)**.
252252
Nor should Flight 1 have been removed, because doing so would leave an aircraft in flight without any flight plan.
253253

254-
#### 🛑 Successful modification or rejection check
255-
All flight intent data provided is correct and the USS should have either successfully modified the flight or rejected
256-
properly the modification per **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../../requirements/interuss/automated_testing/flight_planning.md)**.
257-
If the USS indicates that the injection attempt failed, this check will fail.
254+
#### 🛑 Successful flight intent handling check
255+
All flight intent data provided is correct and the USS should have either:
256+
- successfully modified the flight; or
257+
- properly rejected the modification; or
258+
- indicated that it does not support modification
259+
per **[interuss.automated_testing.flight_planning.ExpectedBehavior](../../../../../requirements/interuss/automated_testing/flight_planning.md)**.
260+
In any other case, this check will fail.
258261

259262
#### 🛑 Failure check
260263
All flight intent data provided was complete and correct. It should have been processed successfully, allowing the USS

monitoring/uss_qualifier/scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,11 @@ def _modify_activated_flight_preexisting_conflict(
494494
) as validator:
495495
resp_flight_1, _ = submit_flight(
496496
scenario=self,
497-
success_check="Successful modification or rejection",
497+
success_check="Successful flight intent handling",
498498
expected_results={
499499
(PlanningActivityResult.Completed, FlightPlanStatus.OkToFly),
500500
(PlanningActivityResult.Rejected, FlightPlanStatus.OkToFly),
501+
(PlanningActivityResult.NotSupported, FlightPlanStatus.OkToFly),
501502
},
502503
failed_checks={PlanningActivityResult.Failed: "Failure"},
503504
flight_planner=self.tested_uss,
@@ -507,7 +508,10 @@ def _modify_activated_flight_preexisting_conflict(
507508

508509
if resp_flight_1.activity_result == PlanningActivityResult.Completed:
509510
validator.expect_shared(flight1m_activated)
510-
elif resp_flight_1.activity_result == PlanningActivityResult.Rejected:
511+
elif resp_flight_1.activity_result in {
512+
PlanningActivityResult.Rejected,
513+
PlanningActivityResult.NotSupported,
514+
}:
511515
validator.expect_not_shared()
512516
self.end_test_step()
513517

0 commit comments

Comments
 (0)