Remove icd entry in icd client storage after unregisterClient is

triggered

Author: yunhanw-google

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

@@ -22,6 +22,9 @@
 
 #include "DataModelLogger.h"
 #include "ModelCommand.h"
+#include <app-common/zap-generated/cluster-objects.h>
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 
 class ClusterCommand : public InteractionModelCommands, public ModelCommand, public chip::app::CommandSender::Callback
 {
@@ -59,6 +62,8 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
                            chip::CommandId commandId,
                            const chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsRequest::Type & value)
     {
+        mPeerNodeId = device->GetDeviceId();
+        mFabricIndex = device->GetSecureSession().Value()->GetFabricIndex();
         ReturnErrorOnFailure(InteractionModelCommands::SendCommand(device, endpointId, clusterId, commandId, value));
 
         if (value.transferFileDesignator.HasValue() &&
@@ -109,6 +114,15 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
                 return;
             }
         }
+        if ((path.mEndpointId == chip::kRootEndpointId) && (path.mClusterId == chip::app::Clusters::IcdManagement::Id) && (path.mCommandId == chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Id))
+        {
+            CHIP_ERROR deleteEntryError =
+                CHIPCommand::sICDClientStorage.DeleteEntry(chip::ScopedNodeId(mPeerNodeId, mFabricIndex));
+            if (deleteEntryError != CHIP_NO_ERROR)
+            {
+                ChipLogError(chipTool, "Failed to delete ICD entry: %s", chip::ErrorStr(deleteEntryError));
+            }
+        }
     }
 
     virtual void OnError(const chip::app::CommandSender * client, CHIP_ERROR error) override
@@ -208,7 +222,8 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
 private:
     chip::ClusterId mClusterId;
     chip::CommandId mCommandId;
-
+    chip::FabricIndex mFabricIndex = 0;
+    chip::NodeId mPeerNodeId = 0;
     CHIP_ERROR mError = CHIP_NO_ERROR;
     CustomArgument mPayload;
 };