Address issues in TC-JFDS 2.1, 2.2, 2.3, and 2.4. (project-chip#43604)

Co-authored-by: Robert Farnum <robertfarnum@gmail.com>

Author: vijs

src/python_testing/TC_JFDS_2_1.py

@@ -168,6 +168,9 @@ def steps_TC_JFDS_2_1(self) -> list[TestStep]:
                      "Verify that the Status attribute shows 'Pending' state")
         ]
 
+    def pics_TC_JFDS_2_1(self) -> list[str]:
+        return ["JFDS.S"]
+
     @async_test_body
     async def test_TC_JFDS_2_1(self):
         # Creating a Controller for Ecosystem A
@@ -248,6 +251,7 @@ async def test_TC_JFDS_2_1(self):
                 Clusters.JointFabricDatastore.Enums.DatastoreStateEnum.kPending,
                 Clusters.JointFabricDatastore.Enums.DatastoreStateEnum.kCommitted,
                 Clusters.JointFabricDatastore.Enums.DatastoreStateEnum.kDeletePending,
+                Clusters.JointFabricDatastore.Enums.DatastoreStateEnum.kCommitFailed
             ])
 
         # Shutdown the Python Controllers started at the beginning of this script

src/python_testing/TC_JFDS_2_2.py

@@ -92,6 +92,7 @@ async def setup_class(self):
         #####################################################################################################################################
         self.jfadmin_fabric_a_passcode = random.randint(110220011, 110220999)
         self.jfctrl_fabric_a_vid = random.randint(0x0001, 0xFFF0)
+        self.jfadmin_fabric_a_node_id = 1
 
         # Start Fabric A JF-Administrator App
         self.fabric_a_admin = AppServerSubprocess(
@@ -118,8 +119,8 @@ async def setup_class(self):
 
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
-            message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator (nodeId=1) commissioned with success",
+            message=f"pairing onnetwork {self.jfadmin_fabric_a_node_id} {self.jfadmin_fabric_a_passcode} --anchor true",
+            expected_output=f"[JF] Anchor Administrator (nodeId={self.jfadmin_fabric_a_node_id}) commissioned with success",
             timeout=10)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
@@ -201,6 +202,9 @@ def steps_TC_JFDS_2_2(self) -> list[TestStep]:
                      "Verify that the DUT responds with Status code CONSTRAINT_ERROR."),
         ]
 
+    def pics_TC_JFDS_2_2(self) -> list[str]:
+        return ["JFDS.S"]
+
     @async_test_body
     async def test_TC_JFDS_2_2(self):
         # Creating a Controller for Ecosystem A
@@ -215,11 +219,26 @@ async def test_TC_JFDS_2_2(self):
             paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
             catTags=[int(self.ecoACATs, 16)])
 
+        # Discover endpoint with JointFabricDatastore cluster via Descriptor
+        descriptor_response = await self.devCtrlEcoA.ReadAttribute(
+            nodeId=self.jfadmin_fabric_a_node_id, attributes=[(Clusters.Descriptor)],
+            returnClusterObject=True)
+
+        jfds_endpoint = None
+        for endpoint_id, endpoint_data in descriptor_response.items():
+            if Clusters.JointFabricDatastore.id in endpoint_data[Clusters.Descriptor].serverList:
+                jfds_endpoint = endpoint_id
+                log.info(f"Found JointFabricDatastore cluster on endpoint {jfds_endpoint}")
+                break
+
+        asserts.assert_is_not_none(jfds_endpoint, "JointFabricDatastore cluster not found on any endpoint")
+
         self.step("1")
         response = await self.devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(1, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
+            nodeId=self.jfadmin_fabric_a_node_id, attributes=[
+                (jfds_endpoint, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
             returnClusterObject=True)
-        _groupKeySetList = response[1][Clusters.JointFabricDatastore].groupKeySetList
+        _groupKeySetList = response[jfds_endpoint][Clusters.JointFabricDatastore].groupKeySetList
         step1_groupKeySetListLength = len(_groupKeySetList)
         asserts.assert_greater_equal(step1_groupKeySetListLength, 1, "GroupKeySetList must contain at least one entry!")
         _found = False
@@ -240,13 +259,17 @@ async def test_TC_JFDS_2_2(self):
             epochKey2=b'22222222222222222222222222222222',
             epochStartTime2=2220002)
         cmd = Clusters.JointFabricDatastore.Commands.AddKeySet(step2_groupKeySet)
-        await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+        try:
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
+        except InteractionModelError as e:
+            asserts.fail(f"Unexpected error when adding KeySet: {e}")
 
         self.step("3")
         response = await self.devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(1, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
+            nodeId=self.jfadmin_fabric_a_node_id, attributes=[
+                (jfds_endpoint, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
             returnClusterObject=True)
-        _groupKeySetList = response[1][Clusters.JointFabricDatastore].groupKeySetList
+        _groupKeySetList = response[jfds_endpoint][Clusters.JointFabricDatastore].groupKeySetList
         asserts.assert_greater(len(_groupKeySetList), step1_groupKeySetListLength,
                                "An new entry was not added in groupKeySetList")
         _found = False
@@ -269,7 +292,7 @@ async def test_TC_JFDS_2_2(self):
         cmd = Clusters.JointFabricDatastore.Commands.AddKeySet(step4_groupKeySet)
         # Verify that the DUT responds with Status as CONSTRAINT_ERROR
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected CONSTRAINT_ERROR but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.ConstraintError,
@@ -286,7 +309,10 @@ async def test_TC_JFDS_2_2(self):
             epochKey2=b'99999999999999999999999999999999',
             epochStartTime2=2220003)
         cmd = Clusters.JointFabricDatastore.Commands.UpdateKeySet(step5_groupKeySet)
-        await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+        try:
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
+        except InteractionModelError as e:
+            asserts.fail(f"Unexpected error when updating KeySet: {e}")
 
         self.step("6")
         step6_groupKeySet = Clusters.JointFabricDatastore.Structs.DatastoreGroupKeySetStruct(
@@ -300,17 +326,18 @@ async def test_TC_JFDS_2_2(self):
             epochStartTime2=2220003)
         cmd = Clusters.JointFabricDatastore.Commands.UpdateKeySet(step6_groupKeySet)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected CONSTRAINT_ERROR but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.ConstraintError,
                                  f"Expected CONSTRAINT_ERROR but got {e.status}")
 
         self.step("7")
         response = await self.devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(1, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
+            nodeId=self.jfadmin_fabric_a_node_id, attributes=[
+                (jfds_endpoint, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
             returnClusterObject=True)
-        _groupKeySetList = response[1][Clusters.JointFabricDatastore].groupKeySetList
+        _groupKeySetList = response[jfds_endpoint][Clusters.JointFabricDatastore].groupKeySetList
 
         _found = False
         for _item in _groupKeySetList:
@@ -331,7 +358,7 @@ async def test_TC_JFDS_2_2(self):
             epochStartTime2=2220003)
         cmd = Clusters.JointFabricDatastore.Commands.UpdateKeySet(step8_groupKeySet)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected NOT_FOUND but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.NotFound,
@@ -340,7 +367,7 @@ async def test_TC_JFDS_2_2(self):
         self.step("9")
         cmd = Clusters.JointFabricDatastore.Commands.RemoveKeySet(0x0fff)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected NOT_FOUND but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.NotFound,
@@ -349,21 +376,25 @@ async def test_TC_JFDS_2_2(self):
         self.step("10")
         cmd = Clusters.JointFabricDatastore.Commands.RemoveKeySet(0x0000)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected CONSTRAINT_ERROR but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.ConstraintError,
                                  f"Expected CONSTRAINT_ERROR but got {e.status}")
 
         self.step("11")
         cmd = Clusters.JointFabricDatastore.Commands.RemoveKeySet(0x000a)
-        await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+        try:
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
+        except InteractionModelError as e:
+            asserts.fail(f"Unexpected error when removing KeySet: {e}")
 
         self.step("12")
         response = await self.devCtrlEcoA.ReadAttribute(
-            nodeId=1, attributes=[(1, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
+            nodeId=self.jfadmin_fabric_a_node_id, attributes=[
+                (jfds_endpoint, Clusters.JointFabricDatastore.Attributes.GroupKeySetList)],
             returnClusterObject=True)
-        _groupKeySetList = response[1][Clusters.JointFabricDatastore].groupKeySetList
+        _groupKeySetList = response[jfds_endpoint][Clusters.JointFabricDatastore].groupKeySetList
         _found = False
         for _item in _groupKeySetList:
             if _item.groupKeySetID == 0x000a:
@@ -383,7 +414,7 @@ async def test_TC_JFDS_2_2(self):
             epochStartTime2=2220002)
         cmd = Clusters.JointFabricDatastore.Commands.AddKeySet(_groupKeySet)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected CONSTRAINT_ERROR but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.ConstraintError,
@@ -392,7 +423,7 @@ async def test_TC_JFDS_2_2(self):
         self.step("14")
         cmd = Clusters.JointFabricDatastore.Commands.RemoveKeySet(0x0000)
         try:
-            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=1, endpoint=1)
+            await self.send_single_cmd(cmd=cmd, dev_ctrl=self.devCtrlEcoA, node_id=self.jfadmin_fabric_a_node_id, endpoint=jfds_endpoint)
             asserts.fail("Expected CONSTRAINT_ERROR but command succeeded")
         except InteractionModelError as e:
             asserts.assert_equal(e.status, Status.ConstraintError,