Skip to content

Commit

Permalink
DM XMLs: Update master to 0.7 of 1.5 and use alchemy
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@cecille
cecille committed Jan 30, 2025
1 parent abbab6a commit 9a03b17
Show file tree
Hide file tree
Showing 233 changed files with 14,883 additions and 4,227 deletions.
113 changes: 77 additions & 36 deletions data_model/master/clusters/ACL-Cluster.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
The information within this document is the property of the Connectivity
Standards Alliance and its use and disclosure are restricted, except as
expressly set forth herein.
Expand Down Expand Up @@ -54,14 +54,16 @@ This notice and disclaimer must be included on all copies of this document.
Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
:xrefstyle: basic
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control Cluster" revision="2">
<revisionHistory>
<revision revision="1" summary="Initial revision"/>
<revision revision="2" summary="Added Managed Device feature, Extension feature, fixed conformance"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x001F" name="AccessControl"/>
<clusterId id="0x001F" name="Access Control"/>
</clusterIds>
<classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
<features>
Expand All @@ -83,14 +85,11 @@ Davis, CA 95616, USA
</item>
</enum>
<enum name="AccessControlEntryPrivilegeEnum">
<item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
<item value="1" name="View" summary="Can read and observe all (except Access Control Cluster)">
<mandatoryConform/>
</item>
<item value="2" name="Proxy" summary="Can read and observe all (as seen by a Proxy)">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
<item value="2" name="ProxyView">
<deprecateConform/>
</item>
<item value="3" name="Operate" summary="View privileges, and can perform the primary function of this Node (except Access Control Cluster)">
<mandatoryConform/>
Expand Down Expand Up @@ -137,26 +136,36 @@ Davis, CA 95616, USA
<mandatoryConform/>
</field>
<field id="3" name="Subjects" type="list">
<entry type="SubjectID"/>
<entry type="subject-id"/>
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="maxCount" value="SubjectsPerAccessControlEntry"/>
<constraint>
<maxCount>
<attribute name="SubjectsPerAccessControlEntry"/>
</maxCount>
</constraint>
</field>
<field id="4" name="Targets" type="list">
<entry type="AccessControlTargetStruct"/>
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="maxCount" value="TargetsPerAccessControlEntry"/>
<constraint>
<maxCount>
<attribute name="TargetsPerAccessControlEntry"/>
</maxCount>
</constraint>
</field>
<access fabricScoped="true"/>
</struct>
<struct name="AccessControlExtensionStruct">
<field id="1" name="Data" type="octstr">
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="maxLength" value="128"/>
<constraint>
<maxLength value="128"/>
</constraint>
</field>
<access fabricScoped="true"/>
</struct>
Expand All @@ -183,11 +192,13 @@ Davis, CA 95616, USA
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="2" name="Restrictions" type="list" default="desc">
<field id="2" name="Restrictions" type="list">
<entry type="AccessRestrictionStruct"/>
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="minCount" value="1"/>
<constraint>
<minCount value="1"/>
</constraint>
</field>
<access fabricScoped="true"/>
</struct>
Expand All @@ -207,10 +218,12 @@ Davis, CA 95616, USA
<field id="1" name="Cluster" type="cluster-id">
<mandatoryConform/>
</field>
<field id="2" name="Restrictions" type="list" default="desc">
<field id="2" name="Restrictions" type="list">
<entry type="AccessRestrictionStruct"/>
<mandatoryConform/>
<constraint type="minCount" value="1"/>
<constraint>
<minCount value="1"/>
</constraint>
</field>
</struct>
</dataTypes>
Expand All @@ -219,50 +232,64 @@ Davis, CA 95616, USA
<entry type="AccessControlEntryStruct"/>
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</attribute>
<attribute id="0x0001" name="Extension" type="list" default="desc">
<entry type="AccessControlExtensionStruct"/>
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<mandatoryConform>
<feature name="EXTS"/>
</mandatoryConform>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</attribute>
<attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<quality persistence="fixed"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
<constraint>
<min value="4"/>
</constraint>
</attribute>
<attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16" default="3">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<quality persistence="fixed"/>
<mandatoryConform/>
<constraint type="min" value="3"/>
<constraint>
<min value="3"/>
</constraint>
</attribute>
<attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<quality persistence="fixed"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
<constraint>
<min value="4"/>
</constraint>
</attribute>
<attribute id="0x0005" name="CommissioningARL" type="list" default="[]">
<attribute id="0x0005" name="CommissioningARL" type="list" default="empty">
<entry type="CommissioningAccessRestrictionEntryStruct"/>
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<quality persistence="fixed"/>
<mandatoryConform>
<feature name="MNGD"/>
</mandatoryConform>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</attribute>
<attribute id="0x0006" name="ARL" type="list" default="[]">
<attribute id="0x0006" name="ARL" type="list" default="empty">
<entry type="AccessRestrictionEntryStruct"/>
<access read="true" readPrivilege="view" fabricScoped="true"/>
<mandatoryConform>
<feature name="MNGD"/>
</mandatoryConform>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</attribute>
</attributes>
<commands>
Expand All @@ -274,7 +301,9 @@ Davis, CA 95616, USA
<field id="0" name="ARL" type="list" default="desc">
<entry type="CommissioningAccessRestrictionEntryStruct"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
</command>
<command id="0x01" name="ReviewFabricRestrictionsResponse" direction="responseFromServer">
Expand All @@ -293,12 +322,16 @@ Davis, CA 95616, USA
<field id="1" name="AdminNodeID" type="node-id">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
<field id="2" name="AdminPasscodeID" type="uint16">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
<field id="3" name="ChangeType" type="ChangeTypeEnum">
<mandatoryConform/>
Expand All @@ -316,12 +349,16 @@ Davis, CA 95616, USA
<field id="1" name="AdminNodeID" type="node-id">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
<field id="2" name="AdminPasscodeID" type="uint16">
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
<field id="3" name="ChangeType" type="ChangeTypeEnum">
<mandatoryConform/>
Expand All @@ -341,11 +378,15 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Instruction" type="string">
<optionalConform/>
<constraint type="maxLength" value="512"/>
<constraint>
<maxLength value="512"/>
</constraint>
</field>
<field id="2" name="ARLRequestFlowUrl" type="string">
<optionalConform/>
<constraint type="maxLength" value="256"/>
<constraint>
<maxLength value="256"/>
</constraint>
</field>
</event>
</events>
Expand Down
24 changes: 19 additions & 5 deletions data_model/master/clusters/AccountLogin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
Copyright (C) Connectivity Standards Alliance (2025). All rights reserved.
The information within this document is the property of the Connectivity
Standards Alliance and its use and disclosure are restricted, except as
expressly set forth herein.
Expand Down Expand Up @@ -72,27 +72,41 @@ Davis, CA 95616, USA
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint type="lengthBetween" from="16" to="100"/>
<constraint>
<lengthBetween>
<from value="16"/>
<to value="100"/>
</lengthBetween>
</constraint>
</field>
</command>
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
<access fabricScoped="true"/>
<mandatoryConform/>
<field id="0" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="desc"/>
<constraint>
<desc/>
</constraint>
</field>
</command>
<command id="0x02" name="Login" direction="commandToServer" response="Y">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint type="lengthBetween" from="16" to="100"/>
<constraint>
<lengthBetween>
<from value="16"/>
<to value="100"/>
</lengthBetween>
</constraint>
</field>
<field id="1" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="minLength" value="8"/>
<constraint>
<minLength value="8"/>
</constraint>
</field>
<field id="2" name="Node" type="node-id">
<optionalConform/>
Expand Down
Loading

0 comments on commit 9a03b17

Please sign in to comment.