[uss_qualifier] Fix notification index checks

.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": {

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",

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

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.

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.

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.

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.

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)

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: