From 06976c5c7c2eaf43cf7c0b48ad6531b108f17ef3 Mon Sep 17 00:00:00 2001
From: Mikhail Antropov <michail.antropov@dsr-corporation.com>
Date: Wed, 14 Aug 2024 22:30:47 +0300
Subject: [PATCH] Revert changes in data_model/1.3

---
 .../1.3/clusters/MeterIdentification.xml      | 130 ------------------
 data_model/1.3/clusters/cluster_ids.json      |   3 +-
 2 files changed, 1 insertion(+), 132 deletions(-)
 delete mode 100644 data_model/1.3/clusters/MeterIdentification.xml

diff --git a/data_model/1.3/clusters/MeterIdentification.xml b/data_model/1.3/clusters/MeterIdentification.xml
deleted file mode 100644
index 1ed47d5d3da3af..00000000000000
--- a/data_model/1.3/clusters/MeterIdentification.xml
+++ /dev/null
@@ -1,130 +0,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
-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
-
-:xrefstyle: short
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0B06" name="Meter Identification Cluster" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial version"/>
-  </revisionHistory>
-  <clusterIds>
-    <clusterId id="0x0B06" name="Meter Identification"/>
-  </clusterIds>
-  <classification hierarchy="base" role="application" picsCode="MTRID" scope="Endpoint"/>
-  <features>
-    <feature bit="0" code="PWRTHLD" name="PowerThreshold" summary="Supports information about power threshold">
-      <optionalConform/>
-    </feature>
-  </features>
-  <dataTypes>
-    <enum name="MeterTypeEnum">
-      <item value="0x00" name="Utility" summary="Utility Meter">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Private" summary="Private Meter">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Generic" summary="Generic Meter">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <enum name="PowerThresholdSourceEnum">
-      <item value="0x00" name="Contract" summary="The value comes from a signed contract">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Regulator" summary="The value comes from a legal regulator">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Equipment" summary="The value comes from a certified limits of the meter">
-        <mandatoryConform/>
-      </item>
-    </enum>
-  </dataTypes>
-  <attributes>
-    <attribute id="0x0000" name="MeterType" type="MeterTypeEnum" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-    </attribute>
-    <attribute id="0x0001" name="UtilityName" type="string" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0002" name="PointOfDelivery" type="string" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0003" name="PowerThreshold" type="power-mW" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="PWRTHLD"/>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0004" name="PowerThresholdSource" type="PowerThresholdSourceEnum" default="null">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform>
-        <feature name="PWRTHLD"/>
-      </mandatoryConform>
-    </attribute>
-  </attributes>
-</cluster>
\ No newline at end of file
diff --git a/data_model/1.3/clusters/cluster_ids.json b/data_model/1.3/clusters/cluster_ids.json
index 213133d7a8f941..82a258ee0c6d7f 100644
--- a/data_model/1.3/clusters/cluster_ids.json
+++ b/data_model/1.3/clusters/cluster_ids.json
@@ -107,6 +107,5 @@
     "1293": "Application Basic",
     "1294": "Account Login",
     "1295": "Content Control",
-    "1296": "Content App Observer",
-    "2822": "Meter Identification"
+    "1296": "Content App Observer"
 }