Skip to content

Commit 63f9782

Browse files
cecillerestyled-commits
cecille
and
restyled-commits
authored
DM XMLs: 1.5 0.7 ballot (project-chip#37329)
* Fix line endings for master DM XMLs * Add newline at end of file for master DM XMLs * Add closures as a file exception - device types all in one file * DM XMLs: Update master to 0.7 of 1.5 and use alchemy Note that this contains a significant number of changes in one commit, and I apologise for that, but the new spec cannot be scraped with the DM editor, so I needed to swap to alchemy to get the new spec scraped. Hence this contains both the alchemy formatting changes (as outlined in project-chip#37201 as well as the changes from the last ballot to the current ballot. * Update file list in build file * Fix unit tests to expect clusters removed in 1.5 * Update device type parsing to warn on non-int IDs rather than failing This happens on ID-TBD in the ballot. * Add test to ensure all spec device types are OK. * Add a stringifier to XmlFeature XmlCommand * Restyled by autopep8 * Restyled by isort --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 21a5cf5 commit 63f9782

File tree

237 files changed

+25532
-14785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+25532
-14785
lines changed

‎data_model/master/clusters/ACL-Cluster.xml

+132-91
Large diffs are not rendered by default.

‎data_model/master/clusters/AccountLogin.xml

+76-62
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
<?xml version="1.0"?>
2-
<!--
3-
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
4-
The information within this document is the property of the Connectivity
5-
Standards Alliance and its use and disclosure are restricted, except as
6-
expressly set forth herein.
7-
8-
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9-
nontransferable, worldwide, limited and revocable license (without the right to
10-
sublicense), under Connectivity Standards Alliance's applicable copyright
11-
rights, to view, download, save, reproduce and use the document solely for your
12-
own internal purposes and in accordance with the terms of the license set forth
13-
herein. This license does not authorize you to, and you expressly warrant that
14-
you shall not: (a) permit others (outside your organization) to use this
15-
document; (b) post or publish this document; (c) modify, adapt, translate, or
16-
otherwise change this document in any manner or create any derivative work
17-
based on this document; (d) remove or modify any notice or label on this
18-
document, including this Copyright Notice, License and Disclaimer. The
19-
Connectivity Standards Alliance does not grant you any license hereunder other
20-
than as expressly stated herein.
21-
22-
Elements of this document may be subject to third party intellectual property
23-
rights, including without limitation, patent, copyright or trademark rights,
24-
and any such third party may or may not be a member of the Connectivity
25-
Standards Alliance. Connectivity Standards Alliance members grant other
26-
Connectivity Standards Alliance members certain intellectual property rights as
27-
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28-
Standards Alliance members do not grant you any rights under this license. The
29-
Connectivity Standards Alliance is not responsible for, and shall not be held
30-
responsible in any manner for, identifying or failing to identify any or all
31-
such third party intellectual property rights. Please visit www.csa-iot.org for
32-
more information on how to become a member of the Connectivity Standards
33-
Alliance.
34-
35-
This document and the information contained herein are provided on an “AS IS”
36-
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38-
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39-
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40-
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41-
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42-
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43-
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44-
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45-
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46-
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47-
LOSS OR DAMAGE.
48-
49-
All company, brand and product names in this document may be trademarks that
50-
are the sole property of their respective owners.
51-
52-
This notice and disclaimer must be included on all copies of this document.
53-
54-
Connectivity Standards Alliance
55-
508 Second Street, Suite 206
56-
Davis, CA 95616, USA
57-
58-
:xrefstyle: basic
2+
<!--
3+
Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
4+
The information within this document is the property of the Connectivity
5+
Standards Alliance and its use and disclosure are restricted, except as
6+
expressly set forth herein.
7+
8+
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9+
nontransferable, worldwide, limited and revocable license (without the right to
10+
sublicense), under Connectivity Standards Alliance's applicable copyright
11+
rights, to view, download, save, reproduce and use the document solely for your
12+
own internal purposes and in accordance with the terms of the license set forth
13+
herein. This license does not authorize you to, and you expressly warrant that
14+
you shall not: (a) permit others (outside your organization) to use this
15+
document; (b) post or publish this document; (c) modify, adapt, translate, or
16+
otherwise change this document in any manner or create any derivative work
17+
based on this document; (d) remove or modify any notice or label on this
18+
document, including this Copyright Notice, License and Disclaimer. The
19+
Connectivity Standards Alliance does not grant you any license hereunder other
20+
than as expressly stated herein.
21+
22+
Elements of this document may be subject to third party intellectual property
23+
rights, including without limitation, patent, copyright or trademark rights,
24+
and any such third party may or may not be a member of the Connectivity
25+
Standards Alliance. Connectivity Standards Alliance members grant other
26+
Connectivity Standards Alliance members certain intellectual property rights as
27+
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28+
Standards Alliance members do not grant you any rights under this license. The
29+
Connectivity Standards Alliance is not responsible for, and shall not be held
30+
responsible in any manner for, identifying or failing to identify any or all
31+
such third party intellectual property rights. Please visit www.csa-iot.org for
32+
more information on how to become a member of the Connectivity Standards
33+
Alliance.
34+
35+
This document and the information contained herein are provided on an “AS IS”
36+
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38+
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39+
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40+
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41+
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42+
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43+
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44+
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45+
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46+
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47+
LOSS OR DAMAGE.
48+
49+
All company, brand and product names in this document may be trademarks that
50+
are the sole property of their respective owners.
51+
52+
This notice and disclaimer must be included on all copies of this document.
53+
54+
Connectivity Standards Alliance
55+
508 Second Street, Suite 206
56+
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5959
-->
6060
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login Cluster" revision="2">
6161
<revisionHistory>
@@ -72,27 +72,41 @@ Davis, CA 95616, USA
7272
<mandatoryConform/>
7373
<field id="0" name="TempAccountIdentifier" type="string">
7474
<mandatoryConform/>
75-
<constraint type="lengthBetween" from="16" to="100"/>
75+
<constraint>
76+
<lengthBetween>
77+
<from value="16"/>
78+
<to value="100"/>
79+
</lengthBetween>
80+
</constraint>
7681
</field>
7782
</command>
7883
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
7984
<access fabricScoped="true"/>
8085
<mandatoryConform/>
8186
<field id="0" name="SetupPIN" type="string">
8287
<mandatoryConform/>
83-
<constraint type="desc"/>
88+
<constraint>
89+
<desc/>
90+
</constraint>
8491
</field>
8592
</command>
8693
<command id="0x02" name="Login" direction="commandToServer" response="Y">
8794
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
8895
<mandatoryConform/>
8996
<field id="0" name="TempAccountIdentifier" type="string">
9097
<mandatoryConform/>
91-
<constraint type="lengthBetween" from="16" to="100"/>
98+
<constraint>
99+
<lengthBetween>
100+
<from value="16"/>
101+
<to value="100"/>
102+
</lengthBetween>
103+
</constraint>
92104
</field>
93105
<field id="1" name="SetupPIN" type="string">
94106
<mandatoryConform/>
95-
<constraint type="minLength" value="8"/>
107+
<constraint>
108+
<minLength value="8"/>
109+
</constraint>
96110
</field>
97111
<field id="2" name="Node" type="node-id">
98112
<optionalConform/>
@@ -115,4 +129,4 @@ Davis, CA 95616, USA
115129
</field>
116130
</event>
117131
</events>
118-
</cluster>
132+
</cluster>

‎data_model/master/clusters/AdminCommissioningCluster.xml

+95-64
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
11
<?xml version="1.0"?>
2-
<!--
3-
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
4-
The information within this document is the property of the Connectivity
5-
Standards Alliance and its use and disclosure are restricted, except as
6-
expressly set forth herein.
7-
8-
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9-
nontransferable, worldwide, limited and revocable license (without the right to
10-
sublicense), under Connectivity Standards Alliance's applicable copyright
11-
rights, to view, download, save, reproduce and use the document solely for your
12-
own internal purposes and in accordance with the terms of the license set forth
13-
herein. This license does not authorize you to, and you expressly warrant that
14-
you shall not: (a) permit others (outside your organization) to use this
15-
document; (b) post or publish this document; (c) modify, adapt, translate, or
16-
otherwise change this document in any manner or create any derivative work
17-
based on this document; (d) remove or modify any notice or label on this
18-
document, including this Copyright Notice, License and Disclaimer. The
19-
Connectivity Standards Alliance does not grant you any license hereunder other
20-
than as expressly stated herein.
21-
22-
Elements of this document may be subject to third party intellectual property
23-
rights, including without limitation, patent, copyright or trademark rights,
24-
and any such third party may or may not be a member of the Connectivity
25-
Standards Alliance. Connectivity Standards Alliance members grant other
26-
Connectivity Standards Alliance members certain intellectual property rights as
27-
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28-
Standards Alliance members do not grant you any rights under this license. The
29-
Connectivity Standards Alliance is not responsible for, and shall not be held
30-
responsible in any manner for, identifying or failing to identify any or all
31-
such third party intellectual property rights. Please visit www.csa-iot.org for
32-
more information on how to become a member of the Connectivity Standards
33-
Alliance.
34-
35-
This document and the information contained herein are provided on an “AS IS”
36-
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38-
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39-
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40-
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41-
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42-
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43-
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44-
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45-
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46-
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47-
LOSS OR DAMAGE.
48-
49-
All company, brand and product names in this document may be trademarks that
50-
are the sole property of their respective owners.
51-
52-
This notice and disclaimer must be included on all copies of this document.
53-
54-
Connectivity Standards Alliance
55-
508 Second Street, Suite 206
56-
Davis, CA 95616, USA
2+
<!--
3+
Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
4+
The information within this document is the property of the Connectivity
5+
Standards Alliance and its use and disclosure are restricted, except as
6+
expressly set forth herein.
7+
8+
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
9+
nontransferable, worldwide, limited and revocable license (without the right to
10+
sublicense), under Connectivity Standards Alliance's applicable copyright
11+
rights, to view, download, save, reproduce and use the document solely for your
12+
own internal purposes and in accordance with the terms of the license set forth
13+
herein. This license does not authorize you to, and you expressly warrant that
14+
you shall not: (a) permit others (outside your organization) to use this
15+
document; (b) post or publish this document; (c) modify, adapt, translate, or
16+
otherwise change this document in any manner or create any derivative work
17+
based on this document; (d) remove or modify any notice or label on this
18+
document, including this Copyright Notice, License and Disclaimer. The
19+
Connectivity Standards Alliance does not grant you any license hereunder other
20+
than as expressly stated herein.
21+
22+
Elements of this document may be subject to third party intellectual property
23+
rights, including without limitation, patent, copyright or trademark rights,
24+
and any such third party may or may not be a member of the Connectivity
25+
Standards Alliance. Connectivity Standards Alliance members grant other
26+
Connectivity Standards Alliance members certain intellectual property rights as
27+
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
28+
Standards Alliance members do not grant you any rights under this license. The
29+
Connectivity Standards Alliance is not responsible for, and shall not be held
30+
responsible in any manner for, identifying or failing to identify any or all
31+
such third party intellectual property rights. Please visit www.csa-iot.org for
32+
more information on how to become a member of the Connectivity Standards
33+
Alliance.
34+
35+
This document and the information contained herein are provided on an “AS IS”
36+
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
37+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
38+
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
39+
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
40+
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
41+
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
42+
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
43+
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
44+
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
45+
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
46+
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
47+
LOSS OR DAMAGE.
48+
49+
All company, brand and product names in this document may be trademarks that
50+
are the sole property of their respective owners.
51+
52+
This notice and disclaimer must be included on all copies of this document.
53+
54+
Connectivity Standards Alliance
55+
508 Second Street, Suite 206
56+
Davis, CA 95616, USA
57+
58+
:xrefstyle: basic
5759
-->
5860
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003C" name="Administrator Commissioning Cluster" revision="1">
5961
<revisionHistory>
@@ -82,7 +84,17 @@ Davis, CA 95616, USA
8284
</mandatoryConform>
8385
</item>
8486
</enum>
85-
<enum name="Status Codes" type="status"/>
87+
<enum name="StatusCodeEnum">
88+
<item value="0x02" name="Busy" summary="Could not be completed because another commissioning is in progress">
89+
<mandatoryConform/>
90+
</item>
91+
<item value="0x03" name="PAKEParameterError" summary="Provided PAKE parameters were incorrectly formatted or otherwise invalid">
92+
<mandatoryConform/>
93+
</item>
94+
<item value="0x04" name="WindowNotOpen" summary="No commissioning window was currently open">
95+
<mandatoryConform/>
96+
</item>
97+
</enum>
8698
</dataTypes>
8799
<attributes>
88100
<attribute id="0x0000" name="WindowStatus" type="CommissioningWindowStatusEnum">
@@ -91,12 +103,12 @@ Davis, CA 95616, USA
91103
</attribute>
92104
<attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
93105
<access read="true" readPrivilege="view"/>
94-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
106+
<quality nullable="true"/>
95107
<mandatoryConform/>
96108
</attribute>
97109
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
98110
<access read="true" readPrivilege="view"/>
99-
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
111+
<quality nullable="true"/>
100112
<mandatoryConform/>
101113
</attribute>
102114
</attributes>
@@ -106,22 +118,39 @@ Davis, CA 95616, USA
106118
<mandatoryConform/>
107119
<field id="0" name="CommissioningTimeout" type="uint16">
108120
<mandatoryConform/>
109-
<constraint type="desc"/>
121+
<constraint>
122+
<desc/>
123+
</constraint>
110124
</field>
111125
<field id="1" name="PAKEPasscodeVerifier" type="octstr">
112126
<mandatoryConform/>
113127
</field>
114128
<field id="2" name="Discriminator" type="uint16">
115129
<mandatoryConform/>
116-
<constraint type="between" from="0" to="4095"/>
130+
<constraint>
131+
<between>
132+
<from value="0"/>
133+
<to value="4095"/>
134+
</between>
135+
</constraint>
117136
</field>
118137
<field id="3" name="Iterations" type="uint32">
119138
<mandatoryConform/>
120-
<constraint type="between" from="1000" to="100000"/>
139+
<constraint>
140+
<between>
141+
<from value="1000"/>
142+
<to value="100000"/>
143+
</between>
144+
</constraint>
121145
</field>
122146
<field id="4" name="Salt" type="octstr">
123147
<mandatoryConform/>
124-
<constraint type="lengthBetween" from="16" to="32"/>
148+
<constraint>
149+
<lengthBetween>
150+
<from value="16"/>
151+
<to value="32"/>
152+
</lengthBetween>
153+
</constraint>
125154
</field>
126155
</command>
127156
<command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
@@ -131,12 +160,14 @@ Davis, CA 95616, USA
131160
</mandatoryConform>
132161
<field id="0" name="CommissioningTimeout" type="uint16">
133162
<mandatoryConform/>
134-
<constraint type="desc"/>
163+
<constraint>
164+
<desc/>
165+
</constraint>
135166
</field>
136167
</command>
137168
<command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
138169
<access invokePrivilege="admin" timed="true"/>
139170
<mandatoryConform/>
140171
</command>
141172
</commands>
142-
</cluster>
173+
</cluster>

0 commit comments

Comments
 (0)