Skip to content

Commit

Permalink
[uss_qualifier] split references to DSS0005 into the sub-sections of …
Browse files Browse the repository at this point in the history
…that requirement
  • Loading branch information
Shastick committed Dec 22, 2023
1 parent 51ef122 commit 12d79c8
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 49 deletions.
2 changes: 1 addition & 1 deletion monitoring/uss_qualifier/requirements/astm/f3548/v21.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ For information on these requirements, refer to [the ASTM standard F3548-21](htt

## Discovery and Synchronization Service

* <tt>DSS0005</tt>
* DSS0005
* <tt>DSS0005,1</tt>
* <tt>DSS0005,2</tt>
* <tt>DSS0005,3</tt>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ This step verifies that a created flight is shared properly per ASTM F3548-21 by

## 🛑 DSS responses check

**[astm.f3548.v21.DSS0005](../../../../../requirements/astm/f3548/v21.md)**
If the DSS fails to properly respond to a valid search query for operational intents in an area,
it is in violation of **[astm.f3548.v21.DSS0005,2](../../../../../requirements/astm/f3548/v21.md)**, and this check will fail.

## 🛑 Operational intent shared correctly check

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ The flight intent should be successfully transition to Ended state by the flight
### Validate flight intent is non-discoverable test step

#### DSS responses check
**[astm.f3548.v21.DSS0005](../../../../requirements/astm/f3548/v21.md)**

If the DSS fails to reply to a query concerning operational intent references in a given area,
it is in violation of **[astm.f3548.v21.DSS0005,2](../../../../requirements/astm/f3548/v21.md)**, and this check will fail.

#### Operational intent not shared check
If the operational intent is still discoverable after it was transitioned to Ended,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FlightPlannerResource that is under test and will manage Flight 1.
### dss
DSSInstanceResource that provides access to a DSS instance where:
- flight creation/sharing can be verified,
- the USS qualifier acting as a virtual USS can create operational intents, and
- the USS qualifier acting as a virtual USS can create operational intent references, and
- the USS qualifier can act as an availability arbitrator.

## Setup test case
Expand All @@ -44,11 +44,10 @@ Make a dummy request to the DSS in order to resolve the USS ID of the virtual US
### [Restore virtual USS availability test step](../set_uss_available.md)

### Clear operational intents created by virtual USS test step
Delete any leftover operational intents created at DSS by virtual USS.
Delete any leftover operational intent references 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)**.

If the search for operational intent references or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005,2](../../../../requirements/astm/f3548/v21.md)** or **[astm.f3548.v21.DSS0005,1](../../../../requirements/astm/f3548/v21.md)**, respectively.

## 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)**.
Expand Down Expand Up @@ -110,4 +109,4 @@ Delete flights injected at USS through the flight planning interface.

### Successful operational intents cleanup check
Delete 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)**.
If the search for own operational intent references or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005,2](../../../../requirements/astm/f3548/v21.md)** or **[astm.f3548.v21.DSS0005,1](../../../../requirements/astm/f3548/v21.md)**, respectively.
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def _clear_op_intents(self):
) as check:
if find_query.status_code != 200:
check.record_failed(
summary=f"Failed to query operational intents from DSS in {self._intents_extent} for cleanup",
summary=f"Failed to query operational intent references from DSS in {self._intents_extent} for cleanup",
severity=Severity.High,
details=f"DSS responded code {find_query.status_code}; error message: {find_query.error_message}",
query_timestamps=[find_query.request.timestamp],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Make a dummy request to the DSS in order to resolve the USS ID of the virtual US
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)**.
If the search for operational intent references or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005,2](../../../../requirements/astm/f3548/v21.md)** or **[astm.f3548.v21.DSS0005,1](../../../../requirements/astm/f3548/v21.md)**, respectively.

## 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)**.
Expand Down Expand Up @@ -176,4 +176,4 @@ Delete flights injected at USS through the flight planning interface.

### Successful operational intents cleanup check
Delete 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)**.
If the search for operational intent references or their deletion fail, this check fails per **[astm.f3548.v21.DSS0005,2](../../../../requirements/astm/f3548/v21.md)** or **[astm.f3548.v21.DSS0005,1](../../../../requirements/astm/f3548/v21.md)**, respectively.
4 changes: 3 additions & 1 deletion monitoring/uss_qualifier/scenarios/astm/utm/prep_planners.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ uss_qualifier verifies with the DSS that there are no operational intents remain

#### 🛑 DSS responses check

**[astm.f3548.v21.DSS0005](../../../requirements/astm/f3548/v21.md)**
If the DSS fails to reply to a query concerning operational intent references in a given area, or fails to allow the deletion of
an operational intent from its own creator, it is in violation of **[astm.f3548.v21.DSS0005,1](../../../requirements/astm/f3548/v21.md)**
or **[astm.f3548.v21.DSS0005,2](../../../requirements/astm/f3548/v21.md)**, and this check will fail.

#### 🛑 Area is clear check

Expand Down
6 changes: 3 additions & 3 deletions monitoring/uss_qualifier/scenarios/astm/utm/test_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def _begin_step(self):
len(oi_ids_delta) > 1
): # TODO: could a USS cut up a submitted flight intent into several op intents?
raise TestRunCannotContinueError(
f"unexpectedly got more than 1 new operational intent after planning request was created (IDs: {oi_ids_delta}): the test scenario might be malformed or some external requests might have interfered"
f"unexpectedly got more than 1 new operational intent reference after planning request was created (IDs: {oi_ids_delta}): the test scenario might be malformed or some external requests might have interfered"
)
if len(oi_ids_delta) == 1:
self._new_oi_ref = self._find_after_oi(oi_ids_delta.pop())
Expand All @@ -118,14 +118,14 @@ def _begin_step(self):
with self._scenario.check("DSS responses", [self._dss.participant_id]) as check:
if self._before_query.status_code != 200:
check.record_failed(
summary="Failed to query DSS for operational intents before planning request",
summary="Failed to query DSS for operational intent references before planning request",
severity=Severity.High,
details=f"Received status code {self._before_query.status_code} from the DSS",
query_timestamps=[self._before_query.request.timestamp],
)
if self._after_query.status_code != 200:
check.record_failed(
summary="Failed to query DSS for operational intents after planning request",
summary="Failed to query DSS for operational intent references after planning request",
severity=Severity.High,
details=f"Received status code {self._after_query.status_code} from the DSS",
query_timestamps=[self._after_query.request.timestamp],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ See `OpIntentValidator.expect_not_shared()` in [test_steps.py](test_steps.py).

## 🛑 DSS responses check

**[astm.f3548.v21.DSS0005](../../../requirements/astm/f3548/v21.md)**
If the DSS fails to reply to a query concerning operational intent references in a given area,
it is in violation of **[astm.f3548.v21.DSS0005,2](../../../requirements/astm/f3548/v21.md)**, and this check will fail.

## 🛑 Operational intent not shared check
If there are new operational intent references in the area of the flight intent, this check will fail per
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ This step verifies that a created flight is shared properly per ASTM F3548-21 by

## 🛑 DSS responses check

**[astm.f3548.v21.DSS0005](../../../requirements/astm/f3548/v21.md)**
If the DSS fails to properly respond to a valid search query for operational intents in an area,
it is in violation of **[astm.f3548.v21.DSS0005,2](../../../requirements/astm/f3548/v21.md)**, and this check will fail.

## 🛑 Operational intent shared correctly check

Expand Down
11 changes: 3 additions & 8 deletions monitoring/uss_qualifier/suites/astm/utm/f3548_21.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,15 @@
<th><a href="../../README.md#checked-in">Checked in</a></th>
</tr>
<tr>
<td rowspan="28" 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</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/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</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><br><a href="../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
</tr>
<tr>
<td rowspan="27" 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/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</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>
<td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</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>
</tr>
<tr>
<td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,2</a></td>
<td>Implemented</td>
<td><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a></td>
<td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</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><br><a href="../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
</tr>
<tr>
<td><a href="../../../requirements/astm/f3548/v21.md">DSS0100</a></td>
Expand Down
11 changes: 3 additions & 8 deletions monitoring/uss_qualifier/suites/faa/uft/message_signing.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,15 @@
<th><a href="../../README.md#checked-in">Checked in</a></th>
</tr>
<tr>
<td rowspan="28" 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</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/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</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><br><a href="../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
</tr>
<tr>
<td rowspan="27" 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/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</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>
<td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</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>
</tr>
<tr>
<td><a href="../../../requirements/astm/f3548/v21.md">DSS0005,2</a></td>
<td>Implemented</td>
<td><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a></td>
<td><a href="../../../scenarios/astm/utm/prep_planners.md">ASTM F3548 flight planners preparation</a><br><a href="../../../scenarios/astm/utm/op_intent_ref_access_control.md">ASTM F3548-21 UTM DSS Operational Intent Reference Access Control</a><br><a href="../../../scenarios/astm/utm/data_exchange_validation/get_op_data_validation.md">Data Validation of GET operational intents by USS</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_higher_priority/conflict_higher_priority.md">Nominal planning: conflict with higher priority</a><br><a href="../../../scenarios/astm/utm/nominal_planning/conflict_equal_priority_not_permitted/conflict_equal_priority_not_permitted.md">Nominal planning: not permitted conflict with equal priority</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><br><a href="../../../scenarios/astm/utm/flight_intent_validation/flight_intent_validation.md">Validation of operational intents</a></td>
</tr>
<tr>
<td><a href="../../../requirements/astm/f3548/v21.md">DSS0100</a></td>
Expand Down
Loading

0 comments on commit 12d79c8

Please sign in to comment.