Merge branch 'master' into Use_RootEndpoint_in_CNET_1_4

project-chip · Aug 14, 2024 · 9110527 · 9110527
2 parents 83c5bd9 + 0ea43c9
commit 9110527
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py
@@ -276,6 +276,7 @@ def validate_args(args):
     check_int_range(args.product_id, 0x0000, 0xFFFF, 'Product id')
     check_int_range(args.vendor_id, 0x0000, 0xFFFF, 'Vendor id')
     check_int_range(args.hw_ver, 0x0000, 0xFFFF, 'Hardware version')
+    check_int_range(args.discovery_mode, 0b000, 0b111, 'Discovery-Mode')
 
     check_str_range(args.serial_num, 1, 32, 'Serial number')
     check_str_range(args.vendor_name, 1, 32, 'Vendor name')
@@ -566,9 +567,10 @@ def any_base_int(s): return int(s, 0)
     parser.add_argument('-cf', '--commissioning-flow', type=any_base_int, default=0,
                         help='Device commissioning flow, 0:Standard, 1:User-Intent, 2:Custom. \
                                           Default is 0.', choices=[0, 1, 2])
-    parser.add_argument('-dm', '--discovery-mode', type=any_base_int, default=1,
-                        help='Commissionable device discovery networking technology. \
-                                         0:WiFi-SoftAP, 1:BLE, 2:On-network. Default is BLE.', choices=[0, 1, 2])
+    parser.add_argument('-dm', '--discovery-mode', type=any_base_int, default=2,
+                        help='3-bit bitmap representing discovery modes for commissionable device discovery \
+                                         Bit 0:WiFi-SoftAP, Bit 1:BLE, Bit 2:On-network. Default is BLE. Specify values between 0-7')
+
     parser.set_defaults(generate_bin=True)
 
     return parser.parse_args()

diff --git a/src/python_testing/TC_CCTRL_2_2.py b/src/python_testing/TC_CCTRL_2_2.py
@@ -182,7 +182,7 @@ async def test_TC_CCTRL_2_2(self):
 
         self.step(12)
         if not self.is_ci:
-            self.wait_for_use_input("Approve Commissioning approval request using manufacturer specified mechanism")
+            self.wait_for_user_input("Approve Commissioning approval request using manufacturer specified mechanism")
 
         self.step(13)
         if not events:
@@ -257,7 +257,7 @@ async def test_TC_CCTRL_2_2(self):
 
         self.step(23)
         if not self.is_ci:
-            self.wait_for_use_input("Approve Commissioning approval request using manufacturer specified mechanism")
+            self.wait_for_user_input("Approve Commissioning approval request using manufacturer specified mechanism")
 
         self.step(24)
         events = new_event

diff --git a/src/python_testing/TC_MCORE_FS_1_1.py b/src/python_testing/TC_MCORE_FS_1_1.py
@@ -37,7 +37,7 @@ class TC_MCORE_FS_1_1(MatterBaseTest):
     async def setup_class(self):
         super().setup_class()
         # TODO: confirm whether we can open processes like this on the TH
-        app = self.matter_test_config.user_params.get("th_server_app_path", None)
+        app = self.user_params.get("th_server_app_path", None)
         if not app:
             asserts.fail('This test requires a TH_SERVER app. Specify app path with --string-arg th_server_app_path:<path_to_app>')
 
@@ -102,7 +102,7 @@ async def test_TC_MCORE_FS_1_1(self):
         await self.send_single_cmd(cmd, endpoint=dut_commissioning_control_endpoint)
 
         if not self.is_ci:
-            self.wait_for_use_input("Approve Commissioning approval request on DUT using manufacturer specified mechanism")
+            self.wait_for_user_input("Approve Commissioning approval request on DUT using manufacturer specified mechanism")
 
         if not events:
             new_event = await self.default_controller.ReadEvent(nodeid=self.dut_node_id, events=event_path)

diff --git a/src/python_testing/TC_MCORE_FS_1_2.py b/src/python_testing/TC_MCORE_FS_1_2.py
@@ -118,7 +118,7 @@ async def test_TC_MCORE_FS_1_2(self):
 
         self.step(4)
         if not self.is_ci:
-            self.wait_for_use_input(
+            self.wait_for_user_input(
                 "Commission TH_SED_DUT onto DUT_FSA’s fabric using the manufacturer specified mechanism. (ensure Synchronization is enabled.)")
         else:
             logging.info("Stopping after step 3 while running in CI to avoid manual steps.")