Update data_model scraped XML version to latest spec and scraper (project-chip#32170)

* Ran scraper 1.2.4 on the latest spec version

* Add in-progress scraping

* Remove odd comment parts from NetworkCommissioningCluster.xml

* Removed old files, re-generated new ones

* Remove comments again

* Remove the cluster suffix in names of clusters

* Fix parsing error

* Fix direction logic

* Fix direction key

Author: andy31415

data_model/README.md

@@ -17,7 +17,7 @@ update the spec XML files, however this is not done automatically.
 You will require access to the following tools locally:
 
 -   `scraper`. A binary copy generally available
-    [here](https://github.com/csa-data-model/projects/tree/main/DM-Editor/bin/1.2.0/scrape)
+    [here](https://github.com/csa-data-model/projects/tree/main/DM-Editor/bin/scrape)
 -   Specification repository checkout from
     https://github.com/CHIP-Specifications/connectedhomeip-spec
 

data_model/clusters/ACL-Cluster.xml

@@ -55,10 +55,13 @@ 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="Access Control" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x001F" name="AccessControl"/>
+  </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
   <dataTypes>
     <enum name="AccessControlEntryAuthModeEnum">
@@ -112,25 +115,27 @@ Davis, CA 95616, USA
         <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
-      <field id="3" name="Subjects" type="ref_DataTypeList[SubjectID]">
+      <field id="3" name="Subjects" type="list">
+        <entry type="SubjectID"/>
         <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
-        <constraint type="max" value="SubjectsPerAccessControlEntry"/>
+        <constraint type="maxCount" value="SubjectsPerAccessControlEntry"/>
       </field>
-      <field id="4" name="Targets" type="ref_DataTypeList[AccessControlTargetStruct Type]">
+      <field id="4" name="Targets" type="list">
+        <entry type="AccessControlTargetStruct"/>
         <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
-        <constraint type="max" value="TargetsPerAccessControlEntry"/>
+        <constraint type="maxCount" value="TargetsPerAccessControlEntry"/>
       </field>
       <access fabricScoped="true"/>
     </struct>
     <struct name="AccessControlExtensionStruct">
-      <field id="1" name="Data" type="ref_DataTypeOctstr">
+      <field id="1" name="Data" type="octstr">
         <access fabricSensitive="true"/>
         <mandatoryConform/>
-        <constraint type="max" value="128"/>
+        <constraint type="maxLength" value="128"/>
       </field>
       <access fabricScoped="true"/>
     </struct>
@@ -150,12 +155,14 @@ Davis, CA 95616, USA
     </struct>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="ACL" type="ref_DataTypeList[AccessControlEntryStruct Type]" default="desc">
+    <attribute id="0x0000" name="ACL" type="list" default="desc">
+      <entry type="AccessControlEntryStruct"/>
       <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0001" name="Extension" type="ref_DataTypeList[AccessControlExtensionStruct Type]" default="desc">
+    <attribute id="0x0001" name="Extension" type="list" default="desc">
+      <entry type="AccessControlExtensionStruct"/>
       <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
       <optionalConform/>
       <constraint type="desc"/>

data_model/clusters/AccountLogin.xml

@@ -54,14 +54,20 @@ 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="0x050E" name="Account Login" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
+    <revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050E" name="Account Login"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
   <commands>
-    <command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
+    <command id="0x00" name="GetSetupPIN" direction="commandToServer" response="GetSetupPINResponse">
       <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
       <mandatoryConform/>
       <field id="0" name="TempAccountIdentifier" type="string">
@@ -70,14 +76,14 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
-      <access invokePrivilege="operate" fabricScoped="true"/>
+      <access fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="SetupPIN" type="string">
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x02" name="Login" response="Y">
+    <command id="0x02" name="Login" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
       <mandatoryConform/>
       <field id="0" name="TempAccountIdentifier" type="string">
@@ -86,12 +92,27 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="SetupPIN" type="string">
         <mandatoryConform/>
-        <constraint type="minLength" value="11"/>
+        <constraint type="minLength" value="8"/>
+      </field>
+      <field id="2" name="Node" type="node-id">
+        <optionalConform/>
       </field>
     </command>
-    <command id="0x03" name="Logout" response="Y">
+    <command id="0x03" name="Logout" direction="commandToServer" 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 readPrivilege="admin" fabricSensitive="true"/>
+      <optionalConform/>
+      <field id="0" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </event>
+  </events>
 </cluster>

data_model/clusters/AdminCommissioningCluster.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <!--
-link:../matter-defines.adoc[]
-
 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
@@ -61,6 +59,9 @@ Davis, CA 95616, USA
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x003C" name="Administrator Commissioning"/>
+  </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="CADMIN" scope="Node"/>
   <features>
     <feature bit="0" code="BC" name="Basic" summary="Node supports Basic Commissioning Method.">
@@ -93,21 +94,21 @@ Davis, CA 95616, USA
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0002" name="AdminVendorId" type="ref_DataTypeVendorId">
+    <attribute id="0x0002" name="AdminVendorId" type="vendor-id">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="OpenCommissioningWindow" response="Y">
+    <command id="0x00" name="OpenCommissioningWindow" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" timed="true"/>
       <mandatoryConform/>
       <field id="0" name="CommissioningTimeout" type="uint16">
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
-      <field id="1" name="PAKEPasscodeVerifier" type="ref_DataTypeOctstr">
+      <field id="1" name="PAKEPasscodeVerifier" type="octstr">
         <mandatoryConform/>
       </field>
       <field id="2" name="Discriminator" type="uint16">
@@ -118,12 +119,12 @@ Davis, CA 95616, USA
         <mandatoryConform/>
         <constraint type="between" from="1000" to="100000"/>
       </field>
-      <field id="4" name="Salt" type="ref_DataTypeOctstr">
+      <field id="4" name="Salt" type="octstr">
         <mandatoryConform/>
-        <constraint type="between" from="16" to="32"/>
+        <constraint type="lengthBetween" from="16" to="32"/>
       </field>
     </command>
-    <command id="0x01" name="OpenBasicCommissioningWindow" response="Y">
+    <command id="0x01" name="OpenBasicCommissioningWindow" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" timed="true"/>
       <mandatoryConform>
         <feature name="BC"/>
@@ -133,7 +134,7 @@ Davis, CA 95616, USA
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x02" name="RevokeCommissioning" response="Y">
+    <command id="0x02" name="RevokeCommissioning" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" timed="true"/>
       <mandatoryConform/>
     </command>

data_model/clusters/AirQuality.xml

@@ -54,11 +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="0x005B" name="Air Quality" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial version of the Air Quality cluster"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x005B" name="Air Quality"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="AIRQUAL" scope="Endpoint"/>
   <features>
     <feature bit="0" code="FAIR" name="Fair" summary="Cluster supports the Fair air quality level">

data_model/clusters/AlarmBase.xml

@@ -54,11 +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="" name="Alarm Base" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId name="Alarm Base"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="ALARM" scope="Endpoint"/>
   <features>
     <feature bit="0" code="RESET" name="Reset" summary="Supports the ability to reset alarms">
@@ -91,7 +96,7 @@ Davis, CA 95616, USA
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="Reset" response="Y">
+    <command id="0x00" name="Reset" direction="commandToServer" response="Y">
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <feature name="RESET"/>
@@ -100,7 +105,7 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x01" name="ModifyEnabledAlarms" response="Y">
+    <command id="0x01" name="ModifyEnabledAlarms" direction="commandToServer" response="Y">
       <access invokePrivilege="operate"/>
       <optionalConform/>
       <field id="0" name="Mask" type="AlarmBitmap" default="0">

data_model/clusters/ApplicationBasic.xml

@@ -54,11 +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="0x050D" name="Application Basic" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050D" name="Application Basic"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="APBSC" scope="Endpoint"/>
   <dataTypes>
     <enum name="ApplicationStatusEnum">

data_model/clusters/ApplicationLauncher.xml

@@ -54,11 +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="0x050C" name="Application Launcher" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050C" name="Application Launcher"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="APPLAUNCHER" scope="Endpoint"/>
   <features>
     <feature bit="0" code="AP" name="ApplicationPlatform" summary="Support for attributes and commands required for endpoint to support launching any application within the supported application catalogs">
@@ -111,7 +116,7 @@ Davis, CA 95616, USA
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="LaunchApp" response="LauncherResponse">
+    <command id="0x00" name="LaunchApp" direction="commandToServer" response="LauncherResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
       <field id="0" name="Application" type="ApplicationStruct">
@@ -124,7 +129,7 @@ Davis, CA 95616, USA
         <optionalConform/>
       </field>
     </command>
-    <command id="0x01" name="StopApp" response="LauncherResponse">
+    <command id="0x01" name="StopApp" direction="commandToServer" response="LauncherResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
       <field id="0" name="Application" type="ApplicationStruct" default="MS">
@@ -134,7 +139,7 @@ Davis, CA 95616, USA
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x02" name="HideApp" response="LauncherResponse">
+    <command id="0x02" name="HideApp" direction="commandToServer" response="LauncherResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
       <field id="0" name="Application" type="ApplicationStruct" default="MS">
@@ -145,7 +150,6 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x03" name="LauncherResponse" direction="responseFromServer">
-      <access invokePrivilege="operate"/>
       <mandatoryConform/>
       <field id="0" name="Status" type="StatusEnum">
         <mandatoryConform/>

data_model/clusters/AudioOutput.xml

@@ -54,11 +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="0x050B" name="Audio Output" revision="1">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x050B" name="Audio Output"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="AUDIOOUTPUT" scope="Endpoint"/>
   <features>
     <feature bit="0" code="NU" name="NameUpdates" summary="Supports updates to output names">
@@ -111,14 +116,14 @@ Davis, CA 95616, USA
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="SelectOutput" response="Y">
+    <command id="0x00" name="SelectOutput" direction="commandToServer" response="Y">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
       <field id="0" name="Index" type="uint8">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x01" name="RenameOutput" response="Y">
+    <command id="0x01" name="RenameOutput" direction="commandToServer" response="Y">
       <access invokePrivilege="manage"/>
       <mandatoryConform>
         <feature name="NU"/>

data_model/clusters/BallastConfiguration.xml

@@ -54,6 +54,8 @@ 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="0x0301" name="Ballast Configuration" revision="4">
   <revisionHistory>
@@ -62,6 +64,9 @@ Davis, CA 95616, USA
     <revision revision="3" summary="CCB 2881"/>
     <revision revision="4" summary="New data model format and notation"/>
   </revisionHistory>
+  <clusterIds>
+    <clusterId id="0x0301" name="Ballast Configuration"/>
+  </clusterIds>
   <classification hierarchy="base" role="application" picsCode="BC" scope="Endpoint"/>
   <dataTypes>
     <bitmap name="BallastStatusBitmap">