[Fabric-Admin] Refactor to use API methods instead of PushCommand (2/3)

examples/fabric-admin/commands/common/CHIPCommand.cpp

@@ -182,7 +182,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
     mCredIssuerCmds->SetCredentialIssuerOption(CredentialIssuerCommands::CredentialIssuerOptions::kAllowTestCdSigningKey,
                                                allowTestCdSigningKey);
 
-    PairingManager::Instance().Init(&CurrentCommissioner());
+    ReturnLogErrorOnFailure(PairingManager::Instance().Init(&CurrentCommissioner(), mCredIssuerCmds));
 
     return CHIP_NO_ERROR;
 }

examples/fabric-admin/commands/common/CHIPCommand.h

@@ -120,6 +120,8 @@ 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:
@@ -167,7 +169,6 @@ class CHIPCommand : public Command
     static chip::Crypto::RawKeySessionKeystore sSessionKeystore;
 
     static chip::Credentials::GroupDataProviderImpl sGroupDataProvider;
-    static chip::app::DefaultICDClientStorage sICDClientStorage;
     static chip::app::CheckInHandler sCheckInHandler;
     CredentialIssuerCommands * mCredIssuerCmds;
 

examples/fabric-admin/commands/fabric-sync/FabricSyncCommand.cpp

@@ -94,15 +94,8 @@ CHIP_ERROR FabricSyncAddBridgeCommand::RunCommand(NodeId remoteId)
         return CHIP_NO_ERROR;
     }
 
-    PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "already-discovered"));
+    PairingManager::Instance().SetCommissioningDelegate(this);
 
-    if (pairingCommand == nullptr)
-    {
-        ChipLogError(NotSpecified, "Pairing already-discovered command is not available");
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
-
-    pairingCommand->RegisterCommissioningDelegate(this);
     mBridgeNodeId = remoteId;
 
     DeviceMgr().PairRemoteFabricBridge(remoteId, mSetupPINCode, reinterpret_cast<const char *>(mRemoteAddr.data()), mRemotePort);
@@ -146,16 +139,7 @@ CHIP_ERROR FabricSyncRemoveBridgeCommand::RunCommand()
 
     mBridgeNodeId = bridgeNodeId;
 
-    PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "unpair"));
-
-    if (pairingCommand == nullptr)
-    {
-        ChipLogError(NotSpecified, "Pairing unpair command is not available");
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
-
-    pairingCommand->RegisterPairingDelegate(this);
-
+    PairingManager::Instance().SetPairingDelegate(this);
     DeviceMgr().UnpairRemoteFabricBridge();
 
     return CHIP_NO_ERROR;
@@ -203,10 +187,7 @@ CHIP_ERROR FabricSyncAddLocalBridgeCommand::RunCommand(NodeId deviceId)
         return CHIP_NO_ERROR;
     }
 
-    PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "already-discovered"));
-    VerifyOrDie(pairingCommand != nullptr);
-
-    pairingCommand->RegisterCommissioningDelegate(this);
+    PairingManager::Instance().SetCommissioningDelegate(this);
     mLocalBridgeNodeId = deviceId;
 
     if (mSetupPINCode.HasValue())
@@ -259,16 +240,7 @@ CHIP_ERROR FabricSyncRemoveLocalBridgeCommand::RunCommand()
 
     mLocalBridgeNodeId = bridgeNodeId;
 
-    PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "unpair"));
-
-    if (pairingCommand == nullptr)
-    {
-        ChipLogError(NotSpecified, "Pairing unpair command is not available");
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
-
-    pairingCommand->RegisterPairingDelegate(this);
-
+    PairingManager::Instance().SetPairingDelegate(this);
     DeviceMgr().UnpairLocalFabricBridge();
 
     return CHIP_NO_ERROR;
@@ -287,15 +259,7 @@ void FabricSyncDeviceCommand::OnCommissioningWindowOpened(NodeId deviceId, CHIP_
         {
             NodeId nodeId = DeviceMgr().GetNextAvailableNodeId();
 
-            PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "code"));
-
-            if (pairingCommand == nullptr)
-            {
-                ChipLogError(NotSpecified, "Pairing code command is not available");
-                return;
-            }
-
-            pairingCommand->RegisterCommissioningDelegate(this);
+            PairingManager::Instance().SetCommissioningDelegate(this);
             mAssignedNodeId = nodeId;
 
             usleep(kCommissionPrepareTimeMs * 1000);

examples/fabric-admin/commands/fabric-sync/FabricSyncCommand.h

@@ -19,12 +19,10 @@
 #pragma once
 
 #include <commands/common/CHIPCommand.h>
-#include <commands/pairing/PairingCommand.h>
 #include <device_manager/PairingManager.h>
 
 // Constants
 constexpr uint32_t kCommissionPrepareTimeMs = 500;
-constexpr uint16_t kMaxManualCodeLength     = 21;
 
 class FabricSyncAddBridgeCommand : public CHIPCommand, public CommissioningDelegate
 {

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

@@ -442,12 +442,6 @@ void PairingCommand::OnCommissioningComplete(NodeId nodeId, CHIP_ERROR err)
         ChipLogProgress(NotSpecified, "Device commissioning Failure: %s", ErrorStr(err));
     }
 
-    if (mCommissioningDelegate)
-    {
-        mCommissioningDelegate->OnCommissioningComplete(nodeId, err);
-        this->UnregisterCommissioningDelegate();
-    }
-
     SetCommandExitStatus(err);
 }
 
@@ -576,13 +570,6 @@ void PairingCommand::OnCurrentFabricRemove(void * context, NodeId nodeId, CHIP_E
         ChipLogProgress(NotSpecified, "Device unpair Failure: " ChipLogFormatX64 " %s", ChipLogValueX64(nodeId), ErrorStr(err));
     }
 
-    PairingDelegate * pairingDelegate = command->GetPairingDelegate();
-    if (pairingDelegate)
-    {
-        pairingDelegate->OnDeviceRemoved(nodeId, err);
-        command->UnregisterPairingDelegate();
-    }
-
     command->SetCommandExitStatus(err);
 }
 

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

@@ -45,20 +45,6 @@ enum class PairingNetworkType
     Thread,
 };
 
-class CommissioningDelegate
-{
-public:
-    virtual void OnCommissioningComplete(chip::NodeId deviceId, CHIP_ERROR err) = 0;
-    virtual ~CommissioningDelegate()                                            = default;
-};
-
-class PairingDelegate
-{
-public:
-    virtual void OnDeviceRemoved(chip::NodeId deviceId, CHIP_ERROR err) = 0;
-    virtual ~PairingDelegate()                                          = default;
-};
-
 class PairingCommand : public CHIPCommand,
                        public chip::Controller::DevicePairingDelegate,
                        public chip::Controller::DeviceDiscoveryDelegate,
@@ -226,15 +212,6 @@ class PairingCommand : public CHIPCommand,
                                       const chip::Credentials::DeviceAttestationVerifier::AttestationDeviceInfo & info,
                                       chip::Credentials::AttestationVerificationResult attestationResult) override;
 
-    /////////// CommissioningDelegate /////////
-    void RegisterCommissioningDelegate(CommissioningDelegate * delegate) { mCommissioningDelegate = delegate; }
-    void UnregisterCommissioningDelegate() { mCommissioningDelegate = nullptr; }
-
-    /////////// PairingDelegate /////////
-    void RegisterPairingDelegate(PairingDelegate * delegate) { mPairingDelegate = delegate; }
-    void UnregisterPairingDelegate() { mPairingDelegate = nullptr; }
-    PairingDelegate * GetPairingDelegate() { return mPairingDelegate; }
-
 private:
     CHIP_ERROR RunInternal(NodeId remoteId);
     CHIP_ERROR Pair(NodeId remoteId, PeerAddress address);
@@ -290,9 +267,6 @@ class PairingCommand : public CHIPCommand,
     chip::Platform::UniquePtr<chip::Controller::CurrentFabricRemover> mCurrentFabricRemover;
     chip::Callback::Callback<chip::Controller::OnCurrentFabricRemove> mCurrentFabricRemoveCallback;
 
-    CommissioningDelegate * mCommissioningDelegate = nullptr;
-    PairingDelegate * mPairingDelegate             = nullptr;
-
     static void OnCurrentFabricRemove(void * context, NodeId remoteNodeId, CHIP_ERROR status);
     void PersistIcdInfo();
 };

examples/fabric-admin/device_manager/DeviceManager.cpp

@@ -20,7 +20,6 @@
 
 #include <commands/interactive/InteractiveCommands.h>
 #include <crypto/RandUtils.h>
-#include <device_manager/PairingManager.h>
 #include <lib/support/StringBuilder.h>
 
 #include <cstdio>
@@ -153,52 +152,42 @@ void DeviceManager::OpenRemoteDeviceCommissioningWindow(EndpointId remoteEndpoin
 void DeviceManager::PairRemoteFabricBridge(NodeId nodeId, uint32_t setupPINCode, const char * deviceRemoteIp,
                                            uint16_t deviceRemotePort)
 {
-    StringBuilder<kMaxCommandSize> commandBuilder;
-
-    commandBuilder.Add("pairing already-discovered ");
-    commandBuilder.AddFormat("%lu %d %s %d", nodeId, setupPINCode, deviceRemoteIp, deviceRemotePort);
-
-    PushCommand(commandBuilder.c_str());
+    if (PairingManager::Instance().PairDevice(nodeId, setupPINCode, deviceRemoteIp, deviceRemotePort) != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to pair remote fabric bridge " ChipLogFormatX64, ChipLogValueX64(nodeId));
+    }
 }
 
 void DeviceManager::PairRemoteDevice(NodeId nodeId, const char * payload)
 {
-    StringBuilder<kMaxCommandSize> commandBuilder;
-
-    commandBuilder.Add("pairing code ");
-    commandBuilder.AddFormat("%lu %s", nodeId, payload);
-
-    PushCommand(commandBuilder.c_str());
+    if (PairingManager::Instance().PairDeviceWithCode(nodeId, payload) != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to pair remote device " ChipLogFormatX64, ChipLogValueX64(nodeId));
+    }
 }
 
 void DeviceManager::PairLocalFabricBridge(NodeId nodeId)
 {
-    StringBuilder<kMaxCommandSize> commandBuilder;
-
-    commandBuilder.Add("pairing already-discovered ");
-    commandBuilder.AddFormat("%lu %d ::1 %d", nodeId, mLocalBridgeSetupPinCode, mLocalBridgePort);
-
-    PushCommand(commandBuilder.c_str());
+    if (PairingManager::Instance().PairDevice(nodeId, mLocalBridgeSetupPinCode, "::1", mLocalBridgePort) != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to pair local fabric bridge " ChipLogFormatX64, ChipLogValueX64(nodeId));
+    }
 }
 
 void DeviceManager::UnpairRemoteFabricBridge()
 {
-    StringBuilder<kMaxCommandSize> commandBuilder;
-
-    commandBuilder.Add("pairing unpair ");
-    commandBuilder.AddFormat("%lu", mRemoteBridgeNodeId);
-
-    PushCommand(commandBuilder.c_str());
+    if (PairingManager::Instance().UnpairDevice(mRemoteBridgeNodeId) != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to unpair remote bridge device " ChipLogFormatX64, ChipLogValueX64(mRemoteBridgeNodeId));
+    }
 }
 
 void DeviceManager::UnpairLocalFabricBridge()
 {
-    StringBuilder<kMaxCommandSize> commandBuilder;
-
-    commandBuilder.Add("pairing unpair ");
-    commandBuilder.AddFormat("%lu", mLocalBridgeNodeId);
-
-    PushCommand(commandBuilder.c_str());
+    if (PairingManager::Instance().UnpairDevice(mLocalBridgeNodeId) != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to unpair local bridge device " ChipLogFormatX64, ChipLogValueX64(mLocalBridgeNodeId));
+    }
 }
 
 void DeviceManager::SubscribeRemoteFabricBridge()
@@ -390,20 +379,15 @@ void DeviceManager::HandleAttributePartsListUpdate(TLV::TLVReader & data)
 
         if (mAutoSyncEnabled)
         {
-            StringBuilder<kMaxCommandSize> commandBuilder;
-            commandBuilder.Add("pairing unpair ");
-            commandBuilder.AddFormat("%lu", device->GetNodeId());
-
-            PairingCommand * pairingCommand = static_cast<PairingCommand *>(CommandMgr().GetCommandByName("pairing", "unpair"));
-
-            if (pairingCommand == nullptr)
+            NodeId nodeId = device->GetNodeId();
+            if (PairingManager::Instance().UnpairDevice(nodeId) != CHIP_NO_ERROR)
             {
-                ChipLogError(NotSpecified, "Pairing code command is not available");
-                return;
+                ChipLogError(NotSpecified, "Failed to unpair device " ChipLogFormatX64, ChipLogValueX64(nodeId));
+            }
+            else
+            {
+                PairingManager::Instance().SetPairingDelegate(this);
             }
-
-            pairingCommand->RegisterPairingDelegate(this);
-            PushCommand(commandBuilder.c_str());
         }
     }
 }

examples/fabric-admin/device_manager/DeviceManager.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <app-common/zap-generated/cluster-objects.h>
-#include <commands/pairing/PairingCommand.h>
+#include <device_manager/PairingManager.h>
 #include <platform/CHIPDeviceLayer.h>
 
 #include <set>