Fix RR-1.1 python test case, enable group testing

* align the step number logs * enable groups acl beofre groups testing * align ACL targets parameters to values provided in test plan Signed-off-by: Michał Szablowski <michal.szablowski@nordicsemi.no>
project-chip · Mar 27, 2023 · 6b69445 · 6b69445
1 parent ec2ad41
commit 6b69445
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/python_testing/TC_RR_1_1.py b/src/python_testing/TC_RR_1_1.py
@@ -256,7 +256,7 @@ async def test_TC_RR_1_1(self):
         asserts.assert_equal(node_label, BEFORE_LABEL, "NodeLabel must match what was written")
 
         # Step 3: Add 4 Access Control entries on DUT with a list of 4 Subjects and 3 Targets with the following parameters (...)
-        self.send_acl(test_step=3, client_by_name=client_by_name, enable_access_to_group_cluster=False, fabric_table=fabric_table)
+        await self.send_acl(test_step=3, client_by_name=client_by_name, enable_access_to_group_cluster=False, fabric_table=fabric_table)
 
         # Step 4 and 5 (the operations cannot be separated): establish all CASE sessions and subscriptions
 
@@ -420,7 +420,7 @@ async def test_TC_RR_1_1(self):
             logging.info("Step 9: Skipped due to no UserLabel cluster instances")
         # Step 10: Reconfig ACL to allow test runner access to Groups clusters on all endpoints.
         logging.info("Step 10: Reconfiguring ACL to allow access to Groups Clusters")
-        self.send_acl(test_step=10, client_by_name=client_by_name, enable_access_to_group_cluster=False, fabric_table=fabric_table)
+        await self.send_acl(test_step=10, client_by_name=client_by_name, enable_access_to_group_cluster=True, fabric_table=fabric_table)
         # Step 11: Count all group cluster instances
         # and ensure MaxGroupsPerFabric >= 4 * counted_groups_clusters.
         logging.info("Step 11: Validating groups support minimums")
@@ -532,7 +532,7 @@ async def fill_and_validate_group_key_sets(self,
             for group_key_cluster_idx in range(1, keys_per_fabric):
                 group_key_list_idx: int = group_key_cluster_idx - 1
 
-                logging.info("Step 12: Setting group key on fabric %d at index '%d'" % (client_idx+1, group_key_cluster_idx))
+                logging.info("Step 13: Setting group key on fabric %d at index '%d'" % (client_idx+1, group_key_cluster_idx))
                 group_keys[client_idx].append(self.build_group_key(client_idx, group_key_cluster_idx, keys_per_fabric))
                 await client.SendCommand(self.dut_node_id, 0, Clusters.GroupKeyManagement.Commands.KeySetWrite(
                     group_keys[client_idx][group_key_list_idx]))
@@ -541,7 +541,7 @@ async def fill_and_validate_group_key_sets(self,
         for client_idx in range(fabrics):
             client: Any = clients[client_idx]
 
-            logging.info("Step 12: Reading back group keys on fabric %d" % (client_idx+1))
+            logging.info("Step 13: Reading back group keys on fabric %d" % (client_idx+1))
             resp = await client.SendCommand(self.dut_node_id, 0,
                                             Clusters.GroupKeyManagement.Commands.KeySetReadAllIndices(),
                                             responseType=Clusters.GroupKeyManagement.Commands.KeySetReadAllIndicesResponse)
@@ -759,14 +759,14 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Administer ACL entry
         admin_subjects = [0xFFFF_FFFD_0001_0001, 0x2000_0000_0000_0001, 0x2000_0000_0000_0002, 0x2000_0000_0000_0003]
 
-        admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC30)
+        admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_FC30)
         if enable_access_to_group_cluster:
             admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0x0000_0004)
 
         admin_targets = [
             Clusters.AccessControl.Structs.Target(endpoint=0),
             admin_target_field_2,
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC31)
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_FC31)
         ]
         admin_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
@@ -779,9 +779,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Manage ACL entry
         manage_subjects = [0x1000_0000_0000_0001, 0x1000_0000_0000_0002, 0x1000_0000_0000_0003, 0x1000_0000_0000_0004]
         manage_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC02, deviceType=0xFFF1_BC22)
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_FC20),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_FC21),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC02, deviceType=0xFFF1_FC22)
         ]
 
         manage_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
@@ -795,9 +795,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Operate ACL entry
         operate_subjects = [0x3000_0000_0000_0001, 0x3000_0000_0000_0002, 0x3000_0000_0000_0003, 0x3000_0000_0000_0004]
         operate_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC40, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC41, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC42, deviceType=0xFFF1_BC42)
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC40, deviceType=0xFFF1_FC20),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC41, deviceType=0xFFF1_FC21),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC02, deviceType=0xFFF1_FC42)
         ]
 
         operate_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
@@ -811,9 +811,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # View ACL entry
         view_subjects = [0x4000_0000_0000_0001, 0x4000_0000_0000_0002, 0x4000_0000_0000_0003, 0x4000_0000_0000_0004]
         view_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC80, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC81, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC82, deviceType=0xFFF1_BC22)
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC80, deviceType=0xFFF1_FC20),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC81, deviceType=0xFFF1_FC21),
+            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC82, deviceType=0xFFF1_FC22)
         ]
 
         view_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(