Modify icdm cluster to make ClientType mandatory

Author: mkardous-silabs

src/app/clusters/icd-management-server/icd-management-server.cpp

@@ -202,7 +202,7 @@ CHIP_ERROR IcdManagementAttributeAccess::ReadRegisteredClients(EndpointId endpoi
 
                 Structs::MonitoringRegistrationStruct::Type s{ .checkInNodeID    = e.checkInNodeID,
                                                                .monitoredSubject = e.monitoredSubject,
-                                                               .clientType       = ClientTypeEnum(e.clientType),
+                                                               .clientType       = e.clientType,
                                                                .fabricIndex      = e.fabricIndex };
                 ReturnErrorOnFailure(subEncoder.Encode(s));
             }
@@ -250,13 +250,13 @@ CHIP_ERROR CheckAdmin(CommandHandler * commandObj, const ConcreteCommandPath & c
 Status ICDManagementServer::RegisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                            const Commands::RegisterClient::DecodableType & commandData, uint32_t & icdCounter)
 {
-    FabricIndex fabricIndex             = commandObj->GetAccessingFabricIndex();
-    NodeId nodeId                       = commandData.checkInNodeID;
-    uint64_t monitoredSubject           = commandData.monitoredSubject;
-    Optional<ClientTypeEnum> clientType = commandData.clientType;
-    ByteSpan key                        = commandData.key;
-    Optional<ByteSpan> verificationKey  = commandData.verificationKey;
-    bool isClientAdmin                  = false;
+    FabricIndex fabricIndex            = commandObj->GetAccessingFabricIndex();
+    NodeId nodeId                      = commandData.checkInNodeID;
+    uint64_t monitoredSubject          = commandData.monitoredSubject;
+    ClientTypeEnum clientType          = commandData.clientType;
+    ByteSpan key                       = commandData.key;
+    Optional<ByteSpan> verificationKey = commandData.verificationKey;
+    bool isClientAdmin                 = false;
 
     // Check if client is admin
     VerifyOrReturnError(CHIP_NO_ERROR == CheckAdmin(commandObj, commandPath, isClientAdmin), InteractionModel::Status::Failure);
@@ -293,7 +293,7 @@ Status ICDManagementServer::RegisterClient(CommandHandler * commandObj, const Co
     // Save
     entry.checkInNodeID    = nodeId;
     entry.monitoredSubject = monitoredSubject;
-    entry.clientType       = clientType.ValueOr(ClientTypeEnum::kPermanent);
+    entry.clientType       = clientType;
 
     if (entry.keyHandleValid)
     {

src/app/tests/suites/TestIcdManagementCluster.yaml

@@ -195,6 +195,8 @@ tests:
                 value: 1001
               - name: "Key"
                 value: "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e"
+              - name: "ClientType"
+                value: 0
       response:
           error: CONSTRAINT_ERROR
 
@@ -208,6 +210,8 @@ tests:
                 value: 1001
               - name: "Key"
                 value: "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\xff"
+              - name: "ClientType"
+                value: 0
       response:
           error: CONSTRAINT_ERROR
 
@@ -221,6 +225,8 @@ tests:
                 value: 1001
               - name: "Key"
                 value: "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+              - name: "ClientType"
+                value: 0
       response:
           values:
               - name: "ICDCounter"
@@ -260,6 +266,8 @@ tests:
                 value: 3001
               - name: "Key"
                 value: "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+              - name: "ClientType"
+                value: 0
       response:
           error: RESOURCE_EXHAUSTED