Split out Attribute Persistance between safe (can be at libCHIP level) and ember-specific (placed in codegen level)

.github/workflows/java-tests.yaml

@@ -104,6 +104,8 @@ jobs:
                       build \
                    "
             - name: Run Discover Commissionables Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -115,6 +117,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -126,6 +130,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -137,6 +143,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Extendable Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -148,6 +156,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Read Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -159,6 +169,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Write Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -170,6 +182,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run IM Subscribe Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -181,6 +195,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing AlreadyDiscovered Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -205,6 +221,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing SetupQRCode Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -216,6 +234,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing ManualCode Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -227,6 +247,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing ICD Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
@@ -252,6 +274,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing Onnetwork Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -263,6 +287,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Invoke Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -274,6 +300,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Read Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -285,6 +313,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Write Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \
@@ -296,6 +326,8 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Kotlin IM Subscribe Test
+              # Generally completes in seconds
+              timeout-minutes: 2
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_kotlin_test.py \

docs/upgrading.md

@@ -102,3 +102,8 @@ To preserve `codegen/zap` generated logic, use
 `CodegenDataModelProviderInstance` (see changes in
 [36558](https://github.com/project-chip/connectedhomeip/pull/36558) and
 [36613](https://github.com/project-chip/connectedhomeip/pull/36613) ).
+
+To use default attribute persistence, you need to pass in a
+`PersistentStorageDelegate` to `CodegenDataModelProviderInstance`. See example
+changes in [36658](https://github.com/project-chip/connectedhomeip/pull/36658)
+).

examples/air-purifier-app/ameba/main/chipinterface.cpp

@@ -135,7 +135,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 #if CONFIG_ENABLE_AMEBA_CRYPTO
     ChipLogProgress(DeviceLayer, "platform crypto enabled!");
     static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

examples/air-purifier-app/cc32xx/main/AppTask.cpp

@@ -165,7 +165,7 @@ int AppTask::Init()
     PLAT_LOG("Initialize Server");
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config

examples/all-clusters-app/ameba/main/chipinterface.cpp

@@ -150,7 +150,7 @@ static void InitServer(intptr_t context)
     initParams.appDelegate = &sAmebaObserver;
 
     initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
 #if CONFIG_ENABLE_AMEBA_CRYPTO
     ChipLogProgress(DeviceLayer, "platform crypto enabled!");

examples/all-clusters-app/asr/BUILD.gn

@@ -111,6 +111,7 @@ asr_executable("clusters_app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/lib",
     "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",

examples/all-clusters-app/infineon/psoc6/BUILD.gn

@@ -148,6 +148,7 @@ psoc6_executable("clusters_app") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/common/QRCode",
     "${chip_root}/examples/providers:device_info_provider",
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/lib",
     "${chip_root}/src/platform/logging:default",
     "${chip_root}/src/setup_payload",

examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

@@ -130,7 +130,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
     // We only have network commissioning on endpoint 0.

examples/all-clusters-app/linux/BUILD.gn

@@ -92,6 +92,7 @@ source_set("chip-all-clusters-common") {
   deps = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/app/tests/suites/credentials:dac_provider",
     "${chip_root}/src/lib",
     "${chip_root}/third_party/jsoncpp",

examples/all-clusters-app/linux/fuzzing-main.cpp

@@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
         // ChipLinuxAppMainLoop blocks, and we don't want that here.
         static chip::CommonCaseDeviceServerInitParams initParams;
         (void) initParams.InitializeStaticResourcesBeforeServerInit();
-        initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+        initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
         VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
 
         ApplicationInit();

examples/all-clusters-app/mbed/main/AppTask.cpp

@@ -72,7 +72,7 @@ int AppTask::Init()
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     error                        = Server::GetInstance().Init(initParams);
     if (error != CHIP_NO_ERROR)
     {

examples/all-clusters-app/nrfconnect/main/AppTask.cpp

@@ -227,7 +227,7 @@ CHIP_ERROR AppTask::Init()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider        = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider        = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
     AppFabricTableDelegate::Init();

examples/all-clusters-app/nxp/mw320/BUILD.gn

@@ -64,6 +64,7 @@ mw320_executable("shell_mw320") {
   ]
 
   deps = [
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/platform:syscalls_stub",
     "${chip_root}/src/platform/logging:default",
   ]

examples/all-clusters-app/nxp/mw320/main.cpp

@@ -1069,7 +1069,7 @@ static void run_chip_srv(System::Layer * aSystemLayer, void * aAppState)
 
         static chip::CommonCaseDeviceServerInitParams initParams;
         (void) initParams.InitializeStaticResourcesBeforeServerInit();
-        initParams.dataModelProvider = CodegenDataModelProviderInstance();
+        initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
         chip::Server::GetInstance().Init(initParams);
         PRINTF("Done to call chip::Server() \r\n");
     }

examples/all-clusters-app/tizen/BUILD.gn

@@ -53,6 +53,7 @@ source_set("chip-all-clusters-common") {
   deps = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common",
     "${chip_root}/examples/platform/tizen:app-main",
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/lib/shell:shell_core",
   ]
 

examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

@@ -159,7 +159,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
     initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
     static AmebaObserver sAmebaObserver;
     initParams.appDelegate = &sAmebaObserver;

examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

@@ -128,7 +128,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
     // We only have network commissioning on endpoint 0.

examples/all-clusters-minimal-app/linux/fuzzing-main.cpp

@@ -44,7 +44,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
         // ChipLinuxAppMainLoop blocks, and we don't want that here.
         static chip::CommonCaseDeviceServerInitParams initParams;
         (void) initParams.InitializeStaticResourcesBeforeServerInit();
-        initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+        initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
         VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
 
         ApplicationInit();

examples/all-clusters-minimal-app/mbed/main/AppTask.cpp

@@ -68,7 +68,7 @@ int AppTask::Init()
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     error                        = Server::GetInstance().Init(initParams);
     if (error != CHIP_NO_ERROR)
     {

examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

@@ -174,7 +174,7 @@ CHIP_ERROR AppTask::Init()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
     AppFabricTableDelegate::Init();
 

examples/chef/ameba/main/chipinterface.cpp

@@ -106,7 +106,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
     initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
     static AmebaObserver sAmebaObserver;
     initParams.appDelegate = &sAmebaObserver;

examples/chef/esp32/main/main.cpp

@@ -160,7 +160,7 @@ void InitServer(intptr_t)
     // Start IM server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
     // Device Attestation & Onboarding codes

examples/chef/nrfconnect/main.cpp

@@ -126,7 +126,7 @@ int main()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     err                          = chip::Server::GetInstance().Init(initParams);
     if (err != CHIP_NO_ERROR)
     {

examples/chip-tool/commands/common/CHIPCommand.cpp

@@ -138,7 +138,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
     factoryInitParams.opCertStore              = &mOpCertStore;
     factoryInitParams.enableServerInteractions = NeedsOperationalAdvertising();
     factoryInitParams.sessionKeystore          = &sSessionKeystore;
-    factoryInitParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance();
+    factoryInitParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance(&mDefaultStorage);
 
     // Init group data provider that will be used for all group keys and IPKs for the
     // chip-tool-configured fabrics. This is OK to do once since the fabric tables

examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

@@ -299,7 +299,7 @@ void AppTask::InitServer(intptr_t arg)
 {
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
     auto & infoProvider = chip::DeviceLayer::DeviceInfoProviderImpl::GetDefaultInstance();
     infoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);

examples/energy-management-app/linux/BUILD.gn

@@ -64,6 +64,7 @@ executable("chip-energy-management-app") {
   deps = [
     "${chip_root}/examples/energy-management-app/energy-management-common",
     "${chip_root}/examples/platform/linux:app-main",
+    "${chip_root}/src/app:attribute-persistence",
     "${chip_root}/src/lib",
   ]
 

examples/energy-management-app/silabs/BUILD.gn

@@ -195,6 +195,7 @@ silabs_executable("energy-management-app") {
 
   deps = [
     ":sdk",
+    "${chip_root}/src/app:attribute-persistence",
     app_data_model,
   ]
 

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

@@ -123,7 +123,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
     factoryInitParams.opCertStore              = &mOpCertStore;
     factoryInitParams.enableServerInteractions = NeedsOperationalAdvertising();
     factoryInitParams.sessionKeystore          = &sSessionKeystore;
-    factoryInitParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance();
+    factoryInitParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance(&mDefaultStorage);
 
     // Init group data provider that will be used for all group keys and IPKs for the
     // fabric-admin-configured fabrics. This is OK to do once since the fabric tables

examples/light-switch-app/ameba/main/chipinterface.cpp

@@ -105,7 +105,7 @@ static void InitServer(intptr_t context)
     // Init ZCL Data Model and CHIP App Server
     static chip::CommonCaseDeviceServerInitParams initParams;
     initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 #if CONFIG_ENABLE_AMEBA_CRYPTO
     ChipLogProgress(DeviceLayer, "platform crypto enabled!");
     static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

@@ -325,7 +325,7 @@ int AppTask::Init()
     static DefaultTestEventTriggerDelegate sTestEventTriggerDelegate{ ByteSpan(sTestEventTriggerEnableKey) };
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
 
     // Initialize info provider
     sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);