Update ModelCommand.cpp

Author: yunhanw-google

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

@@ -55,12 +55,19 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
         return InteractionModelCommands::SendCommand(device, endpointId, clusterId, commandId, value);
     }
 
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, chip::EndpointId endpointId, chip::ClusterId clusterId,
+                           chip::CommandId commandId,
+                           const chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Type & value)
+    {
+        ReturnErrorOnFailure(InteractionModelCommands::SendCommand(device, endpointId, clusterId, commandId, value));
+        mScopedNodeId = chip::ScopedNodeId(value.checkInNodeID,device->GetSecureSession().Value()->GetFabricIndex());
+        return CHIP_NO_ERROR;
+    }
+
     CHIP_ERROR SendCommand(chip::DeviceProxy * device, chip::EndpointId endpointId, chip::ClusterId clusterId,
                            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() &&
@@ -114,7 +121,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
         if ((path.mEndpointId == chip::kRootEndpointId) && (path.mClusterId == chip::app::Clusters::IcdManagement::Id) &&
             (path.mCommandId == chip::app::Clusters::IcdManagement::Commands::UnregisterClient::Id))
         {
-            ModelCommand::ClearICDEntry(chip::ScopedNodeId(mPeerNodeId, mFabricIndex));
+            ModelCommand::ClearICDEntry(mScopedNodeId);
         }
     }
 
@@ -215,8 +222,7 @@ class ClusterCommand : public InteractionModelCommands, public ModelCommand, pub
 private:
     chip::ClusterId mClusterId;
     chip::CommandId mCommandId;
-    chip::FabricIndex mFabricIndex = 0;
-    chip::NodeId mPeerNodeId       = 0;
+    chip::ScopedNodeId mScopedNodeId;
     CHIP_ERROR mError              = CHIP_NO_ERROR;
     CustomArgument mPayload;
 };

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

@@ -67,7 +67,7 @@ class ModelCommand : public CHIPCommand
 
     virtual CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) { return CHIP_ERROR_BAD_REQUEST; };
 
-    void ClearICDEntry(const chip::ScopedNodeId & nodeId) override;
+    virtual void ClearICDEntry(const chip::ScopedNodeId & nodeId);
 
     void Shutdown() override;
 

examples/tv-casting-app/tv-casting-common/commands/clusters/ModelCommand.cpp

@@ -61,7 +61,7 @@ void ModelCommand::OnDeviceConnectedFn(void * context, Messaging::ExchangeManage
     VerifyOrReturn(command != nullptr, ChipLogError(chipTool, "OnDeviceConnectedFn: context is null"));
 
     OperationalDeviceProxy device(&exchangeMgr, sessionHandle);
-    CHIP_ERROR err = command->SendCommand(&device, command->minEndPointId);
+    CHIP_ERROR err = command->SendCommand(&device, command->mEndPointId);
     VerifyOrReturn(CHIP_NO_ERROR == err, command->SetCommandExitStatus(err));
 }
 
@@ -82,7 +82,7 @@ void ModelCommand::Shutdown()
     mOnDeviceConnectionFailureCallback.Cancel();
 }
 
-void ClearICDEntry(const chip::ScopedNodeId & nodeId);
+void ModelCommand::ClearICDEntry(const chip::ScopedNodeId & nodeId)
 {
     ChipLogError(chipTool, "ClearICDEntry is not implemented in tv-casting-app");
 }