[CP][1.4.2][ICD][Server]Trigger attribute change when ICD RegisterClient/UnregisterClient succeed (project-chip#41775)

* Trigger attribute change when ICD RegisterClient/UnregisterClient succeed (project-chip#41725)

* Trigger Attribute Change when ICD RegisterClient/UnregisterClient succeed

Restyled by clang-format

* address comments

* Restyled by clang-format

* fix

* Restyled by clang-format

* address comments

* fix

* address comments

* Restyled by clang-format

* address comments

* fix compile

---------

Co-authored-by: Restyled.io <[email protected]>

* Address comments from PR 41725 (project-chip#41769)

* Address comments from PR 41725

* address comments

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>

* fix compilation

* Restyled by clang-format

* fix compilation

---------

Co-authored-by: Restyled.io <[email protected]>

Author: yunhanw-google

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

@@ -28,6 +28,7 @@
 #if CHIP_CONFIG_ENABLE_ICD_CIP
 #include <app/icd/server/ICDNotifier.h> // nogncheck
 #endif
+#include <app/reporting/reporting.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
 
@@ -185,12 +186,6 @@ class IcdManagementFabricDelegate : public FabricTable::Delegate
 /*
  * ICD Management Implementation
  */
-#if CHIP_CONFIG_ENABLE_ICD_CIP
-PersistentStorageDelegate * ICDManagementServer::mStorage           = nullptr;
-Crypto::SymmetricKeystore * ICDManagementServer::mSymmetricKeystore = nullptr;
-#endif // CHIP_CONFIG_ENABLE_ICD_CIP
-
-ICDConfigurationData * ICDManagementServer::mICDConfigurationData = nullptr;
 
 namespace {
 IcdManagementAttributeAccess gAttribute;
@@ -281,6 +276,14 @@ CHIP_ERROR CheckAdmin(CommandHandler * commandObj, const ConcreteCommandPath & c
 
 } // namespace
 
+#endif // CHIP_CONFIG_ENABLE_ICD_CIP
+
+namespace chip::app::Clusters {
+
+ICDManagementServer ICDManagementServer::instance;
+
+#if CHIP_CONFIG_ENABLE_ICD_CIP
+
 Status ICDManagementServer::RegisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                            const Commands::RegisterClient::DecodableType & commandData, uint32_t & icdCounter)
 {
@@ -356,7 +359,7 @@ Status ICDManagementServer::RegisterClient(CommandHandler * commandObj, const Co
         // Notify subscribers that the first entry for the fabric was successfully added
         TriggerICDMTableUpdatedEvent();
     }
-
+    MatterReportingAttributeChangeCallback(kRootEndpointId, IcdManagement::Id, IcdManagement::Attributes::RegisteredClients::Id);
     icdCounter = mICDConfigurationData->GetICDCounter().GetValue();
     return Status::Success;
 }
@@ -395,6 +398,7 @@ Status ICDManagementServer::UnregisterClient(CommandHandler * commandObj, const
         TriggerICDMTableUpdatedEvent();
     }
 
+    MatterReportingAttributeChangeCallback(kRootEndpointId, IcdManagement::Id, IcdManagement::Attributes::RegisteredClients::Id);
     return Status::Success;
 }
 
@@ -415,6 +419,14 @@ void ICDManagementServer::Init(PersistentStorageDelegate & storage, Crypto::Symm
     mICDConfigurationData = &icdConfigurationData;
 }
 
+void ICDManagementServer::OnICDModeChange()
+{
+    // Notify attribute change for OperatingMode attribute
+    MatterReportingAttributeChangeCallback(kRootEndpointId, IcdManagement::Id, IcdManagement::Attributes::OperatingMode::Id);
+}
+
+} // namespace chip::app::Clusters
+
 /**********************************************************
  * Callbacks Implementation
  *********************************************************/
@@ -429,8 +441,7 @@ bool emberAfIcdManagementClusterRegisterClientCallback(CommandHandler * commandO
 {
     uint32_t icdCounter = 0;
 
-    ICDManagementServer server;
-    Status status = server.RegisterClient(commandObj, commandPath, commandData, icdCounter);
+    Status status = ICDManagementServer::GetInstance().RegisterClient(commandObj, commandPath, commandData, icdCounter);
 
     if (Status::Success == status)
     {
@@ -452,8 +463,7 @@ bool emberAfIcdManagementClusterRegisterClientCallback(CommandHandler * commandO
 bool emberAfIcdManagementClusterUnregisterClientCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                                          const Commands::UnregisterClient::DecodableType & commandData)
 {
-    ICDManagementServer server;
-    Status status = server.UnregisterClient(commandObj, commandPath, commandData);
+    Status status = ICDManagementServer::GetInstance().UnregisterClient(commandObj, commandPath, commandData);
 
     commandObj->AddStatus(commandPath, status);
     return true;
@@ -496,7 +506,15 @@ void MatterIcdManagementPluginServerInitCallback()
     AttributeAccessInterfaceRegistry::Instance().Register(&gAttribute);
 
     // Configure ICD Management
-    ICDManagementServer::Init(storage, symmetricKeystore, icdConfigurationData);
+    ICDManagementServer::GetInstance().Init(storage, symmetricKeystore, icdConfigurationData);
+
+// TODO(#32321): Remove #if after issue is resolved
+// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
+// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
+// server in those examples.
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    Server::GetInstance().GetICDManager().RegisterObserver(&ICDManagementServer::GetInstance());
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 }
 
 void MatterIcdManagementPluginServerShutdownCallback()
@@ -507,4 +525,12 @@ void MatterIcdManagementPluginServerShutdownCallback()
     FabricTable & fabricTable = Server::GetInstance().GetFabricTable();
     fabricTable.RemoveFabricDelegate(&gFabricDelegate);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
+
+// TODO(#32321): Remove #if after issue is resolved
+// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
+// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
+// server in those examples.
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    Server::GetInstance().GetICDManager().ReleaseObserver(&ICDManagementServer::GetInstance());
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 }

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

@@ -34,20 +34,27 @@
 #include <lib/core/CHIPPersistentStorageDelegate.h>
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
+#include <app/icd/server/ICDStateObserver.h>
+
 namespace chip {
 namespace Crypto {
 using SymmetricKeystore = SessionKeystore;
 } // namespace Crypto
 } // namespace chip
 
-class ICDManagementServer
+namespace chip {
+namespace app {
+namespace Clusters {
+
+class ICDManagementServer : public chip::app::ICDStateObserver
 {
 public:
     ICDManagementServer() = default;
 
-    static void Init(chip::PersistentStorageDelegate & storage, chip::Crypto::SymmetricKeystore * symmetricKeystore,
-                     chip::ICDConfigurationData & ICDConfigurationData);
+    void Init(PersistentStorageDelegate & storage, Crypto::SymmetricKeystore * symmetricKeystore,
+              ICDConfigurationData & ICDConfigurationData);
 
+    static ICDManagementServer & GetInstance() { return instance; };
 #if CHIP_CONFIG_ENABLE_ICD_CIP
     /**
      * @brief Function that executes the business logic of the RegisterClient Command
@@ -56,17 +63,17 @@ class ICDManagementServer
      * ICDConfigurationData If function fails, icdCounter will be unchanged
      * @return Status
      */
-    chip::Protocols::InteractionModel::Status
-    RegisterClient(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                   const chip::app::Clusters::IcdManagement::Commands::RegisterClient::DecodableType & commandData,
-                   uint32_t & icdCounter);
-
-    chip::Protocols::InteractionModel::Status
-    UnregisterClient(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                     const chip::app::Clusters::IcdManagement::Commands::UnregisterClient::DecodableType & commandData);
+    Protocols::InteractionModel::Status RegisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                       const IcdManagement::Commands::RegisterClient::DecodableType & commandData,
+                                                       uint32_t & icdCounter);
+
+    Protocols::InteractionModel::Status
+    UnregisterClient(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                     const IcdManagement::Commands::UnregisterClient::DecodableType & commandData);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
 private:
+    static ICDManagementServer instance;
 #if CHIP_CONFIG_ENABLE_ICD_CIP
     /**
      * @brief Triggers table update events to notify subscribers that an entry was added or removed
@@ -75,10 +82,19 @@ class ICDManagementServer
     void TriggerICDMTableUpdatedEvent();
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
-    static chip::ICDConfigurationData * mICDConfigurationData;
+    ICDConfigurationData * mICDConfigurationData;
 
 #if CHIP_CONFIG_ENABLE_ICD_CIP
-    static chip::PersistentStorageDelegate * mStorage;
-    static chip::Crypto::SymmetricKeystore * mSymmetricKeystore;
+    PersistentStorageDelegate * mStorage;
+    Crypto::SymmetricKeystore * mSymmetricKeystore;
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
+
+    void OnEnterActiveMode() override{};
+    void OnEnterIdleMode() override{};
+    void OnTransitionToIdle() override{};
+    void OnICDModeChange() override;
 };
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip