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.
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 70cd208..198775a 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -2208,7 +2204,7 @@
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 1c87e66..beebcc0 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1988,7 +1984,7 @@
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 a1c2598..6531edb 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -1575,10 +1575,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1590,7 +1586,7 @@
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 f526c49..a458da9 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1460,10 +1460,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1475,7 +1471,7 @@
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 c7501f4..ebc9e4e 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1220,10 +1220,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1235,7 +1231,7 @@
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 d470a5c..72da64c 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -1175,10 +1175,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1190,7 +1186,7 @@
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 95f4b84..c8bbadd 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -1324,10 +1324,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1339,7 +1335,7 @@
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 58ebcac..7280968 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -1175,10 +1175,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1190,7 +1186,7 @@
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 606cbd1..a7d53aa 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1324,10 +1324,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1339,7 +1335,7 @@
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 0a5f051..0ad9c02 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -1162,10 +1162,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1177,7 +1173,7 @@
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 aa62700..3aab05c 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 ff1a70f..0c50e86 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -1318,10 +1318,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1333,7 +1329,7 @@
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 1ef4c9a..dbf22aa 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 74f1218..8f11a43 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 974121b..174d400 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 a5d3799..7bb5408 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -1324,10 +1324,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1339,7 +1335,7 @@
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 3919e68..caffea3 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -1287,10 +1287,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1302,7 +1298,7 @@
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 d0ba939..1502efb 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -1223,10 +1223,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1238,7 +1234,7 @@
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 0a976f9..9deb034 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 28c8ae5..391a697 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -873,10 +873,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -888,7 +884,7 @@
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 16297b6..17f8250 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -1318,10 +1318,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1333,7 +1329,7 @@
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 c7e3118..e04574d 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -1250,10 +1250,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1265,7 +1261,7 @@
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 a9e089a..b046272 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1175,10 +1175,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1190,7 +1186,7 @@
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 bcfa526..e4a671a 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -1175,10 +1175,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1190,7 +1186,7 @@
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 d2a9ecf..18cdf11 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1401,7 +1397,7 @@
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 cfe7df5..eef00ca 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1763,7 +1759,7 @@
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 3ca936e..d96ec94 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1508,7 +1504,7 @@
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 1d260e8..9cfe229 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1418,7 +1414,7 @@
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 6a9d603..90c5808 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1752,10 +1752,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1767,7 +1763,7 @@
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 bf78a3c..52db5c7 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1334,7 +1330,7 @@
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 1313426..4ca38a5 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -1384,10 +1384,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1399,7 +1395,7 @@
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 377264b..e0d5eb6 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1623,7 +1619,7 @@
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 c2c55f3..681175e 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1513,7 +1509,7 @@
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 d70c180..f65707d 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1603,10 +1603,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1618,7 +1614,7 @@
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 4b6463f..1991075 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -938,10 +938,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -953,7 +949,7 @@
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 867d652..2062ba0 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -1218,10 +1218,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1233,7 +1229,7 @@
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 971284f..60ce281 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -934,7 +930,7 @@
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 ce1e45b..79eb0c8 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1116,7 +1112,7 @@
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 842ff2d..06e12a5 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -1177,10 +1177,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1192,7 +1188,7 @@
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 4fc7489..15b6233 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1117,7 +1113,7 @@
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 6212f51..1a2aaab 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 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -985,7 +981,7 @@
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 85a9cf6..ea9a288 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1590,10 +1590,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1605,7 +1601,7 @@
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 31b2bce..c60e578 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -1738,10 +1738,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1753,7 +1749,7 @@
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 2093e35..a2e66c2 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 @@
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 06886cf..c745bb3 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -1721,10 +1721,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadResponse = 2 {
GroupKeySetStruct groupKeySet = 0;
}
@@ -1736,7 +1732,7 @@
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 4aedb61..bc10910 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -190,13 +190,14 @@
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 3b4961e..9c4fe41 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 @@
<command source="client" code="0x04" name="KeySetReadAllIndices" response="KeySetReadAllIndicesResponse" isFabricScoped="true" optional="false" cli="zcl GroupKeyManagement KeySetReadAllIndices">
<description>Return the list of Group Key Sets associated with the accessing fabric</description>
- <arg name="GroupKeySetIDs" type="INT16U" array="true"/>
<access op="invoke" privilege="administer"/>
</command>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 08c29be..19f577e 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2608,10 +2608,6 @@
INT16U groupKeySetID = 0;
}
- request struct KeySetReadAllIndicesRequest {
- INT16U groupKeySetIDs[] = 0;
- }
-
response struct KeySetReadAllIndicesResponse = 5 {
INT16U groupKeySetIDs[] = 0;
}
@@ -2623,7 +2619,7 @@
/** 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 daa9eee..a05150d 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 @@
}
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 a128a9c..4c97e2f 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 keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback
- , ArrayList<Integer> groupKeySetIDs) {
- keySetReadAllIndices(chipClusterPtr, callback, groupKeySetIDs, null);
+ ) {
+ keySetReadAllIndices(chipClusterPtr, callback, null);
}
public void keySetReadAllIndices(KeySetReadAllIndicesResponseCallback callback
- , ArrayList<Integer> 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 @@
, Integer groupKeySetID
, @Nullable Integer timedInvokeTimeoutMs);
private native void keySetReadAllIndices(long chipClusterPtr, KeySetReadAllIndicesResponseCallback Callback
- , ArrayList<Integer> 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 9c9cbf1..938f6ee 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 @@
);
groupKeyManagementClusterInteractionInfoMap.put("keySetRemove", groupKeyManagementkeySetRemoveInteractionInfo);
Map<String, CommandParameterInfo> groupKeyManagementkeySetReadAllIndicesCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
- 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<Integer>)
- commandArguments.get("groupKeySetIDs")
);
},
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index de63a3a..c2c14aa 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -3814,7 +3814,6 @@
"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 bc52cb4..4ceed36 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -13531,11 +13531,8 @@
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 0000000..fa7ddd4
--- /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 <Foundation/Foundation.h>
+
+#import <Matter/MTRCommandPayloadsObjc.h>
+
+/**
+ * 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 094494d..a9da674 100644
--- a/src/darwin/Framework/CHIP/Matter.h
+++ b/src/darwin/Framework/CHIP/Matter.h
@@ -18,6 +18,7 @@
#import <Foundation/Foundation.h>
#import <Matter/MTRAsyncCallbackWorkQueue.h>
+#import <Matter/MTRBackwardsCompatShims.h>
#import <Matter/MTRBaseClusters.h>
#import <Matter/MTRBaseDevice.h>
#import <Matter/MTRCSRInfo.h>
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
index 6ff3a05..fda7cee 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
@@ -271,11 +271,15 @@
];
}
{{#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 576f811..8432e20 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -35,7 +35,14 @@
*/
- (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 @@
- (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 11ba013..169be4e 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt
@@ -261,11 +261,15 @@
];
}
{{#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<NSDictionary<NSString *, id> *> *)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 ef09d89..3285e3c 100644
--- a/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRClusters.zapt
@@ -30,7 +30,14 @@
{{#if (isSupported cluster command=command)}}
- (void){{asLowerCamelCase name}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField}}_Nullable{{/unless}})params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _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<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:({{>command_completion_type command=.}})completion {{availability cluster command=command minimalRelease="First major API revamp"}};
+- (void){{asLowerCamelCase name}}WithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)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 @@
(isSupported cluster command=command))}}
- (void){{asLowerCamelCase command}}WithParams:(MTR{{cluster}}Cluster{{command}}Params * {{#unless commandHasRequiredField}}_Nullable{{/unless}})params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _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<NSDictionary<NSString *, id> *> *)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 638a000..cd76e06 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 <lib/core/TLV.h>
#include <app/data-model/Decode.h>
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 1d98350..7775c92 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 9fc4140..b2f1787 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -7226,10 +7226,13 @@
*
* 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 @@
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 3163200..09ba8a2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -43825,7 +43825,12 @@
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 @@
invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue));
}
}
- {
- using ListType_0 = std::remove_reference_t<decltype(request.groupKeySetIDs)>;
- using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
- if (params.groupKeySetIDs.count != 0) {
- auto * listHolder_0 = new ListHolder<ListMemberType_0>(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 @@
{
[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 42084ce..a3eb25e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -2560,12 +2560,17 @@
expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _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<NSDictionary<NSString *, id> *> * _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<NSDictionary<NSString *, id> *> *)expectedValues
+ expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+ completion:
+ (void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
+ NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE;
- (NSDictionary<NSString *, id> *)readAttributeGroupKeyMapWithParams:(MTRReadParams * _Nullable)params
API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -11191,7 +11196,7 @@
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<NSDictionary<NSString *, id> *> * _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 8d4eb48..ed4e065 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -12151,7 +12151,18 @@
}
}
-- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
+- (void)keySetReadAllIndicesWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)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<NSDictionary<NSString *, id> *> *)expectedValues
expectedValueInterval:(NSNumber *)expectedValueIntervalMs
completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data,
@@ -12200,28 +12211,6 @@
invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue));
}
}
- {
- using ListType_0 = std::remove_reference_t<decltype(request.groupKeySetIDs)>;
- using ListMemberType_0 = ListMemberTypeGetter<ListType_0>::Type;
- if (params.groupKeySetIDs.count != 0) {
- auto * listHolder_0 = new ListHolder<ListMemberType_0>(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 @@
expectedValueInterval:expectedValueIntervalMs
completion:completionHandler];
}
-- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams *)params
+- (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params
expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _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 d6da7ce..9f48034 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))
@interface MTRGroupKeyManagementClusterKeySetReadAllIndicesParams : NSObject <NSCopying>
-
-@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 f06b96b..b4d0b6a 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 @@
- (instancetype)init
{
if (self = [super init]) {
-
- _groupKeySetIDs = [NSArray array];
_timedInvokeTimeoutMs = nil;
_serverSideProcessingTimeout = nil;
}
@@ -6309,7 +6308,6 @@
{
auto other = [[MTRGroupKeyManagementClusterKeySetReadAllIndicesParams alloc] init];
- other.groupKeySetIDs = self.groupKeySetIDs;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -6318,8 +6316,7 @@
- (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 1c9833a..3848ed6 100644
--- a/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m
+++ b/src/darwin/Framework/CHIPTests/MTRBackwardsCompatTests.m
@@ -1196,6 +1196,15 @@
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 d93ddc7..dd96371 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 = "<group>"; };
51E51FBD282AD37A00FC978D /* MTRDeviceControllerStartupParams_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerStartupParams_Internal.h; sourceTree = "<group>"; };
51E51FBE282AD37A00FC978D /* MTRDeviceControllerStartupParams.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRDeviceControllerStartupParams.mm; sourceTree = "<group>"; };
+ 51EF279E2A2A3EB100E33F75 /* MTRBackwardsCompatShims.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRBackwardsCompatShims.h; sourceTree = "<group>"; };
5A60370727EA1FF60020DB79 /* MTRClusterStateCacheContainer+XPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MTRClusterStateCacheContainer+XPC.h"; sourceTree = "<group>"; };
5A6FEC8B27B5609C00F25F42 /* MTRDeviceOverXPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDeviceOverXPC.h; sourceTree = "<group>"; };
5A6FEC8D27B5624E00F25F42 /* MTRDeviceControllerOverXPC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRDeviceControllerOverXPC.h; sourceTree = "<group>"; };
@@ -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 ce1d322..f7d66af 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 @@
{
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 @@
}
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 0be27be..12a4669 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 @@
namespace KeySetReadAllIndices {
enum class Fields : uint8_t
{
- kGroupKeySetIDs = 0,
};
struct Type
@@ -13087,8 +13086,6 @@
static constexpr CommandId GetCommandId() { return Commands::KeySetReadAllIndices::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
- DataModel::List<const uint16_t> groupKeySetIDs;
-
CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
using ResponseType = Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::DecodableType;
@@ -13102,7 +13099,6 @@
static constexpr CommandId GetCommandId() { return Commands::KeySetReadAllIndices::Id; }
static constexpr ClusterId GetClusterId() { return Clusters::GroupKeyManagement::Id; }
- DataModel::DecodableList<uint16_t> 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 0d62742..60cff01 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 @@
{
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 @@
private:
chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest;
- TypedComplexArgument<chip::app::DataModel::List<const uint16_t>> 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 1bb3a2f..65b78d4 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 @@
{
public:
TestGroupKeyManagementClusterSuite(CredentialIssuerCommands * credsIssuerConfig) :
- TestCommand("TestGroupKeyManagementCluster", 47, credsIssuerConfig)
+ TestCommand("TestGroupKeyManagementCluster", 48, credsIssuerConfig)
{
AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
AddArgument("cluster", &mCluster);
@@ -95057,19 +95057,29 @@
}
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<
chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
@@ -95097,7 +95107,7 @@
}
}
break;
- case 17:
+ case 18:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95142,7 +95152,7 @@
}
}
break;
- case 18:
+ case 19:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95171,7 +95181,7 @@
}
}
break;
- case 19:
+ case 20:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95216,7 +95226,7 @@
}
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
break;
- case 26:
+ case 27:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95413,7 +95423,7 @@
}
}
break;
- case 27:
+ case 28:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95440,7 +95450,7 @@
}
}
break;
- case 28:
+ case 29:
VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
{
chip::app::DataModel::DecodableList<
@@ -95523,13 +95533,13 @@
}
}
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 @@
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 @@
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 @@
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 @@
}
}
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 @@
}
}
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));
@@ -95674,6 +95681,9 @@
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<
chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::DecodableType>
@@ -95689,10 +95699,10 @@
}
}
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 @@
);
}
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<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
@@ -95967,8 +95986,8 @@
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<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
@@ -96038,8 +96057,8 @@
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<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
@@ -96069,8 +96088,8 @@
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<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
@@ -96100,28 +96119,28 @@
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");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
- GroupKeyManagement::Attributes::GroupKeyMap::Id, false, chip::NullOptional);
- }
case 18: {
- LogStep(18, "Read Group Keys on beta");
+ 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 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 @@
);
}
- 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 @@
);
}
- 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 @@
);
}
- 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 @@
);
}
- 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 @@
);
}
- 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");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
- GroupKeyManagement::Attributes::GroupTable::Id, false, chip::NullOptional);
- }
case 27: {
- LogStep(27, "Read GroupTable from beta");
+ LogStep(27, "Read GroupTable from alpha without fabric filtering");
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+ GroupKeyManagement::Attributes::GroupTable::Id, false, chip::NullOptional);
+ }
+ 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 @@
);
}
- 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,19 +96229,8 @@
);
}
- case 31: {
- LogStep(31, "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;
- value.groupKeySetID = 418U;
- return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
- value, chip::NullOptional
-
- );
- }
case 32: {
- LogStep(32, "KeySet Read (not removed) TrustFirst");
+ 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;
@@ -96233,46 +96241,8 @@
);
}
case 33: {
- LogStep(33, "Remove Group 1");
- ListFreer listFreer;
- chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
- value.groupID = 257U;
- return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
- chip::NullOptional
-
- );
- }
- case 34: {
- LogStep(34, "Read GroupTable 2");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
- GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional);
- }
- case 35: {
- LogStep(35, "Remove All");
- ListFreer listFreer;
- chip::app::Clusters::Groups::Commands::RemoveAllGroups::Type value;
- return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveAllGroups::Id, value,
- chip::NullOptional
-
- );
- }
- case 36: {
- LogStep(36, "Read GroupTable 3");
- return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
- GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional);
- }
- case 37: {
- LogStep(37, "KeySet Remove 2");
- ListFreer listFreer;
- chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value;
- value.groupKeySetID = 418U;
- return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
- GroupKeyManagement::Commands::KeySetRemove::Id, value, chip::NullOptional
-
- );
- }
- case 38: {
- LogStep(38, "KeySet Read (also removed)");
+ 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;
value.groupKeySetID = 418U;
@@ -96281,8 +96251,57 @@
);
}
+ case 34: {
+ LogStep(34, "Remove Group 1");
+ ListFreer listFreer;
+ chip::app::Clusters::Groups::Commands::RemoveGroup::Type value;
+ value.groupID = 257U;
+ return SendCommand(kIdentityAlpha, GetEndpoint(1), Groups::Id, Groups::Commands::RemoveGroup::Id, value,
+ chip::NullOptional
+
+ );
+ }
+ case 35: {
+ LogStep(35, "Read GroupTable 2");
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+ GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional);
+ }
+ 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,
+ chip::NullOptional
+
+ );
+ }
+ case 37: {
+ LogStep(37, "Read GroupTable 3");
+ return ReadAttribute(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+ GroupKeyManagement::Attributes::GroupTable::Id, true, chip::NullOptional);
+ }
+ case 38: {
+ LogStep(38, "KeySet Remove 2");
+ ListFreer listFreer;
+ chip::app::Clusters::GroupKeyManagement::Commands::KeySetRemove::Type value;
+ value.groupKeySetID = 418U;
+ return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id,
+ GroupKeyManagement::Commands::KeySetRemove::Id, value, chip::NullOptional
+
+ );
+ }
case 39: {
- LogStep(39, "KeySet Write 1");
+ LogStep(39, "KeySet Read (also removed)");
+ ListFreer listFreer;
+ chip::app::Clusters::GroupKeyManagement::Commands::KeySetRead::Type value;
+ value.groupKeySetID = 418U;
+ return SendCommand(kIdentityAlpha, GetEndpoint(0), GroupKeyManagement::Id, GroupKeyManagement::Commands::KeySetRead::Id,
+ value, chip::NullOptional
+
+ );
+ }
+ case 40: {
+ LogStep(40, "KeySet Write 1");
ListFreer listFreer;
chip::app::Clusters::GroupKeyManagement::Commands::KeySetWrite::Type value;
@@ -96316,8 +96335,8 @@
);
}
- 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 @@
);
}
- 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 @@
);
}
- 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<const chip::app::Clusters::GroupKeyManagement::Structs::GroupKeyMapStruct::Type> value;
@@ -96415,8 +96434,8 @@
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 @@
);
}
- 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 @@
);
}
- 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 e7a2726..398e234 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 @@
public:
GroupKeyManagementKeySetReadAllIndices()
: ClusterCommand("key-set-read-all-indices")
- , mComplex_GroupKeySetIDs(&mRequest.groupKeySetIDs)
{
- AddArgument("GroupKeySetIDs", &mComplex_GroupKeySetIDs);
ClusterCommand::AddArguments();
}
@@ -37236,15 +37234,6 @@
__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 @@
}
private:
- chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndices::Type mRequest;
- TypedComplexArgument<chip::app::DataModel::List<const uint16_t>> 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 ac96423..b84f964 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 @@
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");
- if (ShouldSkip("GRPKEY.S.F00")) {
- NextTest();
- return;
- }
- err = TestKeySetReadNotRemovedCacheAndSync_31();
+ ChipLogProgress(chipTool, " ***** Test Step 31 : KeySet Read (removed)\n");
+ err = TestKeySetReadRemoved_31();
break;
case 32:
- ChipLogProgress(chipTool, " ***** Test Step 32 : KeySet Read (not removed) TrustFirst\n");
+ ChipLogProgress(chipTool, " ***** Test Step 32 : KeySet Read (not removed) CacheAndSync\n");
if (ShouldSkip("GRPKEY.S.F00")) {
NextTest();
return;
}
- err = TestKeySetReadNotRemovedTrustFirst_32();
+ err = TestKeySetReadNotRemovedCacheAndSync_32();
break;
case 33:
- ChipLogProgress(chipTool, " ***** Test Step 33 : Remove Group 1\n");
- err = TestRemoveGroup1_33();
- break;
- case 34:
- ChipLogProgress(chipTool, " ***** Test Step 34 : Read GroupTable 2\n");
- err = TestReadGroupTable2_34();
- break;
- case 35:
- ChipLogProgress(chipTool, " ***** Test Step 35 : Remove All\n");
- err = TestRemoveAll_35();
- break;
- case 36:
- ChipLogProgress(chipTool, " ***** Test Step 36 : Read GroupTable 3\n");
- err = TestReadGroupTable3_36();
- break;
- case 37:
- ChipLogProgress(chipTool, " ***** Test Step 37 : KeySet Remove 2\n");
- err = TestKeySetRemove2_37();
- break;
- case 38:
- ChipLogProgress(chipTool, " ***** Test Step 38 : KeySet Read (also removed)\n");
- err = TestKeySetReadAlsoRemoved_38();
- break;
- case 39:
- ChipLogProgress(chipTool, " ***** Test Step 39 : KeySet Write 1\n");
- err = TestKeySetWrite1_39();
- break;
- case 40:
- ChipLogProgress(chipTool, " ***** Test Step 40 : KeySet Write 2 CacheAndSync\n");
+ ChipLogProgress(chipTool, " ***** Test Step 33 : KeySet Read (not removed) TrustFirst\n");
if (ShouldSkip("GRPKEY.S.F00")) {
NextTest();
return;
}
- err = TestKeySetWrite2CacheAndSync_40();
+ err = TestKeySetReadNotRemovedTrustFirst_33();
+ break;
+ case 34:
+ ChipLogProgress(chipTool, " ***** Test Step 34 : Remove Group 1\n");
+ err = TestRemoveGroup1_34();
+ break;
+ case 35:
+ ChipLogProgress(chipTool, " ***** Test Step 35 : Read GroupTable 2\n");
+ err = TestReadGroupTable2_35();
+ break;
+ case 36:
+ ChipLogProgress(chipTool, " ***** Test Step 36 : Remove All\n");
+ err = TestRemoveAll_36();
+ break;
+ case 37:
+ ChipLogProgress(chipTool, " ***** Test Step 37 : Read GroupTable 3\n");
+ err = TestReadGroupTable3_37();
+ break;
+ case 38:
+ ChipLogProgress(chipTool, " ***** Test Step 38 : KeySet Remove 2\n");
+ err = TestKeySetRemove2_38();
+ break;
+ case 39:
+ ChipLogProgress(chipTool, " ***** Test Step 39 : KeySet Read (also removed)\n");
+ err = TestKeySetReadAlsoRemoved_39();
+ break;
+ case 40:
+ ChipLogProgress(chipTool, " ***** Test Step 40 : KeySet Write 1\n");
+ err = TestKeySetWrite1_40();
break;
case 41:
- ChipLogProgress(chipTool, " ***** Test Step 41 : KeySet Write 2 TrustFirst\n");
+ ChipLogProgress(chipTool, " ***** Test Step 41 : KeySet Write 2 CacheAndSync\n");
+ if (ShouldSkip("GRPKEY.S.F00")) {
+ NextTest();
+ return;
+ }
+ err = TestKeySetWrite2CacheAndSync_41();
+ break;
+ 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 @@
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 @@
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 @@
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 @@
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 @@
private:
std::atomic_uint16_t mTestIndex;
- const uint16_t mTestCount = 47;
+ const uint16_t mTestCount = 48;
chip::Optional<chip::NodeId> mNodeId;
chip::Optional<chip::CharSpan> mCluster;
@@ -144524,7 +144531,32 @@
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 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestWriteGroupKeysTooMany_13()
+ CHIP_ERROR TestWriteGroupKeysTooMany_14()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -144659,7 +144691,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestWriteGroupKeysOnAlpha_14()
+ CHIP_ERROR TestWriteGroupKeysOnAlpha_15()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -144705,7 +144737,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestWriteGroupKeysOnBeta_15()
+ CHIP_ERROR TestWriteGroupKeysOnBeta_16()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -144751,7 +144783,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupKeysOnAlpha_16()
+ CHIP_ERROR TestReadGroupKeysOnAlpha_17()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -144813,7 +144845,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupKeysOnAlphaWithoutFabricFiltering_17()
+ CHIP_ERROR TestReadGroupKeysOnAlphaWithoutFabricFiltering_18()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -144907,7 +144939,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupKeysOnBeta_18()
+ CHIP_ERROR TestReadGroupKeysOnBeta_19()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -144969,7 +145001,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupKeysOnBetaWithoutFabricFiltering_19()
+ CHIP_ERROR TestReadGroupKeysOnBetaWithoutFabricFiltering_20()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -145063,7 +145095,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestAddGroup1_20()
+ CHIP_ERROR TestAddGroup1_21()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145095,7 +145127,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestAddGroup2_21()
+ CHIP_ERROR TestAddGroup2_22()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145127,7 +145159,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestAddGroup3_22()
+ CHIP_ERROR TestAddGroup3_23()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145159,7 +145191,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestAddGroup4_23()
+ CHIP_ERROR TestAddGroup4_24()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145191,7 +145223,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestAddGroup5_24()
+ CHIP_ERROR TestAddGroup5_25()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -145223,7 +145255,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTableFromAlpha_25()
+ CHIP_ERROR TestReadGroupTableFromAlpha_26()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145312,7 +145344,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTableFromAlphaWithoutFabricFiltering_26()
+ CHIP_ERROR TestReadGroupTableFromAlphaWithoutFabricFiltering_27()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145416,7 +145448,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTableFromBeta_27()
+ CHIP_ERROR TestReadGroupTableFromBeta_28()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -145460,7 +145492,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTableFromBetaWithoutFabricFiltering_28()
+ CHIP_ERROR TestReadGroupTableFromBetaWithoutFabricFiltering_29()
{
MTRBaseDevice * device = GetDevice("beta");
@@ -145564,7 +145596,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetRemove1_29()
+ CHIP_ERROR TestKeySetRemove1_30()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145587,7 +145619,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetReadRemoved_30()
+ CHIP_ERROR TestKeySetReadRemoved_31()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145614,7 +145646,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetReadNotRemovedCacheAndSync_31()
+ CHIP_ERROR TestKeySetReadNotRemovedCacheAndSync_32()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145665,7 +145697,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetReadNotRemovedTrustFirst_32()
+ CHIP_ERROR TestKeySetReadNotRemovedTrustFirst_33()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145716,7 +145748,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestRemoveGroup1_33()
+ CHIP_ERROR TestRemoveGroup1_34()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145747,7 +145779,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTable2_34()
+ CHIP_ERROR TestReadGroupTable2_35()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145821,7 +145853,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestRemoveAll_35()
+ CHIP_ERROR TestRemoveAll_36()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145839,7 +145871,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestReadGroupTable3_36()
+ CHIP_ERROR TestReadGroupTable3_37()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145868,7 +145900,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetRemove2_37()
+ CHIP_ERROR TestKeySetRemove2_38()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145891,7 +145923,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetReadAlsoRemoved_38()
+ CHIP_ERROR TestKeySetReadAlsoRemoved_39()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145918,7 +145950,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetWrite1_39()
+ CHIP_ERROR TestKeySetWrite1_40()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145958,7 +145990,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetWrite2CacheAndSync_40()
+ CHIP_ERROR TestKeySetWrite2CacheAndSync_41()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -145998,7 +146030,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestKeySetWrite2TrustFirst_41()
+ CHIP_ERROR TestKeySetWrite2TrustFirst_42()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -146038,7 +146070,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_42()
+ CHIP_ERROR TestMapGroup1AndGroup2ToKeySet1AndGroup2ToKeySet2_43()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -146079,7 +146111,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestRemoveKeyset1_43()
+ CHIP_ERROR TestRemoveKeyset1_44()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -146102,7 +146134,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_44()
+ CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet1HaveBeenRemoved_45()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -146140,7 +146172,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestRemoveKeyset2_45()
+ CHIP_ERROR TestRemoveKeyset2_46()
{
MTRBaseDevice * device = GetDevice("alpha");
@@ -146163,7 +146195,7 @@
return CHIP_NO_ERROR;
}
- CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_46()
+ CHIP_ERROR TestThVerifiesGroupKeyMapEntriesForKeySet2HaveBeenRemoved_47()
{
MTRBaseDevice * device = GetDevice("alpha");
