Skip to content

Commit

Permalink
DM xmls: Scrape spec from Dec. 18 using new tools (#31082)
Browse files Browse the repository at this point in the history
* DM xmls: Scrape spec from Dec. 18 using new tools

* Manual fix to concentration meansure cluster

New scraper has an error here, and this is going to cause the tests
to fail. Manual fix for now, see:
https://github.com/csa-data-model/projects/issues/390
  • Loading branch information
cecille authored and pull[bot] committed Feb 14, 2024
1 parent 7b20e9b commit d2101fb
Show file tree
Hide file tree
Showing 124 changed files with 3,864 additions and 2,722 deletions.
207 changes: 207 additions & 0 deletions data_model/ValveConfigurationControl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). 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.
Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
nontransferable, worldwide, limited and revocable license (without the right to
sublicense), under Connectivity Standards Alliance's applicable copyright
rights, to view, download, save, reproduce and use the document solely for your
own internal purposes and in accordance with the terms of the license set forth
herein. This license does not authorize you to, and you expressly warrant that
you shall not: (a) permit others (outside your organization) to use this
document; (b) post or publish this document; (c) modify, adapt, translate, or
otherwise change this document in any manner or create any derivative work
based on this document; (d) remove or modify any notice or label on this
document, including this Copyright Notice, License and Disclaimer. The
Connectivity Standards Alliance does not grant you any license hereunder other
than as expressly stated herein.
Elements of this document may be subject to third party intellectual property
rights, including without limitation, patent, copyright or trademark rights,
and any such third party may or may not be a member of the Connectivity
Standards Alliance. Connectivity Standards Alliance members grant other
Connectivity Standards Alliance members certain intellectual property rights as
set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
Standards Alliance members do not grant you any rights under this license. The
Connectivity Standards Alliance is not responsible for, and shall not be held
responsible in any manner for, identifying or failing to identify any or all
such third party intellectual property rights. Please visit www.csa-iot.org for
more information on how to become a member of the Connectivity Standards
Alliance.
This document and the information contained herein are provided on an “AS IS”
basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
LOSS OR DAMAGE.
All company, brand and product names in this document may be trademarks that
are the sole property of their respective owners.
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
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0081" name="Valve Configuration and Control" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<classification hierarchy="base" role="application" picsCode="VALCC" scope="Endpoint"/>
<features>
<feature bit="0" code="TS" name="TimeSync" summary="UTC time is used for time indications"/>
<feature bit="1" code="LVL" name="Level" summary="Device supports setting the specific position of the valve">
<optionalConform/>
</feature>
</features>
<dataTypes>
<enum name="Status Codes" type="status"/>
<enum name="ValveStateEnum">
<item value="0" name="Closed" summary="Valve is in closed position">
<mandatoryConform/>
</item>
<item value="1" name="Open" summary="Valve is in open position">
<mandatoryConform/>
</item>
<item value="2" name="Transitioning" summary="Valve is transitioning between closed and open positions or between levels">
<mandatoryConform/>
</item>
</enum>
<bitmap name="ValveFaultBitmap">
<bitfield name="GeneralFault" bit="0" summary="Unspecified fault detected">
<mandatoryConform/>
</bitfield>
<bitfield name="Blocked" bit="1" summary="Valve is blocked">
<mandatoryConform/>
</bitfield>
<bitfield name="Leaking" bit="2" summary="Valve has detected a leak">
<mandatoryConform/>
</bitfield>
<bitfield name="NotConnected" bit="3" summary="No valve is connected to controller">
<mandatoryConform/>
</bitfield>
<bitfield name="ShortCircuit" bit="4" summary="Short circuit is detected">
<mandatoryConform/>
</bitfield>
<bitfield name="CurrentExceeded" bit="5" summary="The available current has been exceeded">
<mandatoryConform/>
</bitfield>
</bitmap>
</dataTypes>
<attributes>
<attribute id="0x0000" name="OpenDuration" type="elapsed-s" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
<constraint type="min" value="1"/>
</attribute>
<attribute id="0x0001" name="DefaultOpenDuration" type="elapsed-s" default="null">
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
<mandatoryConform/>
<constraint type="min" value="1"/>
</attribute>
<attribute id="0x0002" name="AutoCloseTime" type="epoch-us" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="TS"/>
</mandatoryConform>
</attribute>
<attribute id="0x0003" name="RemainingDuration" type="elapsed-s" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0004" name="CurrentState" type="ValveStateEnum" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0005" name="TargetState" type="ValveStateEnum" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0006" name="CurrentLevel" type="percent" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="LVL"/>
</mandatoryConform>
</attribute>
<attribute id="0x0007" name="TargetLevel" type="percent" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<mandatoryConform>
<feature name="LVL"/>
</mandatoryConform>
</attribute>
<attribute id="0x0008" name="DefaultOpenLevel" type="percent" default="100">
<access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
<optionalConform>
<feature name="LVL"/>
</optionalConform>
<constraint type="between" from="1" to="100"/>
</attribute>
<attribute id="0x0009" name="ValveFault" type="ValveFaultBitmap" default="0">
<access read="true" readPrivilege="view"/>
<optionalConform/>
</attribute>
</attributes>
<commands>
<command id="0x00" name="Open" response="Y">
<access invokePrivilege="operate"/>
<mandatoryConform/>
<field id="0" name="OpenDuration" type="elapsed-s">
<quality nullable="true"/>
<optionalConform/>
<constraint type="min" value="1"/>
</field>
<field id="1" name="TargetLevel" type="percent">
<optionalConform>
<feature name="LVL"/>
</optionalConform>
<constraint type="min" value="1"/>
</field>
</command>
<command id="0x01" name="Close" response="Y">
<access invokePrivilege="operate"/>
<mandatoryConform/>
</command>
</commands>
<events>
<event id="0x00" name="ValveStateChanged" priority="info">
<access readPrivilege="view"/>
<optionalConform/>
<field id="0" name="ValveState" type="ValveStateEnum">
<mandatoryConform/>
</field>
<field id="1" name="ValveLevel" type="percent">
<mandatoryConform>
<feature name="LVL"/>
</mandatoryConform>
</field>
</event>
<event id="0x01" name="ValveFault" priority="info">
<access readPrivilege="view"/>
<optionalConform/>
<field id="0" name="ValveFault" type="ValveFaultBitmap">
<mandatoryConform/>
</field>
</event>
</events>
</cluster>
20 changes: 11 additions & 9 deletions data_model/clusters/ACL-Cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001f" name="AccessControl" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="AccessControl" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand All @@ -76,7 +76,7 @@ Davis, CA 95616, USA
<item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
<mandatoryConform/>
</item>
<item value="2" name="Proxy View" summary="Can read and observe all (as seen by a Proxy)">
<item value="2" name="Proxy" summary="Can read and observe all (as seen by a Proxy)">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
Expand Down Expand Up @@ -112,25 +112,27 @@ Davis, CA 95616, USA
<access fabricSensitive="true"/>
<mandatoryConform/>
</field>
<field id="3" name="Subjects" type="&lt;&lt;ref_DataTypeList&gt;&gt;[&lt;&lt;ref_SubjectId&gt;&gt;]">
<field id="3" name="Subjects" type="ref_DataTypeList[SubjectID]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="SubjectsPerAccessControlEntry"/>
</field>
<field id="4" name="Targets" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlTargetStruct Type]">
<field id="4" name="Targets" type="ref_DataTypeList[AccessControlTargetStruct Type]">
<access fabricSensitive="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="max" value="TargetsPerAccessControlEntry"/>
</field>
<access fabricScoped="true"/>
</struct>
<struct name="AccessControlExtensionStruct">
<field id="1" name="Data" type="&lt;&lt;ref_DataTypeOctstr&gt;&gt;">
<field id="1" name="Data" type="ref_DataTypeOctstr">
<access fabricSensitive="true"/>
<mandatoryConform/>
<constraint type="max" value="128"/>
</field>
<access fabricScoped="true"/>
</struct>
<struct name="AccessControlTargetStruct">
<field id="0" name="Cluster" type="cluster-id">
Expand All @@ -148,13 +150,13 @@ Davis, CA 95616, USA
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="ACL" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlEntryStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<attribute id="0x0000" name="ACL" type="ref_DataTypeList[AccessControlEntryStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0001" name="Extension" type="&lt;&lt;ref_DataTypeList&gt;&gt;[AccessControlExtensionStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="operate"/>
<attribute id="0x0001" name="Extension" type="ref_DataTypeList[AccessControlExtensionStruct Type]" default="desc">
<access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
<optionalConform/>
<constraint type="desc"/>
</attribute>
Expand Down
97 changes: 41 additions & 56 deletions data_model/clusters/AccountLogin.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!--
Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
The information within this document is the property of the Connectivity
Expand Down Expand Up @@ -54,59 +54,44 @@ 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
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050e" name="Account Login" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
<commands>
<command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint type="lengthBetween" from="16" to="100"/>
</field>
</command>
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
<access invokePrivilege="operate" fabricScoped="true"/>
<mandatoryConform/>
<field id="0" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x02" name="Login" 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"/>
</field>
<field id="1" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="minLength" value="8"/>
</field>
<field id="2" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
<command id="0x03" name="Logout" response="Y">
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</command>
</commands>
<events>
<event id="0x00" name="LoggedOut" priority="critical">
<access fabricSensitive="true" invokePrivilege="admin"/>
<mandatoryConform/>
<field id="0" name="Node" type="node-id">
<optionalConform/>
</field>
</event>
</events>
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
<classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
<commands>
<command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
<access invokePrivilege="admin" fabricScoped="true" timed="true"/>
<mandatoryConform/>
<field id="0" name="TempAccountIdentifier" type="string">
<mandatoryConform/>
<constraint type="lengthBetween" from="16" to="100"/>
</field>
</command>
<command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
<access invokePrivilege="operate" fabricScoped="true"/>
<mandatoryConform/>
<field id="0" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x02" name="Login" 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"/>
</field>
<field id="1" name="SetupPIN" type="string">
<mandatoryConform/>
<constraint type="minLength" value="11"/>
</field>
</command>
<command id="0x03" name="Logout" response="Y">
<access invokePrivilege="operate" fabricScoped="true" timed="true"/>
<mandatoryConform/>
</command>
</commands>
</cluster>
Loading

0 comments on commit d2101fb

Please sign in to comment.