[ICD] Update ICD Management Cluster xml to match spec (#28088)

--------- Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Oct 4, 2023 · 9856081 · 9856081
1 parent c232b26
commit 9856081
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 35 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
@@ -2432,7 +2432,7 @@ server cluster IcdManagement = 70 {
 
  request struct UnregisterClientRequest {
  node_id checkInNodeID = 0;
- optional OCTET_STRING<16> key = 1;
+ optional OCTET_STRING<16> verificationKey = 1;
  }
 
  response struct RegisterClientResponse = 1 {

diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -1938,7 +1938,7 @@ server cluster IcdManagement = 70 {
 
  request struct UnregisterClientRequest {
  node_id checkInNodeID = 0;
- optional OCTET_STRING<16> key = 1;
+ optional OCTET_STRING<16> verificationKey = 1;
  }
 
  response struct RegisterClientResponse = 1 {

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
@@ -1597,7 +1597,7 @@ server cluster IcdManagement = 70 {
 
  request struct UnregisterClientRequest {
  node_id checkInNodeID = 0;
- optional OCTET_STRING<16> key = 1;
+ optional OCTET_STRING<16> verificationKey = 1;
  }
 
  response struct RegisterClientResponse = 1 {

diff --git a/src/app/clusters/icd-management-server/icd-management-server.cpp b/src/app/clusters/icd-management-server/icd-management-server.cpp
@@ -228,8 +228,8 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(chip::app::CommandHandl
  {
  PersistentStorageDelegate & storage = chip::Server::GetInstance().GetPersistentStorage();
  FabricIndex fabric = commandObj->GetAccessingFabricIndex();
- status = IcdManagementServer::GetInstance().UnregisterClient(storage, fabric, commandData.checkInNodeID, commandData.key,
- is_admin);
+ status = IcdManagementServer::GetInstance().UnregisterClient(storage, fabric, commandData.checkInNodeID,
+ commandData.verificationKey, is_admin);
  }
 
  commandObj->AddStatus(commandPath, status);

diff --git a/src/app/icd/IcdManagementServer.cpp b/src/app/icd/IcdManagementServer.cpp
@@ -49,7 +49,7 @@ Status IcdManagementServer::RegisterClient(PersistentStorageDelegate & storage,
 }
 
 Status IcdManagementServer::UnregisterClient(PersistentStorageDelegate & storage, FabricIndex fabric_index, chip::NodeId node_id,
- Optional<chip::ByteSpan> key, bool is_admin)
+ Optional<chip::ByteSpan> verificationKey, bool is_admin)
 {
  IcdMonitoringTable table(storage, fabric_index, GetClientsSupportedPerFabric());
 
@@ -62,8 +62,8 @@ Status IcdManagementServer::UnregisterClient(PersistentStorageDelegate & storage
  // Existing entry: Validate Key if, and only if, the ISD has NOT administrator permissions
  if (!is_admin)
  {
- VerifyOrReturnError(key.HasValue(), InteractionModel::Status::Failure);
- VerifyOrReturnError(key.Value().data_equal(entry.key), InteractionModel::Status::Failure);
+ VerifyOrReturnError(verificationKey.HasValue(), InteractionModel::Status::Failure);
+ VerifyOrReturnError(verificationKey.Value().data_equal(entry.key), InteractionModel::Status::Failure);
  }
 
  err = table.Remove(entry.index);

diff --git a/src/app/icd/IcdManagementServer.h b/src/app/icd/IcdManagementServer.h
@@ -56,7 +56,7 @@ class IcdManagementServer
  uint64_t monitored_subject, chip::ByteSpan key, Optional<chip::ByteSpan> verification_key, bool is_admin);
 
  Status UnregisterClient(PersistentStorageDelegate & storage, FabricIndex fabric_index, chip::NodeId node_id,
- Optional<chip::ByteSpan> key, bool is_admin);
+ Optional<chip::ByteSpan> verificationKey, bool is_admin);
 
  Status StayActiveRequest(FabricIndex fabric_index);
 

diff --git a/src/app/tests/suites/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -256,7 +256,7 @@ tests:
  values:
  - name: "CheckInNodeID"
  value: 101
- - name: "Key"
+ - name: "VerificationKey"
  value: "\x01\x21\x21\x31\x41\x51\x61\x71\x81\x91\xa1\xb1\xc1\xd1\xe1\xf1"
 
  - label: "Read RegisteredClients"

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
@@ -42,7 +42,7 @@ limitations under the License.
  <!-- Current cluster version -->
  <globalAttribute side="either" code="0xFFFD" value="1"/>
 
- <attribute side="server" code="0x00" define="IDLE_MODE_INTERVAL" type="INT32U" min="500" max="86400000" default="500" writable="false" optional="false" isNullable="false">IdleModeInterval</attribute>
+ <attribute side="server" code="0x00" define="IDLE_MODE_INTERVAL" type="INT32U" min="500" max="64800000" default="500" writable="false" optional="false" isNullable="false">IdleModeInterval</attribute>
  <attribute side="server" code="0x01" define="ACTIVE_MODE_INTERVAL" type="INT32U" min="300" default="300" writable="false" optional="false" isNullable="false">ActiveModeInterval</attribute>
  <attribute side="server" code="0x02" define="ACTIVE_MODE_THRESHOLD" type="INT16U" min="300" default="300" writable="false" optional="false" isNullable="false">ActiveModeThreshold</attribute>
  <attribute side="server" code="0x03" define="REGISTERED_CLIENTS" type="ARRAY" entryType="MonitoringRegistrationStruct" writable="false" optional="true" isNullable="false">
@@ -72,7 +72,7 @@ limitations under the License.
  <command source="client" code="0x02" name="UnregisterClient" isFabricScoped="true" optional="true">
  <description> Unregister a client from an end device </description>
  <arg name="CheckInNodeID" type="node_id"/>
- <arg name="Key" type="OCTET_STRING" length="16" optional="true"/>
+ <arg name="VerificationKey" type="OCTET_STRING" length="16" optional="true"/>
  <access op="invoke" privilege="manage"/>
  </command>
 

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2751,7 +2751,7 @@ client cluster IcdManagement = 70 {
 
  request struct UnregisterClientRequest {
  node_id checkInNodeID = 0;
- optional OCTET_STRING<16> key = 1;
+ optional OCTET_STRING<16> verificationKey = 1;
  }
 
  /** Register a client to the end device */

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -6043,7 +6043,7 @@ public static RegisterClientCommandField value(int id) throws NoSuchFieldError {
  }
  throw new NoSuchFieldError();
  }
- }public enum UnregisterClientCommandField {CheckInNodeID(0),Key(1),;
+ }public enum UnregisterClientCommandField {CheckInNodeID(0),VerificationKey(1),;
  private final int id;
  UnregisterClientCommandField(int id) {
  this.id = id;

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
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
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h