[Darwin] Implement DeviceInfoProviderImpl with persistent storage (#1…

…7136) * [Darwin] Implement DeviceInfoProviderImpl with persistent storage * Use storage delegate instead of PersistedStorage * Update src/platform/Darwin/DeviceInfoProviderImpl.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/platform/Darwin/DeviceInfoProviderImpl.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/platform/Darwin/DeviceInfoProviderImpl.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/platform/Darwin/DeviceInfoProviderImpl.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/include/platform/DeviceInfoProvider.h Co-authored-by: Boris Zbarsky <[email protected]> * Address review comments Co-authored-by: Boris Zbarsky <[email protected]>
project-chip · Sep 25, 2023 · 1827348 · 1827348
1 parent 7dd36de
commit 1827348
Show file tree

Hide file tree

Showing 11 changed files with 657 additions and 1 deletion.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -189,7 +189,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
-                     --target-skip-glob '{TestGroupMessaging,TestUserLabelCluster}' \
+                     --target-skip-glob '{TestGroupMessaging}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -39,6 +39,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <messaging/ExchangeMgr.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/DeviceInfoProvider.h>
 #include <platform/KeyValueStoreManager.h>
 #include <protocols/secure_channel/CASEServer.h>
 #include <protocols/secure_channel/MessageCounterManager.h>
@@ -97,6 +98,7 @@ static ::chip::app::CircularEventBuffer sLoggingBuffer[CHIP_NUM_EVENT_LOGGING_BU
 CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 {
     CASESessionManagerConfig caseSessionManagerConfig;
+    DeviceLayer::DeviceInfoProvider * deviceInfoprovider = nullptr;
 
     mOperationalServicePort        = initParams.operationalServicePort;
     mUserDirectedCommissioningPort = initParams.userDirectedCommissioningPort;
@@ -134,6 +136,12 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     mGroupsProvider = initParams.groupDataProvider;
     SetGroupDataProvider(mGroupsProvider);
 
+    deviceInfoprovider = DeviceLayer::GetDeviceInfoProvider();
+    if (deviceInfoprovider)
+    {
+        deviceInfoprovider->SetStorageDelegate(mDeviceStorage);
+    }
+
     err = mAccessControl.Init(initParams.accessDelegate, sDeviceTypeResolver);
     SuccessOrExit(err);
     Access::SetAccessControl(mAccessControl);

diff --git a/src/darwin/Framework/CHIP/templates/tests/CHIPClustersTests.zapt b/src/darwin/Framework/CHIP/templates/tests/CHIPClustersTests.zapt
@@ -50,6 +50,12 @@ void UserPrompt(XCTestExpectation * expectation, dispatch_queue_t queue, NSStrin
     [expectation fulfill];
 }
 
+// Stub for reboot target device.
+void Reboot(XCTestExpectation * expectation, dispatch_queue_t queue, uint16_t discriminator)
+{
+    [expectation fulfill];
+}
+
 void WaitForCommissionee(XCTestExpectation * expectation, dispatch_queue_t queue, uint64_t deviceId)
 {
     CHIPDeviceController * controller = [CHIPDeviceController sharedController];

diff --git a/src/darwin/Framework/CHIP/templates/tests/tests.js b/src/darwin/Framework/CHIP/templates/tests/tests.js
@@ -278,6 +278,7 @@ function getTests()
     'TestLogCommands',
     'TestOperationalCredentialsCluster',
     'TestBinding',
+    'TestUserLabelCluster',
   ];
 
   const SoftwareDiagnostics = [

diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
diff --git a/src/include/platform/DeviceInfoProvider.h b/src/include/platform/DeviceInfoProvider.h
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPError.h>
+#include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <platform/AttributeList.h>
 
 namespace chip {
@@ -81,6 +82,13 @@ class DeviceInfoProvider
     DeviceInfoProvider(const DeviceInfoProvider &) = delete;
     DeviceInfoProvider & operator=(const DeviceInfoProvider &) = delete;
 
+    /**
+     * @brief Set the storage implementation used for non-volatile storage of device information data.
+     *
+     * @param storage Pointer to storage instance to set. Cannot be nullptr, will assert.
+     */
+    void SetStorageDelegate(PersistentStorageDelegate * storage);
+
     CHIP_ERROR SetUserLabelList(EndpointId endpoint, const AttributeList<UserLabelType, kMaxUserLabelListLength> & labelList);
     CHIP_ERROR AppendUserLabel(EndpointId endpoint, const UserLabelType & label);
 
@@ -112,6 +120,8 @@ class DeviceInfoProvider
     virtual SupportedCalendarTypesIterator * IterateSupportedCalendarTypes() = 0;
 
 protected:
+    PersistentStorageDelegate * mStorage = nullptr;
+
     /**
      * @brief Set the UserLabel at the specified index of the UserLabelList on a given endpoint
      *

diff --git a/src/platform/Darwin/BUILD.gn b/src/platform/Darwin/BUILD.gn
@@ -47,6 +47,8 @@ static_library("Darwin") {
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
+    "DeviceInfoProviderImpl.cpp",
+    "DeviceInfoProviderImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "DnssdImpl.cpp",