Remove ICD stuff since it is not needed for camera

Author: yufengwangca

examples/camera-controller/BUILD.gn

@@ -57,12 +57,8 @@ static_library("camera-controller-utils") {
     "commands/common/Commands.h",
     "commands/common/CredentialIssuerCommands.h",
     "commands/common/HexConversion.h",
-    "commands/common/IcdManager.cpp",
-    "commands/common/IcdManager.h",
     "commands/common/RemoteDataModelLogger.cpp",
     "commands/common/RemoteDataModelLogger.h",
-    "commands/common/StayActiveSender.cpp",
-    "commands/common/StayActiveSender.h",
     "commands/pairing/OpenCommissioningWindowCommand.cpp",
     "commands/pairing/OpenCommissioningWindowCommand.h",
     "commands/pairing/PairingCommand.cpp",
@@ -83,8 +79,6 @@ static_library("camera-controller-utils") {
 
   public_deps = [
     "${chip_root}/examples/common/tracing:commandline",
-    "${chip_root}/src/app/icd/client:handler",
-    "${chip_root}/src/app/icd/client:manager",
     "${chip_root}/src/app/server",
     "${chip_root}/src/app/tests/suites/commands/interaction_model",
     "${chip_root}/src/controller/data_model",

examples/camera-controller/commands/clusters/ModelCommand.cpp

@@ -19,7 +19,6 @@
 #include "ModelCommand.h"
 
 #include <app/InteractionModelEngine.h>
-#include <app/icd/client/DefaultICDClientStorage.h>
 #include <inttypes.h>
 
 using namespace ::chip;
@@ -36,7 +35,6 @@ CHIP_ERROR ModelCommand::RunCommand()
     }
 
     ChipLogProgress(NotSpecified, "Sending command to node " ChipLogFormatX64, ChipLogValueX64(mDestinationId));
-    CheckPeerICDType();
 
     CommissioneeDeviceProxy * commissioneeDeviceProxy = nullptr;
     if (CHIP_NO_ERROR == CurrentCommissioner().GetDeviceBeingCommissioned(mDestinationId, &commissioneeDeviceProxy))
@@ -75,31 +73,3 @@ void ModelCommand::Shutdown()
 
     CHIPCommand::Shutdown();
 }
-
-void ModelCommand::CheckPeerICDType()
-{
-    if (mIsPeerLIT.HasValue())
-    {
-        ChipLogProgress(NotSpecified, "Peer ICD type is set to %s", mIsPeerLIT.Value() == 1 ? "LIT-ICD" : "non LIT-ICD");
-        return;
-    }
-
-    app::ICDClientInfo info;
-    auto destinationPeerId = chip::ScopedNodeId(mDestinationId, CurrentCommissioner().GetFabricIndex());
-    auto iter              = CHIPCommand::sICDClientStorage.IterateICDClientInfo();
-    if (iter == nullptr)
-    {
-        return;
-    }
-    app::DefaultICDClientStorage::ICDClientInfoIteratorWrapper clientInfoIteratorWrapper(iter);
-
-    while (iter->Next(info))
-    {
-        if (ScopedNodeId(info.peer_node.GetNodeId(), info.peer_node.GetFabricIndex()) == destinationPeerId)
-        {
-            ChipLogProgress(NotSpecified, "Peer is a registered LIT ICD.");
-            mIsPeerLIT.SetValue(true);
-            return;
-        }
-    }
-}

examples/camera-controller/commands/clusters/ModelCommand.h

@@ -52,10 +52,6 @@ class ModelCommand : public CHIPCommand
                             "Endpoint the command is targeted at.");
             }
         }
-        AddArgument(
-            "lit-icd-peer", 0, 1, &mIsPeerLIT,
-            "Whether to treat the peer as a LIT ICD. false: Always no, true: Always yes, (not set): Yes if the peer is registered "
-            "to this controller.");
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 

examples/camera-controller/commands/common/CHIPCommand.cpp

@@ -18,8 +18,6 @@
 
 #include "CHIPCommand.h"
 
-#include "IcdManager.h"
-
 #include <controller/CHIPDeviceControllerFactory.h>
 #include <credentials/attestation_verifier/FileAttestationTrustStore.h>
 #include <data-model-providers/codegen/Instance.h>
@@ -52,10 +50,6 @@ constexpr char kCDTrustStorePathVariable[]      = "CAMERACONTROLLER_CD_TRUST_STO
 
 const chip::Credentials::AttestationTrustStore * CHIPCommand::sTrustStore = nullptr;
 chip::Credentials::GroupDataProviderImpl CHIPCommand::sGroupDataProvider{ kMaxGroupsPerFabric, kMaxGroupKeysPerFabric };
-// All fabrics share the same ICD client storage.
-chip::app::DefaultICDClientStorage CHIPCommand::sICDClientStorage;
-chip::Crypto::RawKeySessionKeystore CHIPCommand::sSessionKeystore;
-chip::app::CheckInHandler CHIPCommand::sCheckInHandler;
 
 namespace {
 
@@ -109,19 +103,12 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
     ReturnLogErrorOnFailure(mOperationalKeystore.Init(&mDefaultStorage));
     ReturnLogErrorOnFailure(mOpCertStore.Init(&mDefaultStorage));
 
-    // camera-controller uses a non-persistent keystore.
-    // ICD storage lifetime is currently tied to the camera-controller's lifetime. Since camera-controller interactive mode is
-    // currently used for ICD commissioning and check-in validation, this temporary storage meets the test requirements.
-    // TODO: Implement persistent ICD storage for the camera-controller.
-    ReturnLogErrorOnFailure(sICDClientStorage.Init(&mDefaultStorage, &sSessionKeystore));
-
     chip::Controller::FactoryInitParams factoryInitParams;
 
     factoryInitParams.fabricIndependentStorage = &mDefaultStorage;
     factoryInitParams.operationalKeystore      = &mOperationalKeystore;
     factoryInitParams.opCertStore              = &mOpCertStore;
     factoryInitParams.enableServerInteractions = NeedsOperationalAdvertising();
-    factoryInitParams.sessionKeystore          = &sSessionKeystore;
     factoryInitParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance(&mDefaultStorage);
 
     // Init group data provider that will be used for all group keys and IPKs for the
@@ -151,9 +138,6 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
 
     auto engine = chip::app::InteractionModelEngine::GetInstance();
     VerifyOrReturnError(engine != nullptr, CHIP_ERROR_INCORRECT_STATE);
-    ReturnLogErrorOnFailure(IcdManager::Instance().Init(&sICDClientStorage, engine));
-    ReturnLogErrorOnFailure(sCheckInHandler.Init(DeviceControllerFactory::GetInstance().GetSystemState()->ExchangeMgr(),
-                                                 &sICDClientStorage, &IcdManager::Instance(), engine));
 
     CommissionerIdentity nullIdentity{ kIdentityNull, chip::kUndefinedNodeId };
     ReturnLogErrorOnFailure(InitializeCommissioner(nullIdentity, kIdentityNullFabricId));
@@ -513,8 +497,6 @@ CHIP_ERROR CHIPCommand::InitializeCommissioner(CommissionerIdentity & identity,
             chip::Credentials::SetSingleIpkEpochKey(&sGroupDataProvider, fabricIndex, defaultIpk, compressed_fabric_id_span));
     }
 
-    CHIPCommand::sICDClientStorage.UpdateFabricList(commissioner->GetFabricIndex());
-
     mCommissioners[identity] = std::move(commissioner);
 
     return CHIP_NO_ERROR;

examples/camera-controller/commands/common/CHIPCommand.h

@@ -25,9 +25,6 @@
 #include "Command.h"
 
 #include <TracingCommandLineArgument.h>
-#include <app/icd/client/CheckInHandler.h>
-#include <app/icd/client/DefaultCheckInDelegate.h>
-#include <app/icd/client/DefaultICDClientStorage.h>
 #include <commands/common/CredentialIssuerCommands.h>
 #include <commands/example/ExampleCredentialIssuerCommands.h>
 #include <credentials/GroupDataProviderImpl.h>
@@ -121,8 +118,6 @@ class CHIPCommand : public Command
         StopWaiting();
     }
 
-    static chip::app::DefaultICDClientStorage sICDClientStorage;
-
 protected:
     // Will be called in a setting in which it's safe to touch the CHIP
     // stack. The rules for Run() are as follows:
@@ -170,7 +165,6 @@ class CHIPCommand : public Command
     static chip::Crypto::RawKeySessionKeystore sSessionKeystore;
 
     static chip::Credentials::GroupDataProviderImpl sGroupDataProvider;
-    static chip::app::CheckInHandler sCheckInHandler;
     CredentialIssuerCommands * mCredIssuerCmds;
 
     std::string GetIdentity();