Skip to content

Commit fef41bd

Browse files
ethanzhouycethanzhouyc
authored
Revert "Revert Generate Conformance Data with Alchemy" and Remove Attribute Description (project-chip#36233)
* Revert "Revert "Generate Conformance Data with Alchemy (project-chip#36186)" (project-chip#36220)" This reverts commit a4a911c. * move attribute name - move attribute name from description to name inside attribute tag
1 parent d535b90 commit fef41bd

File tree

102 files changed

+6057
-2240
lines changed

Some content is hidden

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

102 files changed

+6057
-2240
lines changed

‎src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml

+40-11
Original file line numberDiff line numberDiff line change
@@ -109,33 +109,55 @@ limitations under the License.
109109
and enforce Access Control for the Node's endpoints and their associated
110110
cluster instances.</description>
111111

112-
<attribute side="server" code="0x0000" define="ACL" type="array" entryType="AccessControlEntryStruct" writable="true">
113-
<description>ACL</description>
112+
<attribute side="server" code="0x0000" name="ACL" define="ACL" type="array" entryType="AccessControlEntryStruct" writable="true">
114113
<access op="read" privilege="administer"/>
115114
<access op="write" privilege="administer"/>
115+
<mandatoryConform/>
116116
</attribute>
117117

118-
<attribute side="server" code="0x0001" define="EXTENSION" type="array" entryType="AccessControlExtensionStruct" writable="true" optional="true">
119-
<description>Extension</description>
118+
<attribute side="server" code="0x0001" name="Extension" define="EXTENSION" type="array" entryType="AccessControlExtensionStruct" writable="true" optional="true">
120119
<access op="read" privilege="administer"/>
121120
<access op="write" privilege="administer"/>
121+
<mandatoryConform>
122+
<feature name="EXTS"/>
123+
</mandatoryConform>
122124
</attribute>
123125

124-
<attribute side="server" code="0x0002" define="SUBJECTS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="4" default="4">SubjectsPerAccessControlEntry</attribute>
125-
<attribute side="server" code="0x0003" define="TARGETS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="3" default="3">TargetsPerAccessControlEntry</attribute>
126-
<attribute side="server" code="0x0004" define="ACCESS_CONTROL_ENTRIES_PER_FABRIC" type="int16u" min="4" default="4">AccessControlEntriesPerFabric</attribute>
127-
<attribute code="0x0005" side="server" define="COMMISSIONING_ARL" type="array" entryType="CommissioningAccessRestrictionEntryStruct" optional="true">CommissioningARL</attribute>
128-
<attribute code="0x0006" side="server" define="ARL" type="array" entryType="AccessRestrictionEntryStruct" optional="true">ARL</attribute>
129-
126+
<attribute side="server" code="0x0002" name="SubjectsPerAccessControlEntry" define="SUBJECTS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="4" default="4">
127+
<mandatoryConform/>
128+
</attribute>
129+
<attribute side="server" code="0x0003" name="TargetsPerAccessControlEntry" define="TARGETS_PER_ACCESS_CONTROL_ENTRY" type="int16u" min="3" default="3">
130+
<mandatoryConform/>
131+
</attribute>
132+
<attribute side="server" code="0x0004" name="AccessControlEntriesPerFabric" define="ACCESS_CONTROL_ENTRIES_PER_FABRIC" type="int16u" min="4" default="4">
133+
<mandatoryConform/>
134+
</attribute>
135+
<attribute code="0x0005" side="server" name="CommissioningARL" define="COMMISSIONING_ARL" type="array" entryType="CommissioningAccessRestrictionEntryStruct" optional="true">
136+
<mandatoryConform>
137+
<feature name="MNGD"/>
138+
</mandatoryConform>
139+
</attribute>
140+
<attribute code="0x0006" side="server" name="ARL" define="ARL" type="array" entryType="AccessRestrictionEntryStruct" optional="true">
141+
<mandatoryConform>
142+
<feature name="MNGD"/>
143+
</mandatoryConform>
144+
</attribute>
145+
130146
<command code="0x00" source="client" name="ReviewFabricRestrictions" isFabricScoped="true" optional="true" response="ReviewFabricRestrictionsResponse">
131147
<description>This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric.</description>
132148
<access op="invoke" privilege="administer"/>
133149
<arg id="0" name="ARL" array="true" type="CommissioningAccessRestrictionEntryStruct"/>
134-
</command>
150+
<mandatoryConform>
151+
<feature name="MNGD"/>
152+
</mandatoryConform>
153+
</command>
135154

136155
<command code="0x01" source="server" name="ReviewFabricRestrictionsResponse" optional="true" disableDefaultResponse="true">
137156
<description>Returns the review token for the request, which can be used to correlate with a FabricRestrictionReviewUpdate event.</description>
138157
<arg id="0" name="Token" type="int64u"/>
158+
<mandatoryConform>
159+
<feature name="MNGD"/>
160+
</mandatoryConform>
139161
</command>
140162

141163
<event side="server" code="0x0000" name="AccessControlEntryChanged" priority="info" isFabricSensitive="true">
@@ -145,6 +167,7 @@ limitations under the License.
145167
<field id="3" name="ChangeType" type="ChangeTypeEnum" min="0x00" max="0x02"/>
146168
<field id="4" name="LatestValue" type="AccessControlEntryStruct" isNullable="true"/>
147169
<access op="read" privilege="administer"/>
170+
<mandatoryConform/>
148171
</event>
149172

150173
<event side="server" code="0x0001" name="AccessControlExtensionChanged" priority="info" isFabricSensitive="true" optional="true">
@@ -154,6 +177,9 @@ limitations under the License.
154177
<field id="3" name="ChangeType" type="ChangeTypeEnum" min="0x00" max="0x02"/>
155178
<field id="4" name="LatestValue" type="AccessControlExtensionStruct" isNullable="true"/>
156179
<access op="read" privilege="administer"/>
180+
<mandatoryConform>
181+
<feature name="EXTS"/>
182+
</mandatoryConform>
157183
</event>
158184

159185
<event side="server" code="0x0002" name="FabricRestrictionReviewUpdate" priority="info" isFabricSensitive="true" optional="true">
@@ -162,6 +188,9 @@ limitations under the License.
162188
<field id="1" name="Instruction" type="long_char_string" optional="true" length="512"/>
163189
<field id="2" name="ARLRequestFlowUrl" type="long_char_string" optional="true" length="256"/>
164190
<access op="read" privilege="administer"/>
191+
<mandatoryConform>
192+
<feature name="MNGD"/>
193+
</mandatoryConform>
165194
</event>
166195
</cluster>
167196
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/account-login-cluster.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,31 +28,36 @@ limitations under the License.
2828

2929
<command source="client" code="0x00" name="GetSetupPIN" isFabricScoped="true" response="GetSetupPINResponse" mustUseTimedInvoke="true" optional="false">
3030
<description>Upon receipt, the Content App checks if the account associated with the client Temp Account Identifier Rotating ID is the same acount that is active on the given Content App. If the accounts are the same, then the Content App includes the Setup PIN in the GetSetupPIN Response.</description>
31-
<access op="invoke" role="administer" />
31+
<access op="invoke" role="administer"/>
3232
<arg name="TempAccountIdentifier" minLength="16" length="100" type="char_string"/>
33+
<mandatoryConform/>
3334
</command>
3435

3536
<command source="client" code="0x02" name="Login" isFabricScoped="true" mustUseTimedInvoke="true" optional="false">
3637
<description>Upon receipt, the Content App checks if the account associated with the client’s Temp Account Identifier (Rotating ID) has a current active Setup PIN with the given value. If the Setup PIN is valid for the user account associated with the Temp Account Identifier, then the Content App MAY make that user account active.</description>
37-
<access op="invoke" role="administer" />
38+
<access op="invoke" role="administer"/>
3839
<arg name="TempAccountIdentifier" minLength="16" length="100" type="char_string"/>
3940
<arg name="SetupPIN" minLength="8" type="char_string"/>
40-
<arg name="Node" type="node_id" optional="true" />
41+
<arg name="Node" type="node_id" optional="true"/>
42+
<mandatoryConform/>
4143
</command>
4244

4345
<command source="client" code="0x03" name="Logout" isFabricScoped="true" mustUseTimedInvoke="true" optional="false">
4446
<description>The purpose of this command is to instruct the Content App to clear the current user account. This command SHOULD be used by clients of a Content App to indicate the end of a user session.</description>
4547
<arg name="Node" type="node_id" optional="true"/>
48+
<mandatoryConform/>
4649
</command>
4750

4851
<command source="server" code="0x01" name="GetSetupPINResponse" optional="false" disableDefaultResponse="true">
4952
<description>This message is sent in response to the GetSetupPIN Request, and contains the Setup PIN code, or null when the accounts identified in the request does not match the active account of the running Content App.</description>
5053
<arg name="SetupPIN" type="char_string"/>
54+
<mandatoryConform/>
5155
</command>
5256

5357
<event side="server" code="0x00" priority="critical" name="LoggedOut" optional="false">
5458
<description>This event can be used by the Content App to indicate that the current user has logged out. In response to this event, the Fabric Admin SHALL remove access to this Content App by the specified Node. If no Node is provided, then the Fabric Admin SHALL remove access to all non-Admin Nodes.</description>
5559
<field id="0" name="Node" type="node_id" optional="true"/>
60+
<optionalConform/>
5661
</event>
5762

5863
</cluster>

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

+19-11
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,17 @@ limitations under the License.
8989
<code>0x0025</code>
9090
<define>ACTIONS_CLUSTER</define>
9191
<description>This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information.</description>
92-
93-
<attribute side="server" code="0x0000" define="ACTION_LIST" type="array" entryType="ActionStruct" length="256" writable="false" optional="false">ActionList</attribute>
94-
<attribute side="server" code="0x0001" define="ENDPOINT_LIST" type="array" entryType="EndpointListStruct" length="256" writable="false" optional="false">EndpointLists</attribute>
95-
<attribute side="server" code="0x0002" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" writable="false" optional="true">SetupURL</attribute>
96-
92+
93+
<attribute side="server" code="0x0000" name="ActionList" define="ACTION_LIST" type="array" entryType="ActionStruct" length="256">
94+
<mandatoryConform/>
95+
</attribute>
96+
<attribute side="server" code="0x0001" name="EndpointLists" define="ENDPOINT_LIST" type="array" entryType="EndpointListStruct" length="256">
97+
<mandatoryConform/>
98+
</attribute>
99+
<attribute side="server" code="0x0002" name="SetupURL" define="SETUP_URL" type="LONG_CHAR_STRING" length="512" optional="true">
100+
<optionalConform/>
101+
</attribute>
102+
97103
<command source="client" code="0x00" name="InstantAction" optional="true">
98104
<description>This command triggers an action (state change) on the involved endpoints.</description>
99105
<arg name="ActionID" type="int16u"/>
@@ -173,17 +179,19 @@ limitations under the License.
173179

174180
<event side="server" code="0x00" priority="info" name="StateChanged" optional="false">
175181
<description>This event SHALL be generated when there is a change in the Status of an ActionID.</description>
176-
<field id="0" name="ActionID" type="int16u" />
177-
<field id="1" name="InvokeID" type="int32u" />
182+
<field id="0" name="ActionID" type="int16u"/>
183+
<field id="1" name="InvokeID" type="int32u"/>
178184
<field id="2" name="NewState" type="ActionStateEnum" />
185+
<mandatoryConform/>
179186
</event>
180187

181188
<event side="server" code="0x01" priority="info" name="ActionFailed" optional="false">
182189
<description>This event SHALL be generated when there is some error which prevents the action from its normal planned execution.</description>
183-
<field id="0" name="ActionID" type="int16u" />
184-
<field id="1" name="InvokeID" type="int32u" />
185-
<field id="2" name="NewState" type="ActionStateEnum" />
186-
<field id="3" name="Error" type="ActionErrorEnum" />
190+
<field id="0" name="ActionID" type="int16u"/>
191+
<field id="1" name="InvokeID" type="int32u"/>
192+
<field id="2" name="NewState" type="ActionStateEnum"/>
193+
<field id="3" name="Error" type="ActionErrorEnum"/>
194+
<mandatoryConform/>
187195
</event>
188196

189197
</cluster>

‎src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml

+15-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,16 @@ limitations under the License.
4343
<optionalConform/>
4444
</feature>
4545
</features>
46-
<attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" writable="false" optional="false">WindowStatus</attribute>
47-
<attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" writable="false" isNullable="true" optional="false">AdminFabricIndex</attribute>
48-
<attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="vendor_id" writable="false" isNullable="true" optional="false">AdminVendorId</attribute>
49-
46+
<attribute side="server" code="0x0000" name="WindowStatus" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum">
47+
<mandatoryConform/>
48+
</attribute>
49+
<attribute side="server" code="0x0001" name="AdminFabricIndex" define="ADMIN_FABRIC_INDEX" type="fabric_idx" isNullable="true">
50+
<mandatoryConform/>
51+
</attribute>
52+
<attribute side="server" code="0x0002" name="AdminVendorId" define="ADMIN_VENDOR_ID" type="vendor_id" isNullable="true">
53+
<mandatoryConform/>
54+
</attribute>
55+
5056
<command source="client" code="0x00" name="OpenCommissioningWindow" mustUseTimedInvoke="true" optional="false">
5157
<description>This command is used by a current Administrator to instruct a Node to go into commissioning mode using enhanced commissioning method.</description>
5258
<arg name="CommissioningTimeout" type="int16u"/>
@@ -55,17 +61,22 @@ limitations under the License.
5561
<arg name="Iterations" type="int32u"/>
5662
<arg name="Salt" type="octet_string" length="32"/>
5763
<access op="invoke" privilege="administer"/>
64+
<mandatoryConform/>
5865
</command>
5966

6067
<command source="client" code="0x01" name="OpenBasicCommissioningWindow" mustUseTimedInvoke="true" optional="true">
6168
<description>This command is used by a current Administrator to instruct a Node to go into commissioning mode using basic commissioning method, if the node supports it.</description>
6269
<arg name="CommissioningTimeout" type="int16u"/>
6370
<access op="invoke" privilege="administer"/>
71+
<mandatoryConform>
72+
<feature name="BC"/>
73+
</mandatoryConform>
6474
</command>
6575

6676
<command source="client" code="0x02" name="RevokeCommissioning" mustUseTimedInvoke="true" optional="false">
6777
<description>This command is used by a current Administrator to instruct a Node to revoke any active Open Commissioning Window or Open Basic Commissioning Window command.</description>
6878
<access op="invoke" privilege="administer"/>
79+
<mandatoryConform/>
6980
</command>
7081

7182
</cluster>

‎src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ limitations under the License.
4141
</features>
4242

4343
<!-- Attributes -->
44-
<attribute side="server" code="0x0000" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" writable="false" isNullable="false" default="0" optional="false">AirQuality</attribute>
44+
<attribute side="server" code="0x0000" name="AirQuality" define="AIR_QUALITY" type="AirQualityEnum" min="0" max="6" default="0">
45+
<mandatoryConform/>
46+
</attribute>
4547
</cluster>
4648

4749
<!-- Cluster Data Types -->

‎src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml

+24-10
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,30 @@ limitations under the License.
2424
<client init="false" tick="false">true</client>
2525
<server init="false" tick="false">true</server>
2626
<description>This cluster provides information about an application running on a TV or media player device which is represented as an endpoint.</description>
27-
<attribute side="server" code="0x0000" define="APPLICATION_VENDOR_NAME" type="char_string" default="" length="32" writable="false" optional="true">VendorName</attribute>
28-
<attribute side="server" code="0x0001" define="APPLICATION_VENDOR_ID" type="vendor_id" default="0x0" min="0x0000" max="0xFFFF" writable="false" optional="true">VendorID</attribute>
29-
<attribute side="server" code="0x0002" define="APPLICATION_NAME" type="long_char_string" length="256" writable="false" optional="false">ApplicationName</attribute>
30-
<attribute side="server" code="0x0003" define="APPLICATION_PRODUCT_ID" type="int16u" default="0x0" min="0x0000" max="0xFFFF" writable="false" optional="true">ProductID</attribute>
31-
<attribute side="server" code="0x0004" define="APPLICATION_APP" type="ApplicationStruct" writable="false" optional="false">Application</attribute>
32-
<attribute side="server" code="0x0005" define="APPLICATION_STATUS" type="ApplicationStatusEnum" default="0x01" min="0x00" max="0xFF" writable="false" optional="false">Status</attribute>
33-
<attribute side="server" code="0x0006" define="APPLICATION_VERSION" type="char_string" length="32" writable="false" optional="false">ApplicationVersion</attribute>
34-
<attribute side="server" code="0x0007" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id" length="32" writable="false" optional="false">
35-
<description>AllowedVendorList</description>
36-
<access op="read" role="administer"/>
27+
<attribute side="server" code="0x0000" name="VendorName" define="APPLICATION_VENDOR_NAME" type="char_string" length="32" optional="true">
28+
<optionalConform/>
29+
</attribute>
30+
<attribute side="server" code="0x0001" name="VendorID" define="APPLICATION_VENDOR_ID" type="vendor_id" optional="true">
31+
<optionalConform/>
32+
</attribute>
33+
<attribute side="server" code="0x0002" name="ApplicationName" define="APPLICATION_NAME" type="long_char_string" length="256">
34+
<mandatoryConform/>
35+
</attribute>
36+
<attribute side="server" code="0x0003" name="ProductID" define="APPLICATION_PRODUCT_ID" type="int16u" optional="true">
37+
<optionalConform/>
38+
</attribute>
39+
<attribute side="server" code="0x0004" name="Application" define="APPLICATION_APP" type="ApplicationStruct">
40+
<mandatoryConform/>
41+
</attribute>
42+
<attribute side="server" code="0x0005" name="Status" define="APPLICATION_STATUS" type="ApplicationStatusEnum" default="0x01" min="0x00" max="0xFF">
43+
<mandatoryConform/>
44+
</attribute>
45+
<attribute side="server" code="0x0006" name="ApplicationVersion" define="APPLICATION_VERSION" type="char_string" length="32">
46+
<mandatoryConform/>
47+
</attribute>
48+
<attribute side="server" code="0x0007" name="AllowedVendorList" define="APPLICATION_ALLOWED_VENDOR_LIST" type="array" entryType="vendor_id" length="32">
49+
<access op="read" role="administer"/>
50+
<mandatoryConform/>
3751
</attribute>
3852

3953
</cluster>

0 commit comments

Comments
 (0)