Skip to content

Commit cac9db8

Browse files
Update group key management and groupcast xml (project-chip#71594)
* Run alchemy on the groupcast and groupKey management cluster spec Re-run alchemy * Run Regen Re-run zap regen
1 parent b78e9a8 commit cac9db8

2 files changed

Lines changed: 32 additions & 17 deletions

File tree

src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ limitations under the License.
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/data_model/Group-Key-Management-Cluster.adoc
20-
Parameters: zap attribute=groupcast ignore-errored provisional-policy=loose sdkRoot=./connectedhomeip/ specRoot=./connectedhomeip-spec/ ./connectedhomeip-spec/src/data_model/Group-Key-Management-Cluster.adoc
21-
Git: 0.9-summer2026-485-g44151dd9d
22-
Alchemy: v1.6.12
20+
Parameters: zap attribute=in-progress sdkRoot=./connectedhomeip specRoot=./connectedhomeip-spec ./connectedhomeip-spec/src/data_model/Group-Key-Management-Cluster.adoc
21+
Git: 0.9.1-summer2026-171-gc3544bb02
22+
Alchemy: v1.6.13
2323
-->
2424
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2525
<domain name="CHIP"/>
@@ -75,11 +75,14 @@ Alchemy: v1.6.12
7575
<client init="false" tick="false">true</client>
7676
<server init="false" tick="false">true</server>
7777
<features>
78-
<feature bit="0" code="CS" name="CacheAndSync" summary="The ability to support CacheAndSync security policy and MCSP." apiMaturity="provisional">
78+
<feature bit="0" code="CS" name="CacheAndSync" summary="The ability to support CacheAndSync security policy and MCSP.">
7979
<provisionalConform/>
8080
</feature>
8181
<feature bit="1" code="GCAST" name="Groupcast" summary="The device supports groups using the Groupcast cluster.">
82-
<mandatoryConform/>
82+
<otherwiseConform>
83+
<provisionalConform/>
84+
<optionalConform/>
85+
</otherwiseConform>
8386
</feature>
8487
</features>
8588
<globalAttribute side="either" code="0xFFFD" value="3"/>
@@ -92,9 +95,12 @@ Alchemy: v1.6.12
9295
<attribute code="0x0004" side="server" name="GroupcastAdoption" define="GROUPCAST_ADOPTION" type="array" entryType="GroupcastAdoptionStruct" writable="true" optional="true">
9396
<access op="read" privilege="administer"/>
9497
<access op="write" privilege="administer"/>
95-
<mandatoryConform>
96-
<feature name="GCAST"/>
97-
</mandatoryConform>
98+
<otherwiseConform>
99+
<provisionalConform/>
100+
<mandatoryConform>
101+
<feature name="GCAST"/>
102+
</mandatoryConform>
103+
</otherwiseConform>
98104
</attribute>
99105
<command source="client" code="0x00" name="KeySetWrite" isFabricScoped="true" cli="zcl GroupKeyManagement KeySetWrite">
100106
<description>This command is used by Administrators to set the state of a given Group Key Set, including atomically updating the state of all epoch keys.</description>

src/app/zap-templates/zcl/data-model/chip/groupcast-cluster.xml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ limitations under the License.
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/service_device_management/Groupcast.adoc
20-
Parameters: zap specRoot ../connectedhomeip-spec sdkRoot ../../forks/connectedhomeip attribute=in-progress src/service_device_management/Groupcast.adoc
21-
Git: 0.9-summer2026-dirty
22-
Alchemy: v1.6.9
20+
Parameters: zap attribute=in-progress sdkRoot=./connectedhomeip specRoot=./connectedhomeip-spec ./connectedhomeip-spec/src/service_device_management/Groupcast.adoc
21+
Git: 0.9.1-summer2026-172-gd86458995
22+
Alchemy: v1.6.13
2323
-->
2424
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2525
<domain name="General"/>
@@ -50,7 +50,7 @@ Alchemy: v1.6.9
5050
<cluster code="0x0065"/>
5151
<item fieldId="0" name="GroupID" type="group_id" min="1"/>
5252
<item fieldId="1" name="Endpoints" array="true" type="endpoint_no" optional="true" length="255"/>
53-
<item fieldId="2" name="KeySetID" type="int16u" isFabricSensitive="true"/>
53+
<item fieldId="2" name="KeySetID" type="int16u" isFabricSensitive="true" min="1"/>
5454
<item fieldId="3" name="HasAuxiliaryACL" type="boolean" optional="true"/>
5555
<item fieldId="4" name="McastAddrPolicy" type="MulticastAddrPolicyEnum" default="0x00" max="0x01"/>
5656
</struct>
@@ -66,13 +66,22 @@ Alchemy: v1.6.9
6666
<globalAttribute code="0xFFFD" side="either" value="1"/>
6767
<features>
6868
<feature bit="0" code="LN" name="Listener" summary="Supports joining a multicast group of nodes as a listener.">
69-
<optionalConform choice="a" more="true" min="1"/>
69+
<otherwiseConform>
70+
<provisionalConform/>
71+
<optionalConform choice="a" more="true" min="1"/>
72+
</otherwiseConform>
7073
</feature>
7174
<feature bit="1" code="SD" name="Sender" summary="Supports sending multicast message to a targeted group of nodes.">
72-
<optionalConform choice="a" more="true" min="1"/>
75+
<otherwiseConform>
76+
<provisionalConform/>
77+
<optionalConform choice="a" more="true" min="1"/>
78+
</otherwiseConform>
7379
</feature>
7480
<feature bit="2" code="PGA" name="PerGroup" summary="Supports PerGroup multicast addresses.">
75-
<optionalConform/>
81+
<otherwiseConform>
82+
<provisionalConform/>
83+
<optionalConform/>
84+
</otherwiseConform>
7685
</feature>
7786
</features>
7887
<attribute code="0x0000" side="server" name="Membership" define="MEMBERSHIP" type="array" entryType="MembershipStruct">
@@ -110,7 +119,7 @@ Alchemy: v1.6.9
110119
<access op="invoke" privilege="manage"/>
111120
<arg fieldId="0" name="GroupID" type="group_id" min="1"/>
112121
<arg fieldId="1" name="Endpoints" array="true" type="endpoint_no"/>
113-
<arg fieldId="2" name="KeySetID" type="int16u"/>
122+
<arg fieldId="2" name="KeySetID" type="int16u" min="1"/>
114123
<arg fieldId="3" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
115124
<arg fieldId="4" name="UseAuxiliaryACL" type="boolean" optional="true"/>
116125
<arg fieldId="5" name="ReplaceEndpoints" type="boolean" optional="true"/>
@@ -146,7 +155,7 @@ Alchemy: v1.6.9
146155
<description>This command SHALL allow a fabric administrator to update the OperationalGroupKey associated with the existing group identified by GroupID, which is already joined.</description>
147156
<access op="invoke" privilege="manage"/>
148157
<arg fieldId="0" name="GroupID" type="group_id" min="1"/>
149-
<arg fieldId="1" name="KeySetID" type="int16u"/>
158+
<arg fieldId="1" name="KeySetID" type="int16u" min="1"/>
150159
<arg fieldId="2" name="Key" type="octet_string" optional="true" length="16" minLength="16"/>
151160
<otherwiseConform>
152161
<provisionalConform/>

0 commit comments

Comments
 (0)