Python testing: Update commissioning window API (project-chip#36669)

* Python testing: Update commissioning window API

- add some defaults to make this easier to use
- change the name to match the other methods in the class

* Fix API for new test

Author: cecille

src/python_testing/TC_ACE_1_5.py

@@ -71,7 +71,7 @@ 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 = await self.openCommissioningWindow(self.th1, self.dut_node_id)
+        params = await self.open_commissioning_window(self.th1, self.dut_node_id)
         self.print_step(2, "TH1 opens the commissioning window on the DUT")
 
         await self.th2.CommissionOnNetwork(

src/python_testing/TC_BRBINFO_4_1.py

@@ -189,7 +189,7 @@ async def setup_class(self):
             filter=self.th_icd_server_discriminator)
 
         logging.info("Commissioning of ICD to fabric two (DUT)")
-        params = await self.openCommissioningWindow(dev_ctrl=self.default_controller, node_id=self.icd_nodeid)
+        params = await self.open_commissioning_window(dev_ctrl=self.default_controller, node_id=self.icd_nodeid)
 
         if not self.is_pics_sdk_ci_only:
             self._ask_for_vendor_commissioning_ux_operation(

src/python_testing/TC_CADMIN_1_19.py

@@ -111,7 +111,7 @@ async def test_TC_CADMIN_1_19(self):
             self.current_step_index = 4
 
             self.step("4a")
-            params = await self.openCommissioningWindow(dev_ctrl=self.th1, timeout=self.max_window_duration, node_id=self.dut_node_id)
+            params = await self.open_commissioning_window(dev_ctrl=self.th1, timeout=self.max_window_duration, node_id=self.dut_node_id)
 
             self.step("4b")
             fids_ca_dir[fid] = self.certificate_authority_manager.NewCertificateAuthority()
@@ -128,7 +128,7 @@ async def test_TC_CADMIN_1_19(self):
         asserts.assert_equal(current_fabrics, max_fabrics, "Expected number of fabrics not correct")
 
         self.step(6)
-        params = await self.openCommissioningWindow(dev_ctrl=self.th1, node_id=self.dut_node_id)
+        params = await self.open_commissioning_window(dev_ctrl=self.th1, node_id=self.dut_node_id)
 
         self.step(7)
         # TH creates a controller on a new fabric and attempts to commission DUT_CE using that controller

src/python_testing/TC_CCTRL_2_2.py

@@ -170,7 +170,7 @@ async def test_TC_CCTRL_2_2(self):
             asserts.assert_equal(e.status, Status.Failure, "Incorrect error returned")
 
         self.step(6)
-        params = await self.openCommissioningWindow(dev_ctrl=self.default_controller, node_id=self.dut_node_id)
+        params = await self.open_commissioning_window(dev_ctrl=self.default_controller, node_id=self.dut_node_id)
         self.step(7)
         pase_nodeid = self.dut_node_id + 1
         await self.default_controller.FindOrEstablishPASESession(setupCode=params.commissioningParameters.setupQRCode, nodeid=pase_nodeid)

src/python_testing/TC_OPCREDS_3_4.py

@@ -273,7 +273,7 @@ async def test_TC_OPCREDS_3_4(self):
                              "Failure status returned from arm failsafe")
 
         self.step(22)
-        resp = await self.openCommissioningWindow(self.default_controller, self.dut_node_id)
+        resp = await self.open_commissioning_window()
 
         self.step(23)
         await self.default_controller.FindOrEstablishPASESession(setupCode=resp.commissioningParameters.setupQRCode, nodeid=self.dut_node_id)

src/python_testing/matter_testing_infrastructure/chip/testing/matter_testing.py

@@ -1141,8 +1141,12 @@ def check_pics(self, pics_key: str) -> bool:
     def is_pics_sdk_ci_only(self) -> bool:
         return self.check_pics('PICS_SDK_CI_ONLY')
 
-    async def openCommissioningWindow(self, dev_ctrl: ChipDeviceCtrl, node_id: int, timeout: int = 900) -> CustomCommissioningParameters:
+    async def open_commissioning_window(self, dev_ctrl: Optional[ChipDeviceCtrl] = None, node_id: Optional[int] = None, timeout: int = 900) -> CustomCommissioningParameters:
         rnd_discriminator = random.randint(0, 4095)
+        if dev_ctrl is None:
+            dev_ctrl = self.default_controller
+        if node_id is None:
+            node_id = self.dut_node_id
         try:
             commissioning_params = await dev_ctrl.OpenCommissioningWindow(nodeid=node_id, timeout=timeout, iteration=1000,
                                                                           discriminator=rnd_discriminator, option=1)
@@ -1166,7 +1170,6 @@ async def read_single_attribute_check_success(
         if node_id is None:
             node_id = self.dut_node_id
         if endpoint is None:
-            #endpoint = 0 if self.matter_test_config.endpoint is None else self.matter_test_config.endpoint
             endpoint = self.get_endpoint()
 
         result = await dev_ctrl.ReadAttribute(node_id, [(endpoint, attribute)], fabricFiltered=fabric_filtered)
@@ -1199,7 +1202,6 @@ async def read_single_attribute_expect_error(
         if node_id is None:
             node_id = self.dut_node_id
         if endpoint is None:
-            #endpoint = 0 if self.matter_test_config.endpoint is None else self.matter_test_config.endpoint
             endpoint = self.get_endpoint()
 
         result = await dev_ctrl.ReadAttribute(node_id, [(endpoint, attribute)], fabricFiltered=fabric_filtered)
@@ -1248,7 +1250,6 @@ async def send_single_cmd(
         if node_id is None:
             node_id = self.dut_node_id
         if endpoint is None:
-            #endpoint = 0 if self.matter_test_config.endpoint is None else self.matter_test_config.endpoint
             endpoint = self.get_endpoint()
 
         result = await dev_ctrl.SendCommand(nodeid=node_id, endpoint=endpoint, payload=cmd, timedRequestTimeoutMs=timedRequestTimeoutMs,
@@ -1842,7 +1843,6 @@ def convert_args_to_matter_config(args: argparse.Namespace) -> MatterTestConfig:
     config.pics = {} if args.PICS is None else read_pics_from_file(args.PICS)
     config.tests = [] if args.tests is None else args.tests
     config.timeout = args.timeout  # This can be none, we pull the default from the test if it's unspecified
-    #config.endpoint = args.endpoint
     config.endpoint = args.endpoint  # This can be None, the get_endpoint function allows the tests to supply a default
     config.app_pid = 0 if args.app_pid is None else args.app_pid