TC-ACE_1.5: Add

src/python_testing/TC_ACE_1_5.py

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2023 Project CHIP Authors
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,17 +28,6 @@
 
 class TC_ACE_1_5(MatterBaseTest):
 
-    def OpenCommissioningWindow(self) -> CommissioningParameters:
-        try:
-            params = self.th1.OpenCommissioningWindow(
-                nodeid=self.dut_node_id, timeout=600, iteration=10000, discriminator=self.matter_test_config.discriminators[0], option=1)
-            time.sleep(5)
-            return params
-
-        except Exception as e:
-            logging.exception('Error running OpenCommissioningWindow %s', e)
-            asserts.assert_true(False, 'Failed to open commissioning window')
-
     async def read_currentfabricindex_expected_success(self, th) -> int:
         cluster = Clusters.Objects.OperationalCredentials
         attribute = Clusters.OperationalCredentials.Attributes.CurrentFabricIndex
@@ -79,9 +68,6 @@ async def test_TC_ACE_1_5(self):
         self.print_step(1, "Comissioning, already done ")
         self.th1 = self.default_controller
 
-        self.print_step(2, "TH1 opens the commissioning window on the DUT")
-        params = self.OpenCommissioningWindow()
-
         new_certificate_authority = self.certificate_authority_manager.NewCertificateAuthority()
         new_fabric_admin = new_certificate_authority.NewFabricAdmin(vendorId=0xFFF1, fabricId=self.matter_test_config.fabric_id + 1)
 
@@ -91,6 +77,9 @@ async def test_TC_ACE_1_5(self):
         self.th2 = new_fabric_admin.NewController(nodeId=TH2_nodeid,
                                                   paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path))
 
+        params = self.openCommissioningWindow(self.th1, TH1_nodeid, self.matter_test_config.discriminators[0])
+        self.print_step(2, "TH1 opens the commissioning window on the DUT")
+
         errcode = self.th2.CommissionOnNetwork(
             nodeId=self.dut_node_id, setupPinCode=params.setupPinCode,
             filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=self.matter_test_config.discriminators[0])

src/python_testing/matter_testing_support.py

@@ -43,6 +43,7 @@
 from chip import ChipDeviceCtrl  # Needed before chip.FabricAdmin
 import chip.FabricAdmin  # Needed before chip.CertificateAuthority
 import chip.CertificateAuthority
+from chip.ChipDeviceCtrl import CommissioningParameters
 
 # isort: on
 import chip.clusters as Clusters
@@ -707,6 +708,16 @@ def check_pics(self, pics_key: str) -> bool:
         pics_key = pics_key.strip().upper()
         return pics_key in picsd and picsd[pics_key]
 
+    def openCommissioningWindow(self, dev_ctrl: ChipDeviceCtrl, node_id: int, discriminator) -> CommissioningParameters:
+        try:
+            params = dev_ctrl.OpenCommissioningWindow(nodeid=node_id, timeout=900, iteration=1000,
+                                                      discriminator=discriminator, option=1)
+            return params
+
+        except Exception as e:
+            logging.info('Error running open commissioning window %s', e)
+            asserts.fail('Failed to open commissioning window')
+
     async def read_single_attribute(
             self, dev_ctrl: ChipDeviceCtrl, node_id: int, endpoint: int, attribute: object, fabricFiltered: bool = True) -> object:
         result = await dev_ctrl.ReadAttribute(node_id, [(endpoint, attribute)], fabricFiltered=fabricFiltered)