Revert ClusterCommand and move fix to the PairingCommand

Author: mkardous-silabs

examples/chip-tool/commands/clusters/ClusterCommand.h

@@ -69,7 +69,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
                            const chip::app::Clusters::IcdManagement::Commands::RegisterClient::Type & value)
     {
         ReturnErrorOnFailure(InteractionModelCommands::SendCommand(device, endpointId, clusterId, commandId, value));
-        mScopedNodeId     = chip::ScopedNodeId(device->GetDeviceId(), device->GetSecureSession().Value()->GetFabricIndex());
+        mScopedNodeId     = chip::ScopedNodeId(value.checkInNodeID device->GetSecureSession().Value()->GetFabricIndex());
         mMonitoredSubject = value.monitoredSubject;
         mClientType       = value.clientType;
         memcpy(mICDSymmetricKey, value.key.data(), value.key.size());

examples/chip-tool/commands/pairing/PairingCommand.cpp

@@ -449,7 +449,7 @@ void PairingCommand::OnICDRegistrationComplete(ScopedNodeId nodeId, uint32_t icd
                                sizeof(icdSymmetricKeyHex), chip::Encoding::HexFlags::kNullTerminate);
 
     app::ICDClientInfo clientInfo;
-    clientInfo.peer_node         = nodeId;
+    clientInfo.peer_node         = mICDCheckInNodeId.Value();
     clientInfo.monitored_subject = mICDMonitoredSubject.Value();
     clientInfo.start_icd_counter = icdCounter;
 

examples/fabric-admin/commands/pairing/PairingCommand.cpp

@@ -449,7 +449,7 @@ void PairingCommand::OnICDRegistrationComplete(ScopedNodeId nodeId, uint32_t icd
                                sizeof(icdSymmetricKeyHex), chip::Encoding::HexFlags::kNullTerminate);
 
     app::ICDClientInfo clientInfo;
-    clientInfo.peer_node         = nodeId;
+    clientInfo.peer_node         = mICDCheckInNodeId.Value();
     clientInfo.monitored_subject = mICDMonitoredSubject.Value();
     clientInfo.start_icd_counter = icdCounter;