Skip to content

Commit

Permalink
[uss_qualifier/scenarios/netrid/dss/isa_subscription_interactions] sp…
Browse files Browse the repository at this point in the history
…ecify some check severity in test scenario documentation only (contrib #404) (#884)
  • Loading branch information
the-glu authored Jan 21, 2025
1 parent 883a4f8 commit 8b2401f
Show file tree
Hide file tree
Showing 18 changed files with 86 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ def _new_subscription_in_isa_step(self):
]:
check.record_failed(
summary="Subscription response does not include the freshly created ISA",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to contain the ISA created for this same area. The returned subscription did not mention it.",
query_timestamps=[
created_isa.dss_query.query.request.timestamp,
Expand All @@ -156,7 +155,6 @@ def _new_subscription_in_isa_step(self):
if created_subscription.subscription.notification_index != 0:
check.record_failed(
summary="Subscription notification_index is not 0",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have a notification_index of 0. The returned subscription has a notification_index of {created_subscription.subscription.notification_index}.",
query_timestamps=[created_subscription.query.request.timestamp],
)
Expand Down Expand Up @@ -192,7 +190,6 @@ def _new_subscription_in_isa_step(self):
if created_subscription.subscription.id not in subs_to_mutated_isa.keys():
check.record_failed(
summary="ISA mutation response does not contain expected subscription ID",
severity=Severity.High,
details="Mutating an ISA to which a subscription was made, the DSS failed to return the subscription ID in the response.",
query_timestamps=[
created_isa.dss_query.query.request.timestamp,
Expand All @@ -213,7 +210,6 @@ def _new_subscription_in_isa_step(self):
if sub_to_mutated_isa.notification_index <= 0:
check.record_failed(
summary="Subscription notification_index has not been increased",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have a notification_index of 1 or more. The returned subscription has a notification_index of {subs_to_mutated_isa[created_subscription.subscription.id].notification_index}.",
query_timestamps=[created_subscription.query.request.timestamp],
)
Expand Down Expand Up @@ -247,7 +243,6 @@ def _new_subscription_in_isa_step(self):
if created_subscription.subscription.id not in subs_to_deleted_isa:
check.record_failed(
summary="ISA deletion response does not contain expected subscription ID",
severity=Severity.High,
details="Deleting an ISA to which a subscription was made, the DSS failed to return the subscription ID in the response.",
query_timestamps=[
created_isa.dss_query.query.request.timestamp,
Expand All @@ -270,8 +265,7 @@ def _new_subscription_in_isa_step(self):
if not notification.success:
check.record_failed(
"Could not notify ISA subscriber",
Severity.Medium,
f"Attempting to notify subscriber for ISA {self._isa_id} at {subscriber_url} resulted in {notification.status_code}",
details=f"Attempting to notify subscriber for ISA {self._isa_id} at {subscriber_url} resulted in {notification.status_code}",
query_timestamps=[notification.query.request.timestamp],
)

Expand All @@ -289,7 +283,6 @@ def _new_subscription_in_isa_step(self):
):
check.record_failed(
summary="Subscription notification_index has not been incremented",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have its notification increased after the subscription was deleted."
f"The returned subscription has a notification_index of {subs_after_deletion.notification_index}, whilte the previous notification_index for that subscription was {sub_to_mutated_isa.notification_index}",
query_timestamps=[created_subscription.query.request.timestamp],
Expand Down Expand Up @@ -357,7 +350,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if self._isa_id not in [isa.id for isa in mutated_subscription.isas]:
check.record_failed(
summary="Subscription response does not include the freshly created ISA",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to contain the ISA created for this same area. The returned subscription did not mention it.",
query_timestamps=[
created_isa.dss_query.query.request.timestamp,
Expand All @@ -372,7 +364,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if created_subscription.subscription.notification_index != 0:
check.record_failed(
summary="Subscription notification_index is not 0",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have a notification_index of 0. The returned subscription has a notification_index of {created_subscription.subscription.notification_index}.",
query_timestamps=[created_subscription.query.request.timestamp],
)
Expand Down Expand Up @@ -408,7 +399,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if created_subscription.subscription.id not in subs_to_mutated_isa.keys():
check.record_failed(
summary="ISA mutation response does not contain expected subscription ID",
severity=Severity.High,
details="Mutating an ISA to which a subscription was made and then subsequently moved to the ISA's boundary,"
" the DSS failed to return the subscription ID in the response.",
query_timestamps=[
Expand All @@ -431,7 +421,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if sub_to_mutated_isa.notification_index <= 0:
check.record_failed(
summary="Subscription notification_index has not been increased",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have a notification_index of 1 or more. The returned subscription has a notification_index of {subs_to_mutated_isa[created_subscription.subscription.id].notification_index}.",
query_timestamps=[created_subscription.query.request.timestamp],
)
Expand Down Expand Up @@ -465,7 +454,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if created_subscription.subscription.id not in subs_to_deleted_isa:
check.record_failed(
summary="ISA deletion response does not contain expected subscription ID",
severity=Severity.High,
details="Deleting an ISA to which a subscription was made, the DSS failed to return the subscription ID in the response.",
query_timestamps=[
created_isa.dss_query.query.request.timestamp,
Expand All @@ -486,8 +474,7 @@ def _mutate_subscription_towards_isa_boundary_step(self):
if not notification.success:
check.record_failed(
"Could not notify ISA subscriber",
Severity.Medium,
f"Attempting to notify subscriber for ISA {self._isa_id} at {subscriber_url} resulted in {notification.status_code}",
details=f"Attempting to notify subscriber for ISA {self._isa_id} at {subscriber_url} resulted in {notification.status_code}",
query_timestamps=[notification.query.request.timestamp],
)

Expand All @@ -505,7 +492,6 @@ def _mutate_subscription_towards_isa_boundary_step(self):
):
check.record_failed(
summary="Subscription notification_index has not been incremented",
severity=Severity.High,
details=f"The subscription created for the area {self._isa_area} is expected to have its notification increased after the subscription was deleted."
f"The returned subscription has a notification_index of {subs_after_deletion.notification_index}, whilte the previous notification_index for that subscription was {sub_to_mutated_isa.notification_index}",
query_timestamps=[created_subscription.query.request.timestamp],
Expand Down
2 changes: 0 additions & 2 deletions monitoring/uss_qualifier/scenarios/astm/netrid/dss_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ def put_isa_expect_response_code(
q=mutated_isa.dss_query,
fail_msg="ISA Put succeeded when expecting a failure",
required_status_code=expected_error_codes,
severity=Severity.High,
fail_details=f"The submitted query was expected to fail. Payload: {mutated_isa.dss_query.query.request.json}",
)
return mutated_isa
Expand Down Expand Up @@ -890,7 +889,6 @@ def del_sub(
if sub_version != del_sub.subscription.version:
check.record_failed(
summary=f"Deleted subscription did not match",
severity=Severity.High,
details=f"DSS reported deletion of version {sub_version} while expecting {del_sub.subscription.version}",
query_timestamps=[del_sub.query.request.timestamp],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ This step issues a search for active ISAs in the area of the previously deleted

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISAs not returned by search check
#### ⚠️ ISAs not returned by search check

The ISA search area parameter cover the resource ISA, but it has been previously deleted, as such the ISA should not be returned by the search. If it is returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This test case creates an ISA with a short lifetime and verifies that it is not

### ISA Expiry test step

#### Create short-lived ISA check
#### 🛑 Create short-lived ISA check

Not allowing an ISA to be created violates **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ This step attempts an ISA search at the DSS with the area of the ISA resource an

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA returned by search check
#### ⚠️ ISA returned by search check

The ISA search parameters cover the resource ISA, as such the resource ISA that exists at the DSS should be returned by the search. If it is not returned, this check will fail.

Expand All @@ -98,7 +98,7 @@ This step attempts an ISA search at the DSS with the area of the ISA resource an

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA not returned by search check
#### ⚠️ ISA not returned by search check

The ISA search are parameter cover the resource ISA but the earliest time does not, as such the resource ISA that exists at the DSS should not be returned by the search. If it is returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand All @@ -110,7 +110,7 @@ This step attempts an ISA search at the DSS with the area of the ISA resource an

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA returned by search check
#### ⚠️ ISA returned by search check

The ISA search parameters cover the resource ISA, as such the resource ISA that exists at the DSS should be returned by the search. If it is not returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand All @@ -122,7 +122,7 @@ This step attempts an ISA search at the DSS with the area of the ISA resource an

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA not returned by search check
#### ⚠️ ISA not returned by search check

The ISA search are parameter cover the resource ISA but the latest time does not, as such the resource ISA that exists at the DSS should not be returned by the search. If it is returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand All @@ -134,7 +134,7 @@ This step attempts an ISA search at the DSS with only the area of the ISA resour

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA returned by search check
#### ⚠️ ISA returned by search check

The ISA search parameters cover the resource ISA, as such the resource ISA that exists at the DSS should be returned by the search. If it is not returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand Down Expand Up @@ -204,7 +204,7 @@ This step attempts an ISA search at the DSS with only the area of the ISA resour

The ISA search parameters are valid, as such the search should be successful. If the request is not successful, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

#### 🛑 ISA not returned by search check
#### ⚠️ ISA not returned by search check

The ISA search are parameter cover the resource ISA, but it has been previously deleted, as such the ISA should not be returned by the search. If it is returned, this check will fail as per **[interuss.f3411.dss_endpoints.SearchISAs](../../../../../requirements/interuss/f3411/dss_endpoints.md)**.

Expand Down
Loading

0 comments on commit 8b2401f

Please sign in to comment.