DM: update 1.5 data model files for SVE (project-chip#41341)

* Remove Q phase 3 from the in progress defines

* Update data model files for 1.5

* device types are provisional if clients are provisional

* Fix up spec parsing for conditions

* fix linter

* linter and mypy

* whoops

* Add workaround for water heater

* Update root node device type on lock

Author: cecille

data_model/1.5/clusters/BasicInformationCluster.xml

@@ -83,7 +83,7 @@ Davis, CA 95616, USA
       <item value="3" name="Teal" summary="Approximately RGB #008080.">
         <mandatoryConform/>
       </item>
-      <item value="4" name="Maroon" summary="Approximately RGB #800080.">
+      <item value="4" name="Maroon" summary="Approximately RGB #800000.">
         <mandatoryConform/>
       </item>
       <item value="5" name="Purple" summary="Approximately RGB #800080.">

data_model/1.5/clusters/BridgedDeviceBasicInformationCluster.xml

@@ -88,7 +88,7 @@ Davis, CA 95616, USA
       <item value="3" name="Teal" summary="Approximately RGB #008080.">
         <mandatoryConform/>
       </item>
-      <item value="4" name="Maroon" summary="Approximately RGB #800080.">
+      <item value="4" name="Maroon" summary="Approximately RGB #800000.">
         <mandatoryConform/>
       </item>
       <item value="5" name="Purple" summary="Approximately RGB #800080.">

data_model/1.5/clusters/CommodityMetering.xml

@@ -107,6 +107,9 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <quality nullable="true"/>
       <mandatoryConform/>
+      <constraint>
+        <min value="1"/>
+      </constraint>
     </attribute>
   </attributes>
 </cluster>

data_model/1.5/clusters/DiagnosticLogsCluster.xml

@@ -83,7 +83,7 @@ Davis, CA 95616, USA
       <item value="0" name="Success" summary="Successful transfer of logs">
         <mandatoryConform/>
       </item>
-      <item value="1" name="Exhausted" summary="All logs has been transferred">
+      <item value="1" name="Exhausted" summary="All logs have been transferred">
         <mandatoryConform/>
       </item>
       <item value="2" name="NoLogs" summary="No logs of the requested type available">

data_model/1.5/clusters/DiagnosticsGeneral.xml

@@ -60,7 +60,7 @@ Davis, CA 95616, USA
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0033" name="General Diagnostics Cluster" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial revision"/>
-    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command, added DMTEST feature."/>
+    <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command, added DMTEST feature"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0033" name="General Diagnostics"/>

data_model/1.5/clusters/DoorLock.xml

@@ -125,10 +125,10 @@ Davis, CA 95616, USA
     <feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
       <optionalConform/>
     </feature>
-    <feature bit="13" code="ALIRO" name="AliroProvisioning" summary="Lock supports Aliro credential provisioning as defined in [Aliro&amp;#93;">
+    <feature bit="13" code="ALIRO" name="AliroProvisioning" summary="Lock supports Aliro credential provisioning as defined in Aliro">
       <optionalConform/>
     </feature>
-    <feature bit="14" code="ALBU" name="AliroBLEUWB" summary="Lock supports the Bluetooth LE + UWB Access Control Flow as defined in [Aliro&amp;#93;">
+    <feature bit="14" code="ALBU" name="AliroBLEUWB" summary="Lock supports the Bluetooth LE + UWB Access Control Flow as defined in Aliro">
       <optionalConform>
         <feature name="ALIRO"/>
       </optionalConform>
@@ -215,17 +215,17 @@ Davis, CA 95616, USA
           <feature name="FACE"/>
         </mandatoryConform>
       </item>
-      <item value="6" name="AliroCredentialIssuerKey" summary="A Credential Issuer public key as defined in [Aliro&amp;#93;">
+      <item value="6" name="AliroCredentialIssuerKey" summary="A Credential Issuer public key as defined in Aliro">
         <mandatoryConform>
           <feature name="ALIRO"/>
         </mandatoryConform>
       </item>
-      <item value="7" name="AliroEvictableEndpointKey" summary="An Endpoint public key as defined in [Aliro&amp;#93; which can be evicted if space is needed for another endpoint key">
+      <item value="7" name="AliroEvictableEndpointKey" summary="An Endpoint public key as defined in Aliro which can be evicted if space is needed for another endpoint key">
         <mandatoryConform>
           <feature name="ALIRO"/>
         </mandatoryConform>
       </item>
-      <item value="8" name="AliroNonEvictableEndpointKey" summary="An Endpoint public key as defined in [Aliro&amp;#93; which cannot be evicted if space is needed for another endpoint key">
+      <item value="8" name="AliroNonEvictableEndpointKey" summary="An Endpoint public key as defined in Aliro which cannot be evicted if space is needed for another endpoint key">
         <mandatoryConform>
           <feature name="ALIRO"/>
         </mandatoryConform>
@@ -509,7 +509,7 @@ Davis, CA 95616, USA
           <feature name="USR"/>
         </optionalConform>
       </item>
-      <item value="10" name="Aliro" summary="Lock/unlock operation came from an interaction defined in [Aliro&amp;#93;, or user change operation was a step-up credential provisioning as defined in [Aliro&amp;#93;">
+      <item value="10" name="Aliro" summary="Lock/unlock operation came from an interaction defined in Aliro, or user change operation was a step-up credential provisioning as defined in Aliro">
         <mandatoryConform>
           <feature name="ALIRO"/>
         </mandatoryConform>

data_model/1.5/clusters/FanControl.xml

@@ -57,14 +57,13 @@ 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="0x0202" name="Fan Control Cluster" revision="6">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control Cluster" revision="5">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
     <revision revision="3" summary="Addition of AirflowDirection and Step command"/>
     <revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
     <revision revision="5" summary="Clarified attribute usage, added conformance column"/>
-    <revision revision="6" summary="Added Q quality for PercentCurrent and SpeedCurrent"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0202" name="Fan Control"/>
@@ -216,7 +215,6 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0003" name="PercentCurrent" type="percent">
       <access read="true" readPrivilege="view"/>
-      <quality quieterReporting="true"/>
       <mandatoryConform/>
       <constraint>
         <max value="100"/>
@@ -249,7 +247,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0006" name="SpeedCurrent" type="uint8">
       <access read="true" readPrivilege="view"/>
-      <quality reportable="true" quieterReporting="true"/>
+      <quality reportable="true"/>
       <mandatoryConform>
         <feature name="SPD"/>
       </mandatoryConform>

data_model/1.5/clusters/GeneralCommissioningCluster.xml

@@ -70,6 +70,12 @@ Davis, CA 95616, USA
     <feature bit="0" code="TC" name="TermsAndConditions" summary="Supports Terms &amp; Conditions acknowledgement">
       <optionalConform/>
     </feature>
+    <feature bit="1" code="NR" name="NetworkRecovery" summary="Supports Network Recovery">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </feature>
   </features>
   <dataTypes>
     <enum name="CommissioningErrorEnum">
@@ -104,6 +110,17 @@ Davis, CA 95616, USA
         </mandatoryConform>
       </item>
     </enum>
+    <enum name="NetworkRecoveryReasonEnum">
+      <item value="0" name="Unspecified" summary="Unspecified / unknown reason of network failure">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Auth" summary="Credentials for the configured operational network are not valid">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Visibility" summary="Configured network cannot be found (e.g. the device cannot see the configured Wi-Fi SSID, Thread end-node is unable to find a parent router on the PAN)">
+        <mandatoryConform/>
+      </item>
+    </enum>
     <enum name="RegulatoryLocationTypeEnum">
       <item value="0" name="Indoor" summary="Indoor only">
         <mandatoryConform/>
@@ -195,6 +212,29 @@ Davis, CA 95616, USA
         <feature name="TC"/>
       </mandatoryConform>
     </attribute>
+    <attribute id="0x000A" name="RecoveryIdentifier" type="octstr" default="0">
+      <access read="true" readPrivilege="manage"/>
+      <quality persistence="nonVolatile"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="NR"/>
+        </mandatoryConform>
+      </otherwiseConform>
+      <constraint>
+        <allowed value="8"/>
+      </constraint>
+    </attribute>
+    <attribute id="0x000B" name="NetworkRecoveryReason" type="NetworkRecoveryReasonEnum" default="null">
+      <access read="true" readPrivilege="manage"/>
+      <quality nullable="true"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="NR"/>
+        </mandatoryConform>
+      </otherwiseConform>
+    </attribute>
     <attribute id="0x000C" name="IsCommissioningWithoutPower" type="bool" default="false">
       <access read="true" readPrivilege="view"/>
       <otherwiseConform>

data_model/1.5/clusters/Group-Key-Management-Cluster.xml

@@ -129,50 +129,42 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
       <field id="1" name="GroupKeySecurityPolicy" type="GroupKeySecurityPolicyEnum">
-        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="EpochKey0" type="octstr">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
         <constraint>
           <allowed value="16"/>
         </constraint>
       </field>
       <field id="3" name="EpochStartTime0" type="epoch-us">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="EpochKey1" type="octstr">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
         <constraint>
           <allowed value="16"/>
         </constraint>
       </field>
       <field id="5" name="EpochStartTime1" type="epoch-us">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="6" name="EpochKey2" type="octstr">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
         <constraint>
           <allowed value="16"/>
         </constraint>
       </field>
       <field id="7" name="EpochStartTime2" type="epoch-us">
-        <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
       <field id="8" name="GroupKeyMulticastPolicy" type="GroupKeyMulticastPolicyEnum">
-        <access fabricSensitive="true"/>
         <otherwiseConform>
           <provisionalConform/>
           <mandatoryConform/>

data_model/1.5/clusters/JointFabricDatastoreCluster.xml

@@ -635,6 +635,7 @@ Davis, CA 95616, USA
         </constraint>
       </field>
       <field id="5" name="GroupPermission" type="DatastoreAccessControlEntryPrivilegeEnum">
+        <quality nullable="true"/>
         <mandatoryConform/>
       </field>
     </command>