[ICD] Remove key from ICD Management cluster (#29562)

* update cluster * Update Generated files * update tests
project-chip · Nov 3, 2023 · 2477049 · 2477049
1 parent 576e0d3
commit 2477049
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 121 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2408,7 +2408,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -1945,7 +1945,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -1676,7 +1676,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1558,7 +1558,6 @@ server cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -126,7 +126,6 @@ CHIP_ERROR IcdManagementAttributeAccess::ReadRegisteredClients(EndpointId endpoi
 
                 Structs::MonitoringRegistrationStruct::Type s{ .checkInNodeID    = e.checkInNodeID,
                                                                .monitoredSubject = e.monitoredSubject,
-                                                               .key              = e.key,
                                                                .fabricIndex      = e.fabricIndex };
                 ReturnErrorOnFailure(subEncoder.Encode(s));
             }

diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -167,17 +167,8 @@ tests:
       response:
           value:
               [
-                  {
-                      CheckInNodeID: 101,
-                      MonitoredSubject: 1001,
-                      Key: "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
-                  },
-                  {
-                      CheckInNodeID: 201,
-                      MonitoredSubject: 2001,
-                      Key:
-                          "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
-                  },
+                  { CheckInNodeID: 101, MonitoredSubject: 1001 },
+                  { CheckInNodeID: 201, MonitoredSubject: 2001 },
               ]
 
     - label: "Register 1.1"
@@ -201,17 +192,8 @@ tests:
       response:
           value:
               [
-                  {
-                      CheckInNodeID: 101,
-                      MonitoredSubject: 1002,
-                      Key: "\x01\x11\x21\x31\x41\x51\x61\x71\x81\x91\xa1\xb1\xc1\xd1\xe1\xf1",
-                  },
-                  {
-                      CheckInNodeID: 201,
-                      MonitoredSubject: 2001,
-                      Key:
-                          "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f",
-                  },
+                  { CheckInNodeID: 101, MonitoredSubject: 1002 },
+                  { CheckInNodeID: 201, MonitoredSubject: 2001 },
               ]
 
     - label: "Register 2.2 (wrong verification key)"
@@ -238,16 +220,8 @@ tests:
       response:
           value:
               [
-                  {
-                      CheckInNodeID: 101,
-                      MonitoredSubject: 1002,
-                      Key: "\x01\x11\x21\x31\x41\x51\x61\x71\x81\x91\xa1\xb1\xc1\xd1\xe1\xf1",
-                  },
-                  {
-                      CheckInNodeID: 201,
-                      MonitoredSubject: 2002,
-                      Key: "\x02\x12\x22\x32\x42\x52\x62\x72\x82\x92\xa2\xb2\xc2\xd2\xe2\x2f",
-                  },
+                  { CheckInNodeID: 101, MonitoredSubject: 1002 },
+                  { CheckInNodeID: 201, MonitoredSubject: 2002 },
               ]
 
     - label: "Unregister 1.1 (wrong key)"
@@ -263,14 +237,7 @@ tests:
       command: "readAttribute"
       attribute: "RegisteredClients"
       response:
-          value:
-              [
-                  {
-                      CheckInNodeID: 201,
-                      MonitoredSubject: 2002,
-                      Key: "\x02\x12\x22\x32\x42\x52\x62\x72\x82\x92\xa2\xb2\xc2\xd2\xe2\x2f",
-                  },
-              ]
+          value: [{ CheckInNodeID: 201, MonitoredSubject: 2002 }]
 
     - label: "Unregister 2.1"
       command: "UnregisterClient"

diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
@@ -27,7 +27,7 @@ limitations under the License.
         <cluster code="0x0046"/>
         <item fieldId="1" name="CheckInNodeID" type="node_id" isFabricSensitive="true"/>
         <item fieldId="2" name="MonitoredSubject" type="INT64U" isFabricSensitive="true"/>
-        <item fieldId="3" name="Key" type="OCTET_STRING" length="16" isFabricSensitive="true"/>
+        <!-- RESERVED = 0x03 -->
     </struct>
 
     <cluster>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2713,7 +2713,6 @@ client cluster IcdManagement = 70 {
   fabric_scoped struct MonitoringRegistrationStruct {
     fabric_sensitive node_id checkInNodeID = 1;
     fabric_sensitive int64u monitoredSubject = 2;
-    fabric_sensitive octet_string<16> key = 3;
     fabric_idx fabricIndex = 254;
   }
 

diff --git a/...chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/...chip/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
@@ -25,14 +25,12 @@ import chip.tlv.TlvWriter
 class IcdManagementClusterMonitoringRegistrationStruct(
   val checkInNodeID: ULong,
   val monitoredSubject: ULong,
-  val key: ByteArray,
   val fabricIndex: UInt
 ) {
   override fun toString(): String = buildString {
     append("IcdManagementClusterMonitoringRegistrationStruct {\n")
     append("\tcheckInNodeID : $checkInNodeID\n")
     append("\tmonitoredSubject : $monitoredSubject\n")
-    append("\tkey : $key\n")
     append("\tfabricIndex : $fabricIndex\n")
     append("}\n")
   }
@@ -42,7 +40,6 @@ class IcdManagementClusterMonitoringRegistrationStruct(
       startStructure(tlvTag)
       put(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D), checkInNodeID)
       put(ContextSpecificTag(TAG_MONITORED_SUBJECT), monitoredSubject)
-      put(ContextSpecificTag(TAG_KEY), key)
       put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
       endStructure()
     }
@@ -51,7 +48,6 @@ class IcdManagementClusterMonitoringRegistrationStruct(
   companion object {
     private const val TAG_CHECK_IN_NODE_I_D = 1
     private const val TAG_MONITORED_SUBJECT = 2
-    private const val TAG_KEY = 3
     private const val TAG_FABRIC_INDEX = 254
 
     fun fromTlv(
@@ -61,15 +57,13 @@ class IcdManagementClusterMonitoringRegistrationStruct(
       tlvReader.enterStructure(tlvTag)
       val checkInNodeID = tlvReader.getULong(ContextSpecificTag(TAG_CHECK_IN_NODE_I_D))
       val monitoredSubject = tlvReader.getULong(ContextSpecificTag(TAG_MONITORED_SUBJECT))
-      val key = tlvReader.getByteArray(ContextSpecificTag(TAG_KEY))
       val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
 
       tlvReader.exitContainer()
 
       return IcdManagementClusterMonitoringRegistrationStruct(
         checkInNodeID,
         monitoredSubject,
-        key,
         fabricIndex
       )
     }

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h