Use ROOT_NODE_ENDPOINT_ID as default instead of None for endpoint parameters

- Simplifies code by removing None checks and makes default behavior more explicit.

Author: j-ororke

src/python_testing/TC_IDM_4_2.py

@@ -41,6 +41,7 @@
 from support_modules.idm_support import IDMBaseTest
 
 import matter.clusters as Clusters
+from matter.testing.matter_asserts import is_valid_uint_value
 from matter.ChipDeviceCtrl import ChipDeviceController
 from matter.clusters import ClusterObjects as ClusterObjects
 from matter.exceptions import ChipStackError
@@ -184,12 +185,12 @@ async def test_TC_IDM_4_2(self):
         )
 
         # Verify subscriptionId is of uint32 type
-        asserts.assert_true(self.is_valid_uint32_value(sub_cr1_step1.subscriptionId), "subscriptionId is not of uint32 type.")
+        asserts.assert_true(is_valid_uint_value(sub_cr1_step1.subscriptionId, 32), "subscriptionId is not of uint32 type.")
 
         # Verify MaxInterval is of uint32 type
         sub_cr1_step1_intervals = sub_cr1_step1.GetReportingIntervalsSeconds()
         sub_cr1_step1_min_interval_floor_sec, sub_cr1_step1_max_interval_ceiling_sec = sub_cr1_step1_intervals
-        asserts.assert_true(self.is_valid_uint32_value(sub_cr1_step1_max_interval_ceiling_sec),
+        asserts.assert_true(is_valid_uint_value(sub_cr1_step1_max_interval_ceiling_sec, 32),
                             "MaxInterval is not of uint32 type.")
 
         # Verify MaxInterval is less than or equal to MaxIntervalCeiling
@@ -227,12 +228,12 @@ async def test_TC_IDM_4_2(self):
         )
 
         # Verify subscriptionId is of uint32 type
-        asserts.assert_true(self.is_valid_uint32_value(sub_cr1_step2.subscriptionId), "subscriptionId is not of uint32 type.")
+        asserts.assert_true(is_valid_uint_value(sub_cr1_step2.subscriptionId, 32), "subscriptionId is not of uint32 type.")
 
         # Verify MaxInterval is of uint32 type
         sub_cr1_step2_intervals = sub_cr1_step2.GetReportingIntervalsSeconds()
         sub_cr1_step2_min_interval_floor_sec, sub_cr1_step2_max_interval_ceiling_sec = sub_cr1_step2_intervals
-        asserts.assert_true(self.is_valid_uint32_value(sub_cr1_step2_max_interval_ceiling_sec),
+        asserts.assert_true(is_valid_uint_value(sub_cr1_step2_max_interval_ceiling_sec, 32),
                             "MaxInterval is not of uint32 type.")
 
         # Verify MaxInterval is less than or equal to MaxIntervalCeiling
@@ -527,7 +528,7 @@ async def test_TC_IDM_4_2(self):
         cluster_revision_attr_value = sub_cr1_step11.GetAttribute(cluster_rev_attr_typed_path)
 
         # Verify ClusterRevision is of uint16 type
-        asserts.assert_true(self.is_valid_uint16_value(cluster_revision_attr_value), "ClusterRevision is not of uint16 type.")
+        asserts.assert_true(is_valid_uint_value(cluster_revision_attr_value, 16), "ClusterRevision is not of uint16 type.")
 
         # Verify valid ClusterRevision value
         asserts.assert_greater_equal(cluster_revision_attr_value, 0, "Invalid ClusterRevision value.")
@@ -570,7 +571,7 @@ async def test_TC_IDM_4_2(self):
         cluster_revision_attr_value = sub_cr1_step12.GetAttribute(cluster_rev_attr_typed_path)
 
         # Verify ClusterRevision is of uint16 type
-        asserts.assert_true(self.is_valid_uint16_value(cluster_revision_attr_value), "ClusterRevision is not of uint16 type.")
+        asserts.assert_true(is_valid_uint_value(cluster_revision_attr_value, 16), "ClusterRevision is not of uint16 type.")
 
         sub_cr1_step12.Shutdown()
 

src/python_testing/support_modules/idm_support.py

@@ -93,42 +93,14 @@ def __init__(self, test_instance):
 
 class IDMBaseTest(MatterBaseTest):
     """Base test class for IDM tests with shared functionality."""
-
+    
     ROOT_NODE_ENDPOINT_ID = 0
-
-    # ========================================================================
-    # Type Validators
-    # ========================================================================
-
-    @staticmethod
-    def is_valid_uint32_value(var):
-        """Check if a value is a valid uint32.
-
-        Args:
-            var: Value to check
-
-        Returns:
-            True if value is a valid uint32, False otherwise
-        """
-        return isinstance(var, int) and 0 <= var <= 0xFFFFFFFF
-
-    @staticmethod
-    def is_valid_uint16_value(var):
-        """Check if a value is a valid uint16.
-
-        Args:
-            var: Value to check
-
-        Returns:
-            True if value is a valid uint16, False otherwise
-        """
-        return isinstance(var, int) and 0 <= var <= 0xFFFF
-
+    
     # ========================================================================
     # Descriptor and Cluster Reading Utilities
     # ========================================================================
 
-    async def get_descriptor_server_list(self, ctrl: ChipDeviceCtrl, ep: int = None):
+    async def get_descriptor_server_list(self, ctrl: ChipDeviceCtrl, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Read ServerList attribute from Descriptor cluster.
 
         Args:
@@ -138,16 +110,14 @@ async def get_descriptor_server_list(self, ctrl: ChipDeviceCtrl, ep: int = None)
         Returns:
             ServerList attribute value
         """
-        if ep is None:
-            ep = self.ROOT_NODE_ENDPOINT_ID
         return await self.read_single_attribute_check_success(
             endpoint=ep,
             dev_ctrl=ctrl,
             cluster=Clusters.Descriptor,
             attribute=Clusters.Descriptor.Attributes.ServerList
         )
 
-    async def get_descriptor_parts_list(self, ctrl: ChipDeviceCtrl, ep: int = None):
+    async def get_descriptor_parts_list(self, ctrl: ChipDeviceCtrl, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Read PartsList attribute from Descriptor cluster.
 
         Args:
@@ -157,16 +127,14 @@ async def get_descriptor_parts_list(self, ctrl: ChipDeviceCtrl, ep: int = None):
         Returns:
             PartsList attribute value
         """
-        if ep is None:
-            ep = self.ROOT_NODE_ENDPOINT_ID
         return await self.read_single_attribute_check_success(
             endpoint=ep,
             dev_ctrl=ctrl,
             cluster=Clusters.Descriptor,
             attribute=Clusters.Descriptor.Attributes.PartsList
         )
 
-    async def get_idle_mode_duration_sec(self, ctrl: ChipDeviceCtrl, ep: int = None):
+    async def get_idle_mode_duration_sec(self, ctrl: ChipDeviceCtrl, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Read IdleModeDuration attribute from ICD Management cluster.
 
         Args:
@@ -176,8 +144,6 @@ async def get_idle_mode_duration_sec(self, ctrl: ChipDeviceCtrl, ep: int = None)
         Returns:
             IdleModeDuration attribute value in seconds
         """
-        if ep is None:
-            ep = self.ROOT_NODE_ENDPOINT_ID
         return await self.read_single_attribute_check_success(
             endpoint=ep,
             dev_ctrl=ctrl,
@@ -189,7 +155,7 @@ async def get_idle_mode_duration_sec(self, ctrl: ChipDeviceCtrl, ep: int = None)
     # ACL Management Functions
     # ========================================================================
 
-    async def get_dut_acl(self, ctrl: ChipDeviceCtrl, ep: int = None):
+    async def get_dut_acl(self, ctrl: ChipDeviceCtrl, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Read the ACL attribute from the DUT.
 
         Args:
@@ -199,8 +165,6 @@ async def get_dut_acl(self, ctrl: ChipDeviceCtrl, ep: int = None):
         Returns:
             ACL list from the DUT
         """
-        if ep is None:
-            ep = self.ROOT_NODE_ENDPOINT_ID
         sub = await ctrl.ReadAttribute(
             nodeid=self.dut_node_id,
             attributes=[(ep, Clusters.AccessControl.Attributes.Acl)],
@@ -210,16 +174,14 @@ async def get_dut_acl(self, ctrl: ChipDeviceCtrl, ep: int = None):
         acl_list = sub[ep][Clusters.AccessControl][Clusters.AccessControl.Attributes.Acl]
         return acl_list
 
-    async def write_dut_acl(self, ctrl: ChipDeviceCtrl, acl, ep: int = None):
+    async def write_dut_acl(self, ctrl: ChipDeviceCtrl, acl, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Write an ACL to the DUT.
 
         Args:
             ctrl: Controller to use for writing
             acl: ACL list to write
             ep: Endpoint to write to (default: ROOT_NODE_ENDPOINT_ID)
         """
-        if ep is None:
-            ep = self.ROOT_NODE_ENDPOINT_ID
         result = await ctrl.WriteAttribute(self.dut_node_id, [(ep, Clusters.AccessControl.Attributes.Acl(acl))])
         asserts.assert_equal(result[ep].Status, Status.Success, "ACL write failed")
 
@@ -240,7 +202,7 @@ async def add_ace_to_dut_acl(self, ctrl: ChipDeviceCtrl, ace, dut_acl_original):
     # ========================================================================
 
     @staticmethod
-    def get_typed_attribute_path(attribute, ep: int = None):
+    def get_typed_attribute_path(attribute, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Create a TypedAttributePath from an attribute.
 
         Args:
@@ -250,8 +212,6 @@ def get_typed_attribute_path(attribute, ep: int = None):
         Returns:
             TypedAttributePath object
         """
-        if ep is None:
-            ep = IDMBaseTest.ROOT_NODE_ENDPOINT_ID
         return TypedAttributePath(
             Path=AttributePath.from_attribute(
                 EndpointId=ep,
@@ -264,7 +224,7 @@ def get_typed_attribute_path(attribute, ep: int = None):
     # ========================================================================
 
     @staticmethod
-    def verify_attribute_exists(sub, cluster, attribute, ep: int = None):
+    def verify_attribute_exists(sub, cluster, attribute, ep: int = ROOT_NODE_ENDPOINT_ID):
         """Verify that an attribute exists in a subscription or read response.
 
         Args:
@@ -273,8 +233,6 @@ def verify_attribute_exists(sub, cluster, attribute, ep: int = None):
             attribute: Attribute to check for
             ep: Endpoint to check (default: ROOT_NODE_ENDPOINT_ID)
         """
-        if ep is None:
-            ep = IDMBaseTest.ROOT_NODE_ENDPOINT_ID
         sub_attrs = sub
         if isinstance(sub, Clusters.Attribute.SubscriptionTransaction):
             sub_attrs = sub.GetAttributes()