From 3562023ca5cf249546b1cd9497bbb218feb06a88 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 6 Jun 2023 10:15:31 -0400 Subject: [PATCH] Remove the incorrect GroupKeySetIDs field from the KeySetReadAllIndices command. (#27044) * Remove the incorrect GroupKeySetIDs field from the KeySetReadAllIndices command. This field does not exist in the spec. This is safe to do in terms of compat because the generated command parsing code only parses the fields that are actually present and does not error out if mandatory fields are missing; instead if uses type-default values for them. So commands updated clients send will still be parse-able by servers that had this field in their XML. Fixes part of https://github.com/project-chip/connectedhomeip/issues/25642 For the Darwin codegen, I just special-cased this command in the templates for now, but if we end up with more commands going from having required fields to not having them we can figure out a more automated solution. * Regenerate generated code. * Address review comments. --- .../all-clusters-app.matter | 6 +- .../all-clusters-minimal-app.matter | 6 +- .../bridge-common/bridge-app.matter | 6 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 6 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 6 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 6 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 6 +- .../rootnode_doorlock_aNKYAreMXE.matter | 6 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 6 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 6 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 6 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 6 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 6 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 6 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 6 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 6 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 6 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 6 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 6 +- .../devices/rootnode_pump_a811bb33a0.matter | 6 +- .../rootnode_speaker_RpzeXdimqA.matter | 6 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 6 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 6 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 6 +- .../contact-sensor-app.matter | 6 +- .../light-switch-app.matter | 6 +- .../data_model/lighting-app-thread.matter | 6 +- .../data_model/lighting-app-wifi.matter | 6 +- .../lighting-common/lighting-app.matter | 6 +- .../nxp/zap/lighting-on-off.matter | 6 +- examples/lighting-app/qpg/zap/light.matter | 6 +- .../data_model/lighting-thread-app.matter | 6 +- .../data_model/lighting-wifi-app.matter | 6 +- examples/lock-app/lock-common/lock-app.matter | 6 +- examples/lock-app/nxp/zap/lock-app.matter | 6 +- examples/lock-app/qpg/zap/lock.matter | 6 +- .../ota-provider-app.matter | 6 +- .../ota-requestor-app.matter | 6 +- examples/pump-app/pump-common/pump-app.matter | 6 +- .../pump-controller-app.matter | 6 +- .../temperature-measurement.matter | 6 +- .../thermostat-common/thermostat.matter | 6 +- examples/tv-app/tv-common/tv-app.matter | 6 +- .../tv-casting-common/tv-casting-app.matter | 6 +- examples/window-app/common/window-app.matter | 6 +- .../suites/TestGroupKeyManagementCluster.yaml | 7 +- .../chip/group-key-mgmt-cluster.xml | 1 - .../data_model/controller-clusters.matter | 6 +- .../devicecontroller/ClusterIDMapping.java | 17 -- .../chip/devicecontroller/ChipClusters.java | 10 +- .../devicecontroller/ClusterInfoMapping.java | 5 - .../python/chip/clusters/CHIPClusters.py | 1 - .../python/chip/clusters/Objects.py | 3 - .../Framework/CHIP/MTRBackwardsCompatShims.h | 37 +++ src/darwin/Framework/CHIP/Matter.h | 1 + .../CHIP/templates/MTRBaseClusters-src.zapt | 4 + .../CHIP/templates/MTRBaseClusters.zapt | 13 +- .../CHIP/templates/MTRClusters-src.zapt | 4 + .../Framework/CHIP/templates/MTRClusters.zapt | 13 +- .../templates/MTRCommandPayloadsObjc-src.zapt | 1 + .../CHIP/templates/availability.yaml | 2 +- .../CHIP/zap-generated/MTRBaseClusters.h | 7 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 31 +- .../CHIP/zap-generated/MTRClusters.h | 9 +- .../CHIP/zap-generated/MTRClusters.mm | 37 +-- .../zap-generated/MTRCommandPayloadsObjc.h | 2 - .../zap-generated/MTRCommandPayloadsObjc.mm | 7 +- .../CHIPTests/MTRBackwardsCompatTests.m | 9 + .../Matter.xcodeproj/project.pbxproj | 4 + .../zap-generated/cluster-objects.cpp | 4 - .../zap-generated/cluster-objects.h | 4 - .../zap-generated/cluster/Commands.h | 4 +- .../chip-tool/zap-generated/test/Commands.h | 219 +++++++------- .../zap-generated/cluster/Commands.h | 13 - .../zap-generated/test/Commands.h | 270 ++++++++++-------- 75 files changed, 445 insertions(+), 570 deletions(-) create mode 100644 src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 70cd208733803f..198775a942fd49 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2193,10 +2193,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -2208,7 +2204,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 1c87e6616903ac..beebcc01a95def 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1973,10 +1973,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1988,7 +1984,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index a1c25984b60bd0..6531edb1e75503 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1575,10 +1575,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1590,7 +1586,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The User Label Cluster provides a feature to tag an endpoint with zero or more labels. */ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index f526c493747d58..a458da9d021e37 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1460,10 +1460,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1475,7 +1471,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index c7501f4918d899..ebc9e4e5486f58 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1220,10 +1220,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1235,7 +1231,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** Attributes and commands for controlling the color properties of a color-capable light. */ diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index d470a5cde130a8..72da64cff277aa 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1175,10 +1175,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1190,7 +1186,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 95f4b84ed5f1b2..c8bbadd07fab6d 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1324,10 +1324,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1339,7 +1335,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 58ebcaca2bfb41..7280968fb259fc 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -1175,10 +1175,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1190,7 +1186,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 606cbd11a5b42a..a7d53aaeecd93c 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1324,10 +1324,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1339,7 +1335,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 0a5f051beeece1..0ad9c02d5cc4c2 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -1162,10 +1162,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1177,7 +1173,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index aa627001696a09..3aab05c6ace501 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index ff1a70fca2eb31..0c50e8602406b8 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1318,10 +1318,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1333,7 +1329,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 1ef4c9a5545eca..dbf22aa9b13b97 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 74f121815a4c32..8f11a43bf3ac8e 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 974121b7d80680..174d400db5ea1c 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index a5d37991d05cc8..7bb540870bd8b6 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1324,10 +1324,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1339,7 +1335,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 3919e68e3006df..caffea35361731 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1287,10 +1287,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1302,7 +1298,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index d0ba9395e36931..1502efbb5aac49 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1223,10 +1223,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1238,7 +1234,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 0a976f99f7d2f9..9deb03484943b1 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 28c8ae5439ca9e..391a6975cd2737 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -873,10 +873,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -888,7 +884,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** An interface for configuring and controlling pumps. */ diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 16297b6f19975a..17f82500378cd3 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1318,10 +1318,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1333,7 +1329,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index c7e31186d5cd09..e04574d866f334 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1250,10 +1250,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1265,7 +1261,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index a9e089ad66b5cb..b0462727f5b4fc 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1175,10 +1175,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1190,7 +1186,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index bcfa526daaded5..e4a671aad8c9ad 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1175,10 +1175,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1190,7 +1186,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index d2a9ecf0f7c529..18cdf112410294 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -1386,10 +1386,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1401,7 +1397,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index cfe7df5012de05..eef00caa037cc2 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1748,10 +1748,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1763,7 +1759,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 3ca936ef22c9a6..d96ec9472c60cc 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1493,10 +1493,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1508,7 +1504,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index 1d260e8ac5beb3..9cfe2296c4c6e0 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1403,10 +1403,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1418,7 +1414,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 6a9d6031b72760..90c58081056849 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1752,10 +1752,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1767,7 +1763,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index bf78a3c782a1e9..52db5c7fafafb3 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1319,10 +1319,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1334,7 +1330,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } endpoint 0 { diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 13134267b666aa..4ca38a58c4d353 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1384,10 +1384,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1399,7 +1395,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index 377264bdf7fa0d..e0d5eb6d4ebbc7 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1608,10 +1608,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1623,7 +1619,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index c2c55f33714c75..681175e7df8633 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1498,10 +1498,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1513,7 +1509,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index d70c18016b73f9..f65707d1bf81a7 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1603,10 +1603,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1618,7 +1614,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 4b6463f19462de..1991075fd9bb86 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -938,10 +938,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -953,7 +949,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** An interface to a generic way to secure a door */ diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 867d652414a841..2062ba0e7026a9 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -1218,10 +1218,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1233,7 +1229,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 971284f05776fb..60ce28100ca0b7 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -919,10 +919,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -934,7 +930,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index ce1e45b1b61c63..79eb0c8f93911d 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -1101,10 +1101,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1116,7 +1112,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 842ff2d61f6227..06e12a5b21d32d 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -1177,10 +1177,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1192,7 +1188,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** An interface for configuring and controlling pumps. */ diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 4fc74898b4ffe7..15b6233cc69855 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -1102,10 +1102,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1117,7 +1113,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** An interface for configuring and controlling pumps. */ diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index 6212f51be17d7c..1a2aaab3ae031a 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -970,10 +970,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -985,7 +981,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 85a9cf68c00d34..ea9a2884ff1575 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1590,10 +1590,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1605,7 +1601,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 31b2bce6bd0af5..c60e578a902dfe 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1738,10 +1738,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1753,7 +1749,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 2093e3585f1ca7..a2e66c29348bca 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1293,14 +1293,10 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 06886cf81fd0c1..c745bb37c7def0 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1721,10 +1721,6 @@ server cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadResponse = 2 { GroupKeySetStruct groupKeySet = 0; } @@ -1736,7 +1732,7 @@ server cluster GroupKeyManagement = 63 { fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0; fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1; fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml index 4aedb61d7e28ee..bc1091050d828a 100644 --- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml +++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml @@ -190,13 +190,14 @@ tests: EpochStartTime2: 1110002, } - - label: "KeySet Read All Indicers" - disabled: true + - label: "KeySet Read All Indices" command: "KeySetReadAllIndices" response: values: - name: "GroupKeySetIDs" - value: [0x01a1, 0x01a2] + constraints: + # Note: There's always an IPK keyset with index 0 + contains: [0x01a1, 0x01a2, 0] - label: "Write Group Keys (invalid)" command: "writeAttribute" diff --git a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml index 3b4961ea816505..9c4fe41cd058d9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml @@ -90,7 +90,6 @@ limitations under the License. Return the list of Group Key Sets associated with the accessing fabric - diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 08c29be979c97d..19f577e8471c12 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2608,10 +2608,6 @@ client cluster GroupKeyManagement = 63 { INT16U groupKeySetID = 0; } - request struct KeySetReadAllIndicesRequest { - INT16U groupKeySetIDs[] = 0; - } - response struct KeySetReadAllIndicesResponse = 5 { INT16U groupKeySetIDs[] = 0; } @@ -2623,7 +2619,7 @@ client cluster GroupKeyManagement = 63 { /** Revoke a Root Key from a Group */ fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3; /** Return the list of Group Key Sets associated with the accessing fabric */ - fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4; + fabric command access(invoke: administer) KeySetReadAllIndices(): KeySetReadAllIndicesResponse = 4; } /** The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index daa9eeebbfe3fe..a05150d423efa4 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -5411,23 +5411,6 @@ public static KeySetRemoveCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum KeySetReadAllIndicesCommandField {GroupKeySetIDs(0),; - private final int id; - KeySetReadAllIndicesCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static KeySetReadAllIndicesCommandField value(int id) throws NoSuchFieldError { - for (KeySetReadAllIndicesCommandField field : KeySetReadAllIndicesCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index a128a9c0e5344d..4c97e2f64ea6ae 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -11870,14 +11870,14 @@ public void keySetRemove(DefaultClusterCallback callback } public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback - , ArrayList groupKeySetIDs) { - keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, null); + ) { + keySetReadAllIndices(chipClusterPtr, callback, null); } public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback - , ArrayList groupKeySetIDs + , int timedInvokeTimeoutMs) { - keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, timedInvokeTimeoutMs); + keySetReadAllIndices(chipClusterPtr, callback, timedInvokeTimeoutMs); } private native void keySetWrite(long chipClusterPtr, DefaultClusterCallback Callback , ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet @@ -11889,7 +11889,7 @@ private native void keySetRemove(long chipClusterPtr, DefaultClusterCallback Cal , Integer groupKeySetID , @Nullable Integer timedInvokeTimeoutMs); private native void keySetReadAllIndices(long chipClusterPtr, KeySetReadAllIndicesResponseCallback Callback - , ArrayList groupKeySetIDs + , @Nullable Integer timedInvokeTimeoutMs); public interface KeySetReadResponseCallback { void onSuccess(ChipStructs.GroupKeyManagementClusterGroupKeySetStruct groupKeySet); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 9c9cbf15570875..938f6eecae2db5 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -21894,15 +21894,10 @@ public Map> getCommandMap() { ); groupKeyManagementClusterInteractionInfoMap.put("keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo); Map groupKeyManagementkeySetReadAllIndicesCommandParams = new LinkedHashMap(); - CommandParameterInfo groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo = new CommandParameterInfo("groupKeySetIDs", ArrayList.class, Integer.class); - groupKeyManagementkeySetReadAllIndicesCommandParams.put("groupKeySetIDs",groupKeyManagementkeySetReadAllIndicesgroupKeySetIDsCommandParameterInfo); - InteractionInfo groupKeyManagementkeySetReadAllIndicesInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.GroupKeyManagementCluster) cluster) .keySetReadAllIndices((ChipClusters.GroupKeyManagementCluster.KeySetReadAllIndicesResponseCallback) callback - , (ArrayList) - commandArguments.get("groupKeySetIDs") ); }, diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index de63a3a3c3da15..c2c14aad29bf99 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3814,7 +3814,6 @@ class ChipClusters: "commandId": 0x00000004, "commandName": "KeySetReadAllIndices", "args": { - "groupKeySetIDs": "int", }, }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index bc52cb427765b4..4ceed3686093c9 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -13531,11 +13531,8 @@ class KeySetReadAllIndices(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="groupKeySetIDs", Tag=0, Type=typing.List[uint]), ]) - groupKeySetIDs: 'typing.List[uint]' = field(default_factory=lambda: []) - @dataclass class KeySetReadAllIndicesResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x003F diff --git a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h new file mode 100644 index 00000000000000..fa7ddd4f8f2088 --- /dev/null +++ b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#import + +#import + +/** + * This file defines manual backwards-compat shims of various sorts to handle + * API changes that happened. + */ + +NS_ASSUME_NONNULL_BEGIN + +@interface MTRGroupKeyManagementClusterKeySetReadAllIndicesParams () +/** + * This command used to incorrectly have a groupKeySetIDs field. + */ +@property (nonatomic, copy) NSArray * groupKeySetIDs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("This field has been removed"); + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/Matter.h b/src/darwin/Framework/CHIP/Matter.h index 094494dd20a1bc..a9da6744c08285 100644 --- a/src/darwin/Framework/CHIP/Matter.h +++ b/src/darwin/Framework/CHIP/Matter.h @@ -18,6 +18,7 @@ #import #import +#import #import #import #import diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt index 6ff3a05793ee17..fda7cee26be83a 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt @@ -271,11 +271,15 @@ reportHandler:(void (^)({{asObjectiveCClass type parent.name}} * _Nullable value ]; } {{#unless hasArguments}} +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#unless (and (isStrEqual cluster "GroupKeyManagement") + (isStrEqual command "KeySetReadAllIndices"))}} - (void){{asLowerCamelCase command}}WithCompletionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler { [self {{asLowerCamelCase command}}WithParams:nil completionHandler:completionHandler]; } {{/unless}} +{{/unless}} {{/if}} {{/inline}} {{> commandImpl cluster=(compatClusterNameRemapping parent.name) diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt index 576f811105c94f..8432e20679bc3f 100644 --- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt @@ -35,7 +35,14 @@ NS_ASSUME_NONNULL_BEGIN */ - (void){{asLowerCamelCase name}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField }}_Nullable{{/unless}})params completion:({{>command_completion_type command=.}})completion {{availability cluster command=command minimalRelease="First major API revamp"}}; {{#unless hasArguments}} -- (void){{asLowerCamelCase name}}WithCompletion:({{>command_completion_type command=.}})completion {{availability cluster command=command minimalRelease="First major API revamp"}}; +- (void){{asLowerCamelCase name}}WithCompletion:({{>command_completion_type command=.}})completion +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#if (and (isStrEqual command "KeySetReadAllIndices") + (isStrEqual cluster "GroupKeyManagement"))}} +{{availability cluster command=command minimalRelease="Fall 2023"}}; +{{else}} +{{availability cluster command=command minimalRelease="First major API revamp"}}; +{{/if}} {{/unless}} {{/if}} {{/inline}} @@ -197,9 +204,13 @@ typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitm - (void){{asLowerCamelCase command}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField }}_Nullable{{/unless}})params completionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler {{availability cluster command=command deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use " (asLowerCamelCase name) "WithParams:completion:")}}; {{#unless hasArguments}} +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#unless (and (isStrEqual cluster "GroupKeyManagement") + (isStrEqual command "KeySetReadAllIndices"))}} - (void){{asLowerCamelCase command}}WithCompletionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler {{availability cluster command=command deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use " (asLowerCamelCase name) "WithCompletion:")}}; {{/unless}} +{{/unless}} {{/if}} {{/inline}} {{> commandDecl cluster=(compatClusterNameRemapping parent.name) diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt index 11ba013f232f8b..169be4edc3b1c0 100644 --- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt @@ -261,11 +261,15 @@ MTRCommandIDTypeCluster{{cluster}}Command{{command}}ID ]; } {{#unless hasArguments}} +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#unless (and (isStrEqual cluster "GroupKeyManagement") + (isStrEqual command "KeySetReadAllIndices"))}} - (void){{asLowerCamelCase command}}WithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler { [self {{asLowerCamelCase command}}WithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completionHandler:completionHandler]; } {{/unless}} +{{/unless}} {{/if}} {{/inline}} {{> commandImpl cluster=(compatClusterNameRemapping parent.name) diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt index ef09d89f9e165f..3285e3cba52cea 100644 --- a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt @@ -30,7 +30,14 @@ NS_ASSUME_NONNULL_BEGIN {{#if (isSupported cluster command=command)}} - (void){{asLowerCamelCase name}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField}}_Nullable{{/unless}})params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:({{>command_completion_type command=.}})completion {{availability cluster command=command minimalRelease="First major API revamp"}}; {{#unless hasArguments}} -- (void){{asLowerCamelCase name}}WithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:({{>command_completion_type command=.}})completion {{availability cluster command=command minimalRelease="First major API revamp"}}; +- (void){{asLowerCamelCase name}}WithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:({{>command_completion_type command=.}})completion +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#if (and (isStrEqual command "KeySetReadAllIndices") + (isStrEqual cluster "GroupKeyManagement"))}} +{{availability cluster command=command minimalRelease="Fall 2023"}}; +{{else}} +{{availability cluster command=command minimalRelease="First major API revamp"}}; +{{/if}} {{/unless}} {{/if}} {{/inline}} @@ -91,8 +98,12 @@ NS_ASSUME_NONNULL_BEGIN (isSupported cluster command=command))}} - (void){{asLowerCamelCase command}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField}}_Nullable{{/unless}})params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler {{availability cluster command=command deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use " (asLowerCamelCase name) "WithParams:expectedValues:expectedValueInterval:completion:")}}; {{#unless hasArguments}} +{{! KeySetReadAllIndices grew this params-less API later _after_ it had already been shipped, so it needs to be special-cased here }} +{{#unless (and (isStrEqual cluster "GroupKeyManagement") + (isStrEqual command "KeySetReadAllIndices"))}} - (void){{asLowerCamelCase command}}WithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completionHandler:({{>command_completion_type command=. compatRemapNames=true}})completionHandler {{availability cluster command=command deprecatedRelease="First major API revamp" deprecationMessage=(concat "Please use " (asLowerCamelCase name) "WithExpectedValues:expectedValueInterval:completion:")}}; {{/unless}} +{{/unless}} {{/if}} {{/inline}} {{> commandDecl cluster=(compatClusterNameRemapping parent.name) diff --git a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc-src.zapt b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc-src.zapt index 638a000cb8351a..cd76e066bdf935 100644 --- a/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRCommandPayloadsObjc-src.zapt @@ -7,6 +7,7 @@ #import "MTRLogging_Internal.h" #import "NSStringSpanConversion.h" #import "NSDataSpanConversion.h" +#import "MTRBackwardsCompatShims.h" #include #include diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 1d98350e945875..7775c92ef0552d 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -7046,7 +7046,7 @@ PumpFeature: LocalOperation: Local -- release: "TBD" +- release: "Fall 2023" versions: "future" introduced: clusters: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 9fc4140bc890f6..b2f1787777cd87 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -7226,10 +7226,13 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) * * Return the list of Group Key Sets associated with the accessing fabric */ -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +- (void)keySetReadAllIndicesWithCompletion: + (void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion + MTR_NEWLY_AVAILABLE; - (void)readAttributeGroupKeyMapWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion @@ -44702,7 +44705,7 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { completionHandler:(MTRStatusCompletion)completionHandler MTR_DEPRECATED( "Please use keySetRemoveWithParams:completion:", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completionHandler MTR_DEPRECATED("Please use keySetReadAllIndicesWithParams:completion:", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 31632005d158a5..09ba8a2093b654 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -43825,7 +43825,12 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * std::move(*bridge).DispatchAction(self.device); } -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithCompletion: + (void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion +{ + [self keySetReadAllIndicesWithParams:nil completion:completion]; +} +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion { @@ -43852,28 +43857,6 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - { - using ListType_0 = std::remove_reference_t; - using ListMemberType_0 = ListMemberTypeGetter::Type; - if (params.groupKeySetIDs.count != 0) { - auto * listHolder_0 = new ListHolder(params.groupKeySetIDs.count); - if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { - return CHIP_ERROR_INVALID_ARGUMENT; - } - listFreer.add(listHolder_0); - for (size_t i_0 = 0; i_0 < params.groupKeySetIDs.count; ++i_0) { - if (![params.groupKeySetIDs[i_0] isKindOfClass:[NSNumber class]]) { - // Wrong kind of value. - return CHIP_ERROR_INVALID_ARGUMENT; - } - auto element_0 = (NSNumber *) params.groupKeySetIDs[i_0]; - listHolder_0->mList[i_0] = element_0.unsignedShortValue; - } - request.groupKeySetIDs = ListType_0(listHolder_0->mList, params.groupKeySetIDs.count); - } else { - request.groupKeySetIDs = ListType_0(); - } - } return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -44406,7 +44389,7 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * { [self keySetRemoveWithParams:params completion:completionHandler]; } -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completionHandler { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 42084ce61bd2ae..a3eb25e438d75a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2560,12 +2560,17 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +- (void)keySetReadAllIndicesWithExpectedValues:(NSArray *> *)expectedValues + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + completion: + (void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, + NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeGroupKeyMapWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -11191,7 +11196,7 @@ MTR_DEPRECATED("Please use MTRClusterUnitTesting", ios(16.1, 16.4), macos(13.0, completionHandler:(MTRStatusCompletion)completionHandler MTR_DEPRECATED("Please use keySetRemoveWithParams:expectedValues:expectedValueInterval:completion:", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 8d4eb4863d0f8d..ed4e065fd5abbe 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -12151,7 +12151,18 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * } } -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithExpectedValues:(NSArray *> *)expectedValues + expectedValueInterval:(NSNumber *)expectedValueIntervalMs + completion: + (void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, + NSError * _Nullable error))completion +{ + [self keySetReadAllIndicesWithParams:nil + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + completion:completion]; +} +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, @@ -12200,28 +12211,6 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - { - using ListType_0 = std::remove_reference_t; - using ListMemberType_0 = ListMemberTypeGetter::Type; - if (params.groupKeySetIDs.count != 0) { - auto * listHolder_0 = new ListHolder(params.groupKeySetIDs.count); - if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { - return CHIP_ERROR_INVALID_ARGUMENT; - } - listFreer.add(listHolder_0); - for (size_t i_0 = 0; i_0 < params.groupKeySetIDs.count; ++i_0) { - if (![params.groupKeySetIDs[i_0] isKindOfClass:[NSNumber class]]) { - // Wrong kind of value. - return CHIP_ERROR_INVALID_ARGUMENT; - } - auto element_0 = (NSNumber *) params.groupKeySetIDs[i_0]; - listHolder_0->mList[i_0] = element_0.unsignedShortValue; - } - request.groupKeySetIDs = ListType_0(listHolder_0->mList, params.groupKeySetIDs.count); - } else { - request.groupKeySetIDs = ListType_0(); - } - } return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -12384,7 +12373,7 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * expectedValueInterval:expectedValueIntervalMs completion:completionHandler]; } -- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params +- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index d6da7ce1a63bf6..9f480341bb0aa4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -3982,8 +3982,6 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRGroupKeyManagementClusterKeySetReadAllIndicesParams : NSObject - -@property (nonatomic, copy) NSArray * _Nonnull groupKeySetIDs API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** * Controls whether the command is a timed command (using Timed Invoke). * diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index f06b96ba12999e..b4d0b6a5bdde60 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -16,6 +16,7 @@ */ #import "MTRCommandPayloadsObjc.h" +#import "MTRBackwardsCompatShims.h" #import "MTRBaseDevice_Internal.h" #import "MTRCommandPayloads_Internal.h" #import "MTRError_Internal.h" @@ -6297,8 +6298,6 @@ @implementation MTRGroupKeyManagementClusterKeySetReadAllIndicesParams - (instancetype)init { if (self = [super init]) { - - _groupKeySetIDs = [NSArray array]; _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -6309,7 +6308,6 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init]; - other.groupKeySetIDs = self.groupKeySetIDs; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -6318,8 +6316,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupKeySetIDs:%@; >", NSStringFromClass([self class]), _groupKeySetIDs]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])]; return descriptionString; } diff --git a/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m b/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m index 1c9833ab4fe3fa..3848ed69dd0e6f 100644 --- a/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m +++ b/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m @@ -1196,6 +1196,15 @@ - (void)test046_MTRThreadOperationalDataset CHECK_RETURN_TYPE(sig, NSData *); } +- (void)test047_MTRGroupKeyManagementClusterKeySetReadAllIndicesParams +{ + __auto_type * params = [[MTRGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init]; + CHECK_PROPERTY(params, groupKeySetIDs, setGroupKeySetIDs, NSArray *); + + params.groupKeySetIDs = @[ @(16) ]; + XCTAssertEqualObjects(params.groupKeySetIDs, @[ @(16) ]); +} + - (void)test999_TearDown { ResetCommissionee(GetConnectedDevice(), dispatch_get_main_queue(), self, kTimeoutInSeconds); diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index d93ddc7cc9b841..dd96371ef40a0d 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -170,6 +170,7 @@ 51E51FBF282AD37A00FC978D /* MTRDeviceControllerStartupParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E51FBC282AD37A00FC978D /* MTRDeviceControllerStartupParams.h */; settings = {ATTRIBUTES = (Public, ); }; }; 51E51FC0282AD37A00FC978D /* MTRDeviceControllerStartupParams_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E51FBD282AD37A00FC978D /* MTRDeviceControllerStartupParams_Internal.h */; }; 51E51FC1282AD37A00FC978D /* MTRDeviceControllerStartupParams.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E51FBE282AD37A00FC978D /* MTRDeviceControllerStartupParams.mm */; }; + 51EF279F2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5A60370827EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */; }; 5A6FEC9027B563D900F25F42 /* MTRDeviceControllerOverXPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5A6FEC8F27B563D900F25F42 /* MTRDeviceControllerOverXPC.mm */; }; 5A6FEC9227B5669C00F25F42 /* MTRDeviceControllerOverXPC.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6FEC8D27B5624E00F25F42 /* MTRDeviceControllerOverXPC.h */; }; @@ -461,6 +462,7 @@ 51E51FBC282AD37A00FC978D /* MTRDeviceControllerStartupParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerStartupParams.h; sourceTree = ""; }; 51E51FBD282AD37A00FC978D /* MTRDeviceControllerStartupParams_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerStartupParams_Internal.h; sourceTree = ""; }; 51E51FBE282AD37A00FC978D /* MTRDeviceControllerStartupParams.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDeviceControllerStartupParams.mm; sourceTree = ""; }; + 51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRBackwardsCompatShims.h; sourceTree = ""; }; 5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MTRClusterStateCacheContainer+XPC.h"; sourceTree = ""; }; 5A6FEC8B27B5609C00F25F42 /* MTRDeviceOverXPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDeviceOverXPC.h; sourceTree = ""; }; 5A6FEC8D27B5624E00F25F42 /* MTRDeviceControllerOverXPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerOverXPC.h; sourceTree = ""; }; @@ -937,6 +939,7 @@ 27A53C1627FBC6920053F131 /* MTRAttestationTrustStoreBridge.mm */, 513DDB852761F69300DAA01A /* MTRAttributeTLVValueDecoder_Internal.h */, 75B765C02A1D71BC0014719B /* MTRAttributeSpecifiedCheck.h */, + 51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */, 51E4D120291D0EB400C8C535 /* MTRBaseClusterUtils.h */, 2C222ADE255C811800E446B9 /* MTRBaseDevice_Internal.h */, 2C222ACE255C620600E446B9 /* MTRBaseDevice.h */, @@ -1137,6 +1140,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 51EF279F2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h in Headers */, 5173A47729C0E2ED00F67F48 /* MTRFabricInfo.h in Headers */, 517BF3F0282B62B800A8B7DB /* MTRCertificates.h in Headers */, 51E51FBF282AD37A00FC978D /* MTRDeviceControllerStartupParams.h in Headers */, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index ce1d32256c1b70..f7d66afebb9b7b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -10650,7 +10650,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kGroupKeySetIDs), groupKeySetIDs)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -10669,9 +10668,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupKeySetIDs): - ReturnErrorOnFailure(DataModel::Decode(reader, groupKeySetIDs)); - break; default: break; } diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 0be27be21937a1..12a46694abbebc 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -13077,7 +13077,6 @@ struct DecodableType namespace KeySetReadAllIndices { enum class Fields : uint8_t { - kGroupKeySetIDs = 0, }; struct Type @@ -13087,8 +13086,6 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::KeySetReadAllIndices::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - DataModel::List groupKeySetIDs; - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; using ResponseType = Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType; @@ -13102,7 +13099,6 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::KeySetReadAllIndices::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; } - DataModel::DecodableList groupKeySetIDs; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace KeySetReadAllIndices diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 0d62742e95fa6c..60cff013806976 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3785,9 +3785,8 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand { public: GroupKeyManagementKeySetReadAllIndices(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("key-set-read-all-indices", credsIssuerConfig), mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs) + ClusterCommand("key-set-read-all-indices", credsIssuerConfig) { - AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs); ClusterCommand::AddArguments(); } @@ -3807,7 +3806,6 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand private: chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest; - TypedComplexArgument> mComplex_GroupKeySetIDs; }; /*----------------------------------------------------------------------------*\ diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 1bb3a2f37a79d7..65b78d4a2430db 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -94954,7 +94954,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand { public: TestGroupKeyManagementClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("TestGroupKeyManagementCluster", 47, credsIssuerConfig) + TestCommand("TestGroupKeyManagementCluster", 48, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -95057,18 +95057,28 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckConstraintContains("value", value.groupKeySetIDs, 417U)); + VerifyOrReturn(CheckConstraintContains("value", value.groupKeySetIDs, 418U)); + VerifyOrReturn(CheckConstraintContains("value", value.groupKeySetIDs, 0U)); + } break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 14: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE)); break; case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 16: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95097,7 +95107,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 17: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95142,7 +95152,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 18: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95171,7 +95181,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 19: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95216,7 +95226,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 20: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; @@ -95225,7 +95235,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 257U)); } break; - case 21: + case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; @@ -95234,7 +95244,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 258U)); } break; - case 22: + case 23: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; @@ -95243,7 +95253,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 259U)); } break; - case 23: + case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; @@ -95252,7 +95262,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 260U)); } break; - case 24: + case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; @@ -95261,7 +95271,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 261U)); } break; - case 25: + case 26: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95330,7 +95340,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 26: + case 27: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95413,7 +95423,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 27: + case 28: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95440,7 +95450,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 28: + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95523,13 +95533,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 29: + case 30: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 30: + case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); break; - case 31: + case 32: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value; @@ -95550,7 +95560,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2110002ULL)); } break; - case 32: + case 33: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::DecodableType value; @@ -95571,7 +95581,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand CheckValue("groupKeySet.epochStartTime2.Value()", value.groupKeySet.epochStartTime2.Value(), 2110002ULL)); } break; - case 33: + case 34: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value; @@ -95580,7 +95590,7 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("groupID", value.groupID, 257U)); } break; - case 34: + case 35: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95635,10 +95645,10 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 35: + case 36: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 36: + case 37: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95651,14 +95661,11 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 37: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 38: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 39: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); break; case 40: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -95673,6 +95680,9 @@ class TestGroupKeyManagementClusterSuite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 44: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 45: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95689,10 +95699,10 @@ class TestGroupKeyManagementClusterSuite : public TestCommand } } break; - case 45: + case 46: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 46: + case 47: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList< @@ -95949,7 +95959,16 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } case 12: { - LogStep(12, "Write Group Keys (invalid)"); + LogStep(12, "KeySet Read All Indices"); + ListFreer listFreer; + chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type value; + return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, + GroupKeyManagement::Commands::KeySetReadAllIndices::Id, value, chip::NullOptional + + ); + } + case 13: { + LogStep(13, "Write Group Keys (invalid)"); ListFreer listFreer; chip::app::DataModel::List value; @@ -95967,8 +95986,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "Write Group Keys (too many)"); + case 14: { + LogStep(14, "Write Group Keys (too many)"); ListFreer listFreer; chip::app::DataModel::List value; @@ -96038,8 +96057,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 14: { - LogStep(14, "Write Group Keys on alpha"); + case 15: { + LogStep(15, "Write Group Keys on alpha"); ListFreer listFreer; chip::app::DataModel::List value; @@ -96069,8 +96088,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 15: { - LogStep(15, "Write Group Keys on beta"); + case 16: { + LogStep(16, "Write Group Keys on beta"); ListFreer listFreer; chip::app::DataModel::List value; @@ -96100,28 +96119,28 @@ class TestGroupKeyManagementClusterSuite : public TestCommand return WriteAttribute(kIdentityBeta, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 16: { - LogStep(16, "Read Group Keys on alpha"); + case 17: { + LogStep(17, "Read Group Keys on alpha"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "Read Group Keys on alpha without fabric filtering"); + case 18: { + LogStep(18, "Read Group Keys on alpha without fabric filtering"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, false, chip::NullOptional); } - case 18: { - LogStep(18, "Read Group Keys on beta"); + case 19: { + LogStep(19, "Read Group Keys on beta"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } - case 19: { - LogStep(19, "Read Group Keys on beta without fabric filtering"); + case 20: { + LogStep(20, "Read Group Keys on beta without fabric filtering"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, false, chip::NullOptional); } - case 20: { - LogStep(20, "Add Group 1"); + case 21: { + LogStep(21, "Add Group 1"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 257U; @@ -96130,8 +96149,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 21: { - LogStep(21, "Add Group 2"); + case 22: { + LogStep(22, "Add Group 2"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 258U; @@ -96140,8 +96159,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 22: { - LogStep(22, "Add Group 3"); + case 23: { + LogStep(23, "Add Group 3"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 259U; @@ -96150,8 +96169,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 23: { - LogStep(23, "Add Group 4"); + case 24: { + LogStep(24, "Add Group 4"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 260U; @@ -96160,8 +96179,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 24: { - LogStep(24, "Add Group 5"); + case 25: { + LogStep(25, "Add Group 5"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::AddGroup::Type value; value.groupID = 261U; @@ -96170,28 +96189,28 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 25: { - LogStep(25, "Read GroupTable from alpha"); + case 26: { + LogStep(26, "Read GroupTable from alpha"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 26: { - LogStep(26, "Read GroupTable from alpha without fabric filtering"); + case 27: { + LogStep(27, "Read GroupTable from alpha without fabric filtering"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, false, chip::NullOptional); } - case 27: { - LogStep(27, "Read GroupTable from beta"); + case 28: { + LogStep(28, "Read GroupTable from beta"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 28: { - LogStep(28, "Read GroupTable from beta without fabric filtering"); + case 29: { + LogStep(29, "Read GroupTable from beta without fabric filtering"); return ReadAttribute(kIdentityBeta, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, false, chip::NullOptional); } - case 29: { - LogStep(29, "KeySet Remove 1"); + case 30: { + LogStep(30, "KeySet Remove 1"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 417U; @@ -96200,8 +96219,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 30: { - LogStep(30, "KeySet Read (removed)"); + case 31: { + LogStep(31, "KeySet Read (removed)"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; value.groupKeySetID = 417U; @@ -96210,8 +96229,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 31: { - LogStep(31, "KeySet Read (not removed) CacheAndSync"); + case 32: { + LogStep(32, "KeySet Read (not removed) CacheAndSync"); VerifyOrDo(!ShouldSkip("GRPKEY.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; @@ -96221,8 +96240,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 32: { - LogStep(32, "KeySet Read (not removed) TrustFirst"); + case 33: { + LogStep(33, "KeySet Read (not removed) TrustFirst"); VerifyOrDo(!ShouldSkip("GRPKEY.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; @@ -96232,8 +96251,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 33: { - LogStep(33, "Remove Group 1"); + case 34: { + LogStep(34, "Remove Group 1"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveGroup::Type value; value.groupID = 257U; @@ -96242,13 +96261,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 34: { - LogStep(34, "Read GroupTable 2"); + case 35: { + LogStep(35, "Read GroupTable 2"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 35: { - LogStep(35, "Remove All"); + case 36: { + LogStep(36, "Remove All"); ListFreer listFreer; chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value, @@ -96256,13 +96275,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 36: { - LogStep(36, "Read GroupTable 3"); + case 37: { + LogStep(37, "Read GroupTable 3"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional); } - case 37: { - LogStep(37, "KeySet Remove 2"); + case 38: { + LogStep(38, "KeySet Remove 2"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 418U; @@ -96271,8 +96290,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 38: { - LogStep(38, "KeySet Read (also removed)"); + case 39: { + LogStep(39, "KeySet Read (also removed)"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value; value.groupKeySetID = 418U; @@ -96281,8 +96300,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 39: { - LogStep(39, "KeySet Write 1"); + case 40: { + LogStep(40, "KeySet Write 1"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -96316,8 +96335,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 40: { - LogStep(40, "KeySet Write 2 CacheAndSync"); + case 41: { + LogStep(41, "KeySet Write 2 CacheAndSync"); VerifyOrDo(!ShouldSkip("GRPKEY.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -96352,8 +96371,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 41: { - LogStep(41, "KeySet Write 2 TrustFirst"); + case 42: { + LogStep(42, "KeySet Write 2 TrustFirst"); VerifyOrDo(!ShouldSkip("!GRPKEY.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value; @@ -96388,8 +96407,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 42: { - LogStep(42, "Map Group 1 and Group 2 to KeySet 1 and group 2 to KeySet 2"); + case 43: { + LogStep(43, "Map Group 1 and Group 2 to KeySet 1 and group 2 to KeySet 2"); ListFreer listFreer; chip::app::DataModel::List value; @@ -96415,8 +96434,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, value, chip::NullOptional, chip::NullOptional); } - case 43: { - LogStep(43, "Remove keyset 1"); + case 44: { + LogStep(44, "Remove keyset 1"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 417U; @@ -96425,13 +96444,13 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 44: { - LogStep(44, "TH verifies GroupKeyMap entries for KeySet 1 have been removed"); + case 45: { + LogStep(45, "TH verifies GroupKeyMap entries for KeySet 1 have been removed"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } - case 45: { - LogStep(45, "Remove keyset 2"); + case 46: { + LogStep(46, "Remove keyset 2"); ListFreer listFreer; chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value; value.groupKeySetID = 418U; @@ -96440,8 +96459,8 @@ class TestGroupKeyManagementClusterSuite : public TestCommand ); } - case 46: { - LogStep(46, "TH verifies GroupKeyMap entries for KeySet 2 have been removed"); + case 47: { + LogStep(47, "TH verifies GroupKeyMap entries for KeySet 2 have been removed"); return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Attributes::GroupKeyMap::Id, true, chip::NullOptional); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index e7a2726facf97c..398e23449e7565 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -37219,9 +37219,7 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand { public: GroupKeyManagementKeySetReadAllIndices() : ClusterCommand("key-set-read-all-indices") - , mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs) { - AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs); ClusterCommand::AddArguments(); } @@ -37236,15 +37234,6 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand { __auto_type * params = [[MTRGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - { // Scope for our temporary variables - auto * array_0 = [NSMutableArray new]; - for (auto & entry_0 : mRequest.groupKeySetIDs) { - NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedShort:entry_0]; - [array_0 addObject:newElement_0]; - } - params.groupKeySetIDs = array_0; - } uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -37267,8 +37256,6 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand { } private: - chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest; - TypedComplexArgument> mComplex_GroupKeySetIDs; }; /* diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index ac9642373e325b..b84f964799fccb 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -143853,160 +143853,164 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { err = TestKeySetRead_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Write Group Keys (invalid)\n"); - err = TestWriteGroupKeysInvalid_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : KeySet Read All Indices\n"); + err = TestKeySetReadAllIndices_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Write Group Keys (too many)\n"); - err = TestWriteGroupKeysTooMany_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Write Group Keys (invalid)\n"); + err = TestWriteGroupKeysInvalid_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Write Group Keys on alpha\n"); - err = TestWriteGroupKeysOnAlpha_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Write Group Keys (too many)\n"); + err = TestWriteGroupKeysTooMany_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Write Group Keys on beta\n"); - err = TestWriteGroupKeysOnBeta_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : Write Group Keys on alpha\n"); + err = TestWriteGroupKeysOnAlpha_15(); break; case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : Read Group Keys on alpha\n"); - err = TestReadGroupKeysOnAlpha_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : Write Group Keys on beta\n"); + err = TestWriteGroupKeysOnBeta_16(); break; case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : Read Group Keys on alpha without fabric filtering\n"); - err = TestReadGroupKeysOnAlphaWithoutFabricFiltering_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Read Group Keys on alpha\n"); + err = TestReadGroupKeysOnAlpha_17(); break; case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Read Group Keys on beta\n"); - err = TestReadGroupKeysOnBeta_18(); + ChipLogProgress(chipTool, " ***** Test Step 18 : Read Group Keys on alpha without fabric filtering\n"); + err = TestReadGroupKeysOnAlphaWithoutFabricFiltering_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : Read Group Keys on beta without fabric filtering\n"); - err = TestReadGroupKeysOnBetaWithoutFabricFiltering_19(); + ChipLogProgress(chipTool, " ***** Test Step 19 : Read Group Keys on beta\n"); + err = TestReadGroupKeysOnBeta_19(); break; case 20: - ChipLogProgress(chipTool, " ***** Test Step 20 : Add Group 1\n"); - err = TestAddGroup1_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : Read Group Keys on beta without fabric filtering\n"); + err = TestReadGroupKeysOnBetaWithoutFabricFiltering_20(); break; case 21: - ChipLogProgress(chipTool, " ***** Test Step 21 : Add Group 2\n"); - err = TestAddGroup2_21(); + ChipLogProgress(chipTool, " ***** Test Step 21 : Add Group 1\n"); + err = TestAddGroup1_21(); break; case 22: - ChipLogProgress(chipTool, " ***** Test Step 22 : Add Group 3\n"); - err = TestAddGroup3_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : Add Group 2\n"); + err = TestAddGroup2_22(); break; case 23: - ChipLogProgress(chipTool, " ***** Test Step 23 : Add Group 4\n"); - err = TestAddGroup4_23(); + ChipLogProgress(chipTool, " ***** Test Step 23 : Add Group 3\n"); + err = TestAddGroup3_23(); break; case 24: - ChipLogProgress(chipTool, " ***** Test Step 24 : Add Group 5\n"); - err = TestAddGroup5_24(); + ChipLogProgress(chipTool, " ***** Test Step 24 : Add Group 4\n"); + err = TestAddGroup4_24(); break; case 25: - ChipLogProgress(chipTool, " ***** Test Step 25 : Read GroupTable from alpha\n"); - err = TestReadGroupTableFromAlpha_25(); + ChipLogProgress(chipTool, " ***** Test Step 25 : Add Group 5\n"); + err = TestAddGroup5_25(); break; case 26: - ChipLogProgress(chipTool, " ***** Test Step 26 : Read GroupTable from alpha without fabric filtering\n"); - err = TestReadGroupTableFromAlphaWithoutFabricFiltering_26(); + ChipLogProgress(chipTool, " ***** Test Step 26 : Read GroupTable from alpha\n"); + err = TestReadGroupTableFromAlpha_26(); break; case 27: - ChipLogProgress(chipTool, " ***** Test Step 27 : Read GroupTable from beta\n"); - err = TestReadGroupTableFromBeta_27(); + ChipLogProgress(chipTool, " ***** Test Step 27 : Read GroupTable from alpha without fabric filtering\n"); + err = TestReadGroupTableFromAlphaWithoutFabricFiltering_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : Read GroupTable from beta without fabric filtering\n"); - err = TestReadGroupTableFromBetaWithoutFabricFiltering_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : Read GroupTable from beta\n"); + err = TestReadGroupTableFromBeta_28(); break; case 29: - ChipLogProgress(chipTool, " ***** Test Step 29 : KeySet Remove 1\n"); - err = TestKeySetRemove1_29(); + ChipLogProgress(chipTool, " ***** Test Step 29 : Read GroupTable from beta without fabric filtering\n"); + err = TestReadGroupTableFromBetaWithoutFabricFiltering_29(); break; case 30: - ChipLogProgress(chipTool, " ***** Test Step 30 : KeySet Read (removed)\n"); - err = TestKeySetReadRemoved_30(); + ChipLogProgress(chipTool, " ***** Test Step 30 : KeySet Remove 1\n"); + err = TestKeySetRemove1_30(); break; case 31: - ChipLogProgress(chipTool, " ***** Test Step 31 : KeySet Read (not removed) CacheAndSync\n"); + ChipLogProgress(chipTool, " ***** Test Step 31 : KeySet Read (removed)\n"); + err = TestKeySetReadRemoved_31(); + break; + case 32: + ChipLogProgress(chipTool, " ***** Test Step 32 : KeySet Read (not removed) CacheAndSync\n"); if (ShouldSkip("GRPKEY.S.F00")) { NextTest(); return; } - err = TestKeySetReadNotRemovedCacheAndSync_31(); + err = TestKeySetReadNotRemovedCacheAndSync_32(); break; - case 32: - ChipLogProgress(chipTool, " ***** Test Step 32 : KeySet Read (not removed) TrustFirst\n"); + case 33: + ChipLogProgress(chipTool, " ***** Test Step 33 : KeySet Read (not removed) TrustFirst\n"); if (ShouldSkip("GRPKEY.S.F00")) { NextTest(); return; } - err = TestKeySetReadNotRemovedTrustFirst_32(); - break; - case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : Remove Group 1\n"); - err = TestRemoveGroup1_33(); + err = TestKeySetReadNotRemovedTrustFirst_33(); break; case 34: - ChipLogProgress(chipTool, " ***** Test Step 34 : Read GroupTable 2\n"); - err = TestReadGroupTable2_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : Remove Group 1\n"); + err = TestRemoveGroup1_34(); break; case 35: - ChipLogProgress(chipTool, " ***** Test Step 35 : Remove All\n"); - err = TestRemoveAll_35(); + ChipLogProgress(chipTool, " ***** Test Step 35 : Read GroupTable 2\n"); + err = TestReadGroupTable2_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : Read GroupTable 3\n"); - err = TestReadGroupTable3_36(); + ChipLogProgress(chipTool, " ***** Test Step 36 : Remove All\n"); + err = TestRemoveAll_36(); break; case 37: - ChipLogProgress(chipTool, " ***** Test Step 37 : KeySet Remove 2\n"); - err = TestKeySetRemove2_37(); + ChipLogProgress(chipTool, " ***** Test Step 37 : Read GroupTable 3\n"); + err = TestReadGroupTable3_37(); break; case 38: - ChipLogProgress(chipTool, " ***** Test Step 38 : KeySet Read (also removed)\n"); - err = TestKeySetReadAlsoRemoved_38(); + ChipLogProgress(chipTool, " ***** Test Step 38 : KeySet Remove 2\n"); + err = TestKeySetRemove2_38(); break; case 39: - ChipLogProgress(chipTool, " ***** Test Step 39 : KeySet Write 1\n"); - err = TestKeySetWrite1_39(); + ChipLogProgress(chipTool, " ***** Test Step 39 : KeySet Read (also removed)\n"); + err = TestKeySetReadAlsoRemoved_39(); break; case 40: - ChipLogProgress(chipTool, " ***** Test Step 40 : KeySet Write 2 CacheAndSync\n"); + ChipLogProgress(chipTool, " ***** Test Step 40 : KeySet Write 1\n"); + err = TestKeySetWrite1_40(); + break; + case 41: + ChipLogProgress(chipTool, " ***** Test Step 41 : KeySet Write 2 CacheAndSync\n"); if (ShouldSkip("GRPKEY.S.F00")) { NextTest(); return; } - err = TestKeySetWrite2CacheAndSync_40(); + err = TestKeySetWrite2CacheAndSync_41(); break; - case 41: - ChipLogProgress(chipTool, " ***** Test Step 41 : KeySet Write 2 TrustFirst\n"); + case 42: + ChipLogProgress(chipTool, " ***** Test Step 42 : KeySet Write 2 TrustFirst\n"); if (ShouldSkip("!GRPKEY.S.F00")) { NextTest(); return; } - err = TestKeySetWrite2TrustFirst_41(); - break; - case 42: - ChipLogProgress(chipTool, " ***** Test Step 42 : Map Group 1 and Group 2 to KeySet 1 and group 2 to KeySet 2\n"); - err = TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_42(); + err = TestKeySetWrite2TrustFirst_42(); break; case 43: - ChipLogProgress(chipTool, " ***** Test Step 43 : Remove keyset 1\n"); - err = TestRemoveKeyset1_43(); + ChipLogProgress(chipTool, " ***** Test Step 43 : Map Group 1 and Group 2 to KeySet 1 and group 2 to KeySet 2\n"); + err = TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_43(); break; case 44: - ChipLogProgress(chipTool, " ***** Test Step 44 : TH verifies GroupKeyMap entries for KeySet 1 have been removed\n"); - err = TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_44(); + ChipLogProgress(chipTool, " ***** Test Step 44 : Remove keyset 1\n"); + err = TestRemoveKeyset1_44(); break; case 45: - ChipLogProgress(chipTool, " ***** Test Step 45 : Remove keyset 2\n"); - err = TestRemoveKeyset2_45(); + ChipLogProgress(chipTool, " ***** Test Step 45 : TH verifies GroupKeyMap entries for KeySet 1 have been removed\n"); + err = TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_45(); break; case 46: - ChipLogProgress(chipTool, " ***** Test Step 46 : TH verifies GroupKeyMap entries for KeySet 2 have been removed\n"); - err = TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_46(); + ChipLogProgress(chipTool, " ***** Test Step 46 : Remove keyset 2\n"); + err = TestRemoveKeyset2_46(); + break; + case 47: + ChipLogProgress(chipTool, " ***** Test Step 47 : TH verifies GroupKeyMap entries for KeySet 2 have been removed\n"); + err = TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_47(); break; } @@ -144056,13 +144060,13 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); break; case 14: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_FAILURE)); break; case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -144110,10 +144114,10 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 30: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 31: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); break; case 32: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -144134,10 +144138,10 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 38: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 39: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_NOT_FOUND)); break; case 40: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -144160,6 +144164,9 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { case 46: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 47: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -144173,7 +144180,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 47; + const uint16_t mTestCount = 48; chip::Optional mNodeId; chip::Optional mCluster; @@ -144524,7 +144531,32 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteGroupKeysInvalid_12() + CHIP_ERROR TestKeySetReadAllIndices_12() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterGroupKeyManagement alloc] initWithDevice:device + endpointID:@(0) + queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster keySetReadAllIndicesWithCompletion:^( + MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable values, NSError * _Nullable err) { + NSLog(@"KeySet Read All Indices Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + VerifyOrReturn(CheckConstraintContains("groupKeySetIDs", values.groupKeySetIDs, 417U)); + VerifyOrReturn(CheckConstraintContains("groupKeySetIDs", values.groupKeySetIDs, 418U)); + VerifyOrReturn(CheckConstraintContains("groupKeySetIDs", values.groupKeySetIDs, 0U)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteGroupKeysInvalid_13() { MTRBaseDevice * device = GetDevice("alpha"); @@ -144559,7 +144591,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteGroupKeysTooMany_13() + CHIP_ERROR TestWriteGroupKeysTooMany_14() { MTRBaseDevice * device = GetDevice("alpha"); @@ -144659,7 +144691,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteGroupKeysOnAlpha_14() + CHIP_ERROR TestWriteGroupKeysOnAlpha_15() { MTRBaseDevice * device = GetDevice("alpha"); @@ -144705,7 +144737,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteGroupKeysOnBeta_15() + CHIP_ERROR TestWriteGroupKeysOnBeta_16() { MTRBaseDevice * device = GetDevice("beta"); @@ -144751,7 +144783,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupKeysOnAlpha_16() + CHIP_ERROR TestReadGroupKeysOnAlpha_17() { MTRBaseDevice * device = GetDevice("alpha"); @@ -144813,7 +144845,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupKeysOnAlphaWithoutFabricFiltering_17() + CHIP_ERROR TestReadGroupKeysOnAlphaWithoutFabricFiltering_18() { MTRBaseDevice * device = GetDevice("alpha"); @@ -144907,7 +144939,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupKeysOnBeta_18() + CHIP_ERROR TestReadGroupKeysOnBeta_19() { MTRBaseDevice * device = GetDevice("beta"); @@ -144969,7 +145001,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupKeysOnBetaWithoutFabricFiltering_19() + CHIP_ERROR TestReadGroupKeysOnBetaWithoutFabricFiltering_20() { MTRBaseDevice * device = GetDevice("beta"); @@ -145063,7 +145095,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestAddGroup1_20() + CHIP_ERROR TestAddGroup1_21() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145095,7 +145127,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestAddGroup2_21() + CHIP_ERROR TestAddGroup2_22() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145127,7 +145159,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestAddGroup3_22() + CHIP_ERROR TestAddGroup3_23() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145159,7 +145191,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestAddGroup4_23() + CHIP_ERROR TestAddGroup4_24() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145191,7 +145223,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestAddGroup5_24() + CHIP_ERROR TestAddGroup5_25() { MTRBaseDevice * device = GetDevice("beta"); @@ -145223,7 +145255,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTableFromAlpha_25() + CHIP_ERROR TestReadGroupTableFromAlpha_26() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145312,7 +145344,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTableFromAlphaWithoutFabricFiltering_26() + CHIP_ERROR TestReadGroupTableFromAlphaWithoutFabricFiltering_27() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145416,7 +145448,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTableFromBeta_27() + CHIP_ERROR TestReadGroupTableFromBeta_28() { MTRBaseDevice * device = GetDevice("beta"); @@ -145460,7 +145492,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTableFromBetaWithoutFabricFiltering_28() + CHIP_ERROR TestReadGroupTableFromBetaWithoutFabricFiltering_29() { MTRBaseDevice * device = GetDevice("beta"); @@ -145564,7 +145596,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetRemove1_29() + CHIP_ERROR TestKeySetRemove1_30() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145587,7 +145619,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetReadRemoved_30() + CHIP_ERROR TestKeySetReadRemoved_31() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145614,7 +145646,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetReadNotRemovedCacheAndSync_31() + CHIP_ERROR TestKeySetReadNotRemovedCacheAndSync_32() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145665,7 +145697,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetReadNotRemovedTrustFirst_32() + CHIP_ERROR TestKeySetReadNotRemovedTrustFirst_33() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145716,7 +145748,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveGroup1_33() + CHIP_ERROR TestRemoveGroup1_34() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145747,7 +145779,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTable2_34() + CHIP_ERROR TestReadGroupTable2_35() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145821,7 +145853,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveAll_35() + CHIP_ERROR TestRemoveAll_36() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145839,7 +145871,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadGroupTable3_36() + CHIP_ERROR TestReadGroupTable3_37() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145868,7 +145900,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetRemove2_37() + CHIP_ERROR TestKeySetRemove2_38() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145891,7 +145923,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetReadAlsoRemoved_38() + CHIP_ERROR TestKeySetReadAlsoRemoved_39() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145918,7 +145950,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetWrite1_39() + CHIP_ERROR TestKeySetWrite1_40() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145958,7 +145990,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetWrite2CacheAndSync_40() + CHIP_ERROR TestKeySetWrite2CacheAndSync_41() { MTRBaseDevice * device = GetDevice("alpha"); @@ -145998,7 +146030,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestKeySetWrite2TrustFirst_41() + CHIP_ERROR TestKeySetWrite2TrustFirst_42() { MTRBaseDevice * device = GetDevice("alpha"); @@ -146038,7 +146070,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_42() + CHIP_ERROR TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_43() { MTRBaseDevice * device = GetDevice("alpha"); @@ -146079,7 +146111,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveKeyset1_43() + CHIP_ERROR TestRemoveKeyset1_44() { MTRBaseDevice * device = GetDevice("alpha"); @@ -146102,7 +146134,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_44() + CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_45() { MTRBaseDevice * device = GetDevice("alpha"); @@ -146140,7 +146172,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRemoveKeyset2_45() + CHIP_ERROR TestRemoveKeyset2_46() { MTRBaseDevice * device = GetDevice("alpha"); @@ -146163,7 +146195,7 @@ class TestGroupKeyManagementCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_46() + CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_47() { MTRBaseDevice * device = GetDevice("alpha");