diff --git a/.basedpyright/baseline.json b/.basedpyright/baseline.json index 5ab6c07abc..a1ea37ecff 100644 --- a/.basedpyright/baseline.json +++ b/.basedpyright/baseline.json @@ -5797,22 +5797,6 @@ "lineCount": 1 } }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 49, - "endColumn": 67, - "lineCount": 1 - } - }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 221, - "endColumn": 239, - "lineCount": 1 - } - }, { "code": "reportOperatorIssue", "range": { @@ -6125,22 +6109,6 @@ "lineCount": 1 } }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 49, - "endColumn": 67, - "lineCount": 1 - } - }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 221, - "endColumn": 239, - "lineCount": 1 - } - }, { "code": "reportOperatorIssue", "range": { @@ -6363,14 +6331,6 @@ "lineCount": 1 } }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 53, - "endColumn": 71, - "lineCount": 1 - } - }, { "code": "reportArgumentType", "range": { @@ -16965,14 +16925,6 @@ "lineCount": 1 } }, - { - "code": "reportOptionalMemberAccess", - "range": { - "startColumn": 47, - "endColumn": 65, - "lineCount": 1 - } - }, { "code": "reportArgumentType", "range": { diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py index 4aed362da0..0f07987b3c 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/isa_subscription_interactions.py @@ -144,17 +144,6 @@ def _new_subscription_in_isa_step(self): ], ) - with self.check( - "Newly created subscription has a notification_index of 0", - [self._dss.participant_id], - ) as check: - if created_subscription.subscription.notification_index != 0: - check.record_failed( - summary="Subscription notification_index is not 0", - 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], - ) - # Modify the ISA with self.check( "Mutate the ISA", @@ -365,17 +354,6 @@ def _mutate_subscription_towards_isa_boundary_step(self): ], ) - with self.check( - "Mutated subscription has a notification_index of 0", - [self._dss.participant_id], - ) as check: - if created_subscription.subscription.notification_index != 0: - check.record_failed( - summary="Subscription notification_index is not 0", - 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], - ) - # Modify the ISA with self.check( "Mutate the ISA", diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py index b8760cabdc..475bcc16a2 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/common/dss/subscription_simple.py @@ -227,21 +227,6 @@ def _create_sub_with_params(self, creation_params: dict[str, Any]): creation_params["sub_id"], newly_created, creation_params, False ) - # Check that the notification index is 0 for a newly created subscription. - # Should the notification field be missing, we assume it will have defaulted to 0 on the DSS's side. - with self.check( - "Returned notification index is 0 if present", - [self._dss_wrapper.participant_id], - ) as check: - notif_index = newly_created.subscription.notification_index - if notif_index is not None and notif_index != 0: - check.record_failed( - f"Returned notification index was {notif_index} instead of 0", - details="A subscription is expected to have a notification index of 0 when it is created" - f"Parameters used: {creation_params}", - query_timestamps=[newly_created.query.request.timestamp], - ) - # Store the version of the subscription self._current_subscriptions[creation_params["sub_id"]] = ( newly_created.subscription diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md index ba90ffb4d9..eb5eefe695 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/isa_subscription_interactions.md @@ -60,11 +60,6 @@ The DSS should allow the creation of a subscription within the ISA footprint, ot A subscription that is created for a volume that intersects with the previously created ISA should mention the previously created ISA. If not, the serving DSS is in violation of **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)**. -#### ⚠️ Newly created subscription has a notification_index of 0 check - -A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)** - #### 🛑 Mutate the ISA check If the ISA cannot be mutated, **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)** is likely not implemented correctly. @@ -127,11 +122,6 @@ The DSS should allow a valid mutation of a subscription's area, otherwise it is A subscription that is created for a volume that intersects with the previously created ISA should mention the previously created ISA. If not, the serving DSS is in violation of **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)**. -#### ⚠️ Mutated subscription has a notification_index of 0 check - -A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)** - #### 🛑 Mutate the ISA check If the ISA cannot be mutated, **[astm.f3411.v19.DSS0030,a](../../../../../requirements/astm/f3411/v19.md)** is likely not implemented correctly. diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_simple.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_simple.md index 89fbe5c2b1..718b556534 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_simple.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v19/dss/subscription_simple.md @@ -69,11 +69,6 @@ If the returned subscription has no owner set, **[astm.f3411.v19.DSS0030,c](../. If the returned subscription's owner does not correspond to the uss_qualifier, **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)** is not respected. - -#### 🛑 Returned notification index is 0 if present check - -The notification index of a newly created subscription must be 0, otherwise the DSS is in violation of **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)**. - #### 🛑 Returned subscription has an ISA URL check If the returned subscription has no ISA URL defined, **[astm.f3411.v19.DSS0030,c](../../../../../requirements/astm/f3411/v19.md)** is not respected. diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md index eb74e569d2..6a25e5904e 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/isa_subscription_interactions.md @@ -60,11 +60,6 @@ The DSS should allow the creation of a subscription within the ISA footprint, ot A subscription that is created for a volume that intersects with the previously created ISA should mention the previously created ISA. If not, the serving DSS is in violation of **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)**. -#### ⚠️ Newly created subscription has a notification_index of 0 check - -A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)** - #### 🛑 Mutate the ISA check If the ISA cannot be mutated, **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/astm/f3411/v22a.md)** is likely not implemented correctly. @@ -127,11 +122,6 @@ The DSS should allow a valid mutation of a subscription's area, otherwise it is A subscription that is created for a volume that intersects with the previously created ISA should mention the previously created ISA. If not, the serving DSS is in violation of **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)**. -#### ⚠️ Mutated subscription has a notification_index of 0 check - -A newly created subscription is expected to have a notification index of 0, otherwise the DSS implementation under -test does not comply with **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)** - #### 🛑 Mutate the ISA check If the ISA cannot be mutated, **[astm.f3411.v22a.DSS0030,a](../../../../../requirements/astm/f3411/v22a.md)** is likely not implemented correctly. diff --git a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md index b45f79a6ef..a0a84ef936 100644 --- a/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md +++ b/monitoring/uss_qualifier/scenarios/astm/netrid/v22a/dss/subscription_simple.md @@ -69,10 +69,6 @@ If the returned subscription has no owner set, **[astm.f3411.v22a.DSS0030,c](../ If the returned subscription's owner does not correspond to the uss_qualifier, **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)** is not respected. -#### 🛑 Returned notification index is 0 if present check - -The notification index of a newly created subscription must be 0, otherwise the DSS is in violation of **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)**. - #### 🛑 Returned subscription has an ISA URL check If the returned subscription has no ISA URL defined, **[astm.f3411.v22a.DSS0030,c](../../../../../requirements/astm/f3411/v22a.md)** is not respected. diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/create.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/create.md index f88c86c0bb..5196c3fef9 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/create.md +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/crud/create.md @@ -17,5 +17,3 @@ A successful subscription creation query is expected to return a well-defined bo If the content of the response does not correspond to the requested content, the DSS is failing to implement **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**. ## [Validate subscription fields](../validate/correctness.md) - -## [Validate notification index](../validate/zero_index.md) diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/validate/zero_index.md b/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/validate/zero_index.md deleted file mode 100644 index c00218f519..0000000000 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/fragments/sub/validate/zero_index.md +++ /dev/null @@ -1,15 +0,0 @@ -# Validate subscription notification index is equal to 0 test step fragment - -This test step fragment attempts to validate a single subscription's notification index returned by the DSS after the creation -of a subscription. - -The index may change for reasons outside of `uss_qualifier`'s control or awareness, therefore the only thing we can reliably verify with regard to the notification index is that: - - it should be there - - on creation of the entity it should be 0 - - after creation, it should be 0 or greater - -The code for these checks lives in the [subscription_validator.py](../../../validators/subscription_validator.py) class. - -## ⚠️ New subscription has a notification index of 0 check - -The notification index of a newly created subscription must be 0, otherwise the DSS is in violation of **[astm.f3548.v21.DSS0005,5](../../../../../../../requirements/astm/f3548/v21.md)**. diff --git a/monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/subscription_validator.py b/monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/subscription_validator.py index 2cbe166bbf..8be52e7f4f 100644 --- a/monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/subscription_validator.py +++ b/monitoring/uss_qualifier/scenarios/astm/utm/dss/validators/subscription_validator.py @@ -317,21 +317,6 @@ def validate_created_subscription( expected_version=None, ) - # Check that the notification index is 0 for a newly created subscription. - # Should the notification field be missing, we assume it will have defaulted to 0 on the DSS's side. - with self._scenario.check( - "New subscription has a notification index of 0", self._pid - ) as check: - notif_index = new_sub.subscription.notification_index - if notif_index != 0: - self._fail_sub_check( - check, - summary=f"Returned notification index was {notif_index} instead of 0", - details="A subscription is expected to have a notification index of 0 when it is created" - f"Parameters used: {self._sub_params}", - t_dss=t_dss, - ) - def _check_notif_index_equal_or_above_0( self, notif_index: int, t_dss: datetime ) -> None: