Merge branch 'master' into commodity_tariff_replace_std_collections

Author: dsavitsky-dsr

docs/testing/yaml.md

@@ -271,12 +271,33 @@ the test harness. Note that full-test gating is not currently implemented in the
 local runner or in the CI.
 
 Some test steps need to be gated on values from earlier in the test. In these
-cases, PICS cannot be used. Instead, the runIf: tag can be used. This tag
+cases, PICS cannot be used. Instead, the `runIf` tag can be used. This tag
 requires a boolean value. To convert values to booleans, the TestEqualities
 function can be use. See
 [TestEqualities](https://github.com/project-chip/connectedhomeip/blob/master/src/app/tests/suites/TestEqualities.yaml)
 for an example of how to use this pseudo-cluster.
 
+In addition to the `PICS` and `runIf` tags, there are the `minRevision` and
+`maxRevision` tags which use the step's `cluster`'s `ClusterRevision` attribute
+to determine if a step should be skipped because it only applies to older or
+newer versions. A step will be skipped if the cluster's `ClusterRevision`
+attribute is < `minRevision` (if present), or > `maxRevision` (if present).
+
+Here is an example of only checking for the value of a given attribute if
+`ClusterRevision` >= 3 using `minRevision`.
+
+```yaml
+- label: "Verify the minimum-to-support Max Paths Per Invoke value"
+  command: "readAttribute"
+  attribute: "MaxPathsPerInvoke"
+  minRevision:
+      3 # Attribute was added in revision 3, so this step applies
+      # to revision >= 3.
+  response:
+      constraints:
+          minValue: 1
+```
+
 #### Setting step timeouts
 
 The timeout argument can be used for each individual test step to set the time

docs/testing/yaml_schema.md

@@ -76,3 +76,5 @@ YAML schema
 |  dataVersion |list,int|Y|
 |  busyWaitMs |int||
 |  wait |str||
+|  minRevision |int|Y|
+|  maxRevision |int|Y|

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/GenericChipDeviceListener.kt

@@ -37,6 +37,10 @@ open class GenericChipDeviceListener : ChipDeviceController.CompletionListener {
     // No op
   }
 
+  override fun onCommissioningStageStart(nodeId: Long, stage: String) {
+    // No op
+  }
+
   override fun onNotifyChipConnectionClosed() {
     // No op
   }

examples/chef/tests/dimmablelight_test.py

@@ -47,6 +47,10 @@ async def _read_current_level(self):
         return await self.read_single_attribute_check_success(
             endpoint=self._DIMMABLELIGHT_ENDPOINT, cluster=Clusters.Objects.LevelControl, attribute=Clusters.Objects.LevelControl.Attributes.CurrentLevel)
 
+    async def _read_identify_time(self):
+        return await self.read_single_attribute_check_success(
+            endpoint=self._DIMMABLELIGHT_ENDPOINT, cluster=Clusters.Objects.Identify, attribute=Clusters.Objects.Identify.Attributes.IdentifyTime)
+
     def _read_on_off_pwrpc(self, device):
         result = device.rpcs.chip.rpc.Attributes.Read(
             endpoint=self._DIMMABLELIGHT_ENDPOINT,
@@ -98,8 +102,9 @@ def steps_TC_DIMMABLELIGHT(self):
         return [TestStep(1, "[TC_DIMMABLELIGHT] Commissioning already done.", is_commissioning=True),
                 TestStep(2, "[TC_DIMMABLELIGHT] Test level control."),
                 TestStep(3, "[TC_DIMMABLELIGHT] Test toggle."),
-                TestStep(4, "[TC_DIMMABLELIGHT] Set up PwRPC connection."),
-                TestStep(5, "[TC_DIMMABLELIGHT] Test PwRPC on/off and level control.")]
+                TestStep(4, "[TC_DIMMABLELIGHT] Test identify."),
+                TestStep(5, "[TC_DIMMABLELIGHT] Set up PwRPC connection."),
+                TestStep(6, "[TC_DIMMABLELIGHT] Test PwRPC on/off and level control.")]
 
     @async_test_body
     async def test_TC_DIMMABLELIGHT(self):
@@ -137,6 +142,19 @@ async def test_TC_DIMMABLELIGHT(self):
         asserts.assert_equal(await self._read_on_off(), not before)
 
         self.step(4)
+        asserts.assert_equal(await self._read_identify_time(), 0)
+        await self.send_single_cmd(
+            cmd=Clusters.Objects.Identify.Commands.Identify(
+                identifyTime=5),
+            dev_ctrl=self.default_controller,
+            node_id=self.dut_node_id,
+            endpoint=self._DIMMABLELIGHT_ENDPOINT,
+        )
+        identify_time = await self._read_identify_time()
+        asserts.assert_greater(identify_time, 0)
+        asserts.assert_less_equal(identify_time, 5)
+
+        self.step(5)
         device_connection = create_device_serial_or_socket_connection(
             device="",
             baudrate=self._PW_RPC_BAUD_RATE,
@@ -149,7 +167,7 @@ async def test_TC_DIMMABLELIGHT(self):
             device_tracing=False,
         )
 
-        self.step(5)
+        self.step(6)
         with device_connection as device:
             # Test onOff
             self._write_on_off_pwrpc(device, True)

examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt

@@ -161,7 +161,16 @@ abstract class PairingCommand(
   }
 
   override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: Long) {
-    logger.log(Level.INFO, "onCommissioningStatusUpdate")
+    val stageName = stage ?: "unknown"
+    logger.log(
+      Level.INFO,
+      "Commissioning status update: stage $stageName, nodeId=$nodeId, errorCode=$errorCode"
+    )
+  }
+
+  override fun onCommissioningStageStart(nodeId: Long, stage: String?) {
+    val stageName = stage ?: "unknown"
+    logger.log(Level.INFO, "Commissioning stage $stageName started for nodeId=$nodeId")
   }
 
   override fun onNotifyChipConnectionClosed() {

examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairingCommand.kt

@@ -159,7 +159,16 @@ abstract class PairingCommand(
   }
 
   override fun onCommissioningStatusUpdate(nodeId: Long, stage: String?, errorCode: UInt) {
-    logger.log(Level.INFO, "onCommissioningStatusUpdate")
+    val stageName = stage ?: "unknown"
+    logger.log(
+      Level.INFO,
+      "Commissioning status update: stage $stageName, nodeId=$nodeId, errorCode=$errorCode"
+    )
+  }
+
+  override fun onCommissioningStageStart(nodeId: Long, stage: String?) {
+    val stageName = stage ?: "unknown"
+    logger.log(Level.INFO, "Commissioning stage $stageName started for nodeId=$nodeId")
   }
 
   override fun onNotifyChipConnectionClosed() {

examples/thermostat/nxp/rt/rw61x/BUILD.gn

@@ -89,6 +89,9 @@ rt_sdk("sdk") {
   # Indicate the default path to OpenThreadConfig.h
   include_dirs += [ "${example_platform_dir}/app/project_include/openthread" ]
 
+  # Indicate the default path to WiFiUserConfig.h
+  include_dirs += [ "${example_platform_dir}/app/project_include/WiFi" ]
+
   # For matter with BR feature, increase FreeRTOS heap size and enable TBR cluster
   # Additionally in the context of OTBR support the freeRTOS heap should be big enough to allow to handle a large number of mDNS packets
   if (chip_enable_wifi && chip_enable_openthread) {
@@ -98,6 +101,10 @@ rt_sdk("sdk") {
     ]
   }
 
+  if (chip_enable_wifi) {
+    defines += [ "WIFI_USER_CONFIG_FILE=<WiFiUserConfig.h>" ]
+  }
+
   defines += [
     "CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR=${setup_discriminator}",
   ]