Changing AcceptedCommands Interface

admin_storage.json

@@ -0,0 +1,30 @@
+{
+    "sdk-config": {
+        "g/lkgt": "FSYAgKi8LBg=",
+        "g/gcc": "aJuaDw==",
+        "g/gdc": "eVQ1Cw==",
+        "ExampleOpCredsCAKey1": "BNJGVNf+KuPMsKB1rJHyNZEKiXS/0lXyW0m7Als9bGvS7yhgFy5HlZ+Ukuju7DyicIXPC+NAVNdWttf+z0YrSKNpPaFJxR1qyW4+aqrqzIEw0UYHFzL5wed7AWRtDb2PWw==",
+        "ExampleOpCredsICAKey1": "BJW39nhSeUPdfSELvjAuf7wNkny6xkzxC1eeb0p/FmcrVv7q0x+z5J7p61o1OgAW4mbyB2UPofsRjDWwxGVIUfwpnurkR+oLOyjiZD0cr+gPwpSO46drERQj8HTtbWs41g==",
+        "ExampleCARootCert1": "MIICQDCCAeagAwIBAgIBATAKBggqhkjOPQQDAjAiMSAwHgYKKwYBBAGConwBBAwQMDAwMDAwMDAwMDAwMDAwMTAeFw0yMTAxMDEwMDAwMDBaFw0zMDEyMzAwMDAwMDBaMCIxIDAeBgorBgEEAYKifAEEDBAwMDAwMDAwMDAwMDAwMDAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0kZU1/4q48ywoHWskfI1kQqJdL/SVfJbSbsCWz1sa9LvKGAXLkeVn5SS6O7sPKJwhc8L40BU11a21/7PRitIo6OCAQswggEHMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR8Wtrm0OOd3zySOb6aEq9hbKPh8zAfBgNVHSMEGDAWgBR8Wtrm0OOd3zySOb6aEq9hbKPh8zCBowYDVR0RBIGbBIGYQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUEwCgYIKoZIzj0EAwIDSAAwRQIga+q2BK+HvAMpEJyc7rSs+JYLA+cablmaGnsUorQH+3ICIQDA9jARNp0krnq63VIPqaD1Bjovim6XVv6/ykQbnzlP9g==",
+        "ExampleCAIntermediateCert1": "MIICQDCCAeagAwIBAgIBATAKBggqhkjOPQQDAjAiMSAwHgYKKwYBBAGConwBBAwQMDAwMDAwMDAwMDAwMDAwMTAeFw0yMTAxMDEwMDAwMDBaFw0zMDEyMzAwMDAwMDBaMCIxIDAeBgorBgEEAYKifAEDDBAwMDAwMDAwMDAwMDAwMDAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElbf2eFJ5Q919IQu+MC5/vA2SfLrGTPELV55vSn8WZytW/urTH7PknunrWjU6ABbiZvIHZQ+h+xGMNbDEZUhR/KOCAQswggEHMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSPbIW5kR4R1557pNLcxyJ9vZNQMzAfBgNVHSMEGDAWgBR8Wtrm0OOd3zySOb6aEq9hbKPh8zCBowYDVR0RBIGbBIGYQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUEwCgYIKoZIzj0EAwIDSAAwRQIgaPSHU75svsHLrV0tdEBclY6Z5VPkrz6xbzsno58STfkCIQCxlHJT9IjBeT1zWWSUyBL6+cAkExMZQsFdWFqbqbe0/w==",
+        "f/1/m": "FSUA8f8sAQAY",
+        "f/1/n": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVASYRabYBACYWAQABABgkBwEkCAEwCUEETnxLK2KKVrJyEhLk5xyAxAYWS2dO4jwCeh1mXoQ2fOUSrJRm+5+xfi5R26bkzSzsmODu6KNt+VgXaeD2iUF/2jcKNQEoARgkAgE2AwQCBAEYMAQUmOnoN7kLzgFda1sM0KEC/RdvyqUwBRSPbIW5kR4R1557pNLcxyJ9vZNQMxgwC0B1yrr3+GDFOPQ6KXRQmcag5m7FPf8NjHVwHOZlJuit/oWFrKHJ1zWUhT7ulDlpRTEJb7UWMgGJbvK9b3UjR/gsGA==",
+        "f/1/i": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEElbf2eFJ5Q919IQu+MC5/vA2SfLrGTPELV55vSn8WZytW/urTH7PknunrWjU6ABbiZvIHZQ+h+xGMNbDEZUhR/DcKNQEpARgkAmAwBBSPbIW5kR4R1557pNLcxyJ9vZNQMzAFFHxa2ubQ453fPJI5vpoSr2Fso+HzMAamMIGjBgNVHREEgZsEgZhBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQRgwC0Bo9IdTvmy+wcutXS10QFyVjpnlU+SvPrFvOyejnxJN+bGUclP0iMF5PXNZZJTIEvr5wCQTExlCwV1YWpupt7T/GA==",
+        "f/1/r": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEE0kZU1/4q48ywoHWskfI1kQqJdL/SVfJbSbsCWz1sa9LvKGAXLkeVn5SS6O7sPKJwhc8L40BU11a21/7PRitIozcKNQEpARgkAmAwBBR8Wtrm0OOd3zySOb6aEq9hbKPh8zAFFHxa2ubQ453fPJI5vpoSr2Fso+HzMAamMIGjBgNVHREEgZsEgZhBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQRgwC0Br6rYEr4e8AykQnJzutKz4lgsD5xpuWZoaexSitAf7csD2MBE2nSSuerrdUg+poPUGOi+KbpdW/r/KRBufOU/2GA==",
+        "g/fidx": "FSQAAjYBBAEYGA==",
+        "f/1/k/0": "FSQBACQCATYDFSQEACUFIjQwBhDpydi+x69atQKt/+IHwIAUGBUkBAAkBQAwBhAAAAAAAAAAAAAAAAAAAAAAGBUkBAAkBQAwBhAAAAAAAAAAAAAAAAAAAAAAGBglB///GA==",
+        "g/gfl": "FSQBASQCARg=",
+        "f/1/g": "FSQBACQCACQDACQEACQFACQGASQHABg=",
+        "g/icdfl": "FgQBGA=="
+    },
+    "repl-config": {
+        "caList": {
+            "1": [
+                {
+                    "fabricId": 1,
+                    "vendorId": 65521
+                }
+            ]
+        }
+    }
+}

src/access/ProviderDeviceTypeResolver.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include <access/AccessControl.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/Provider.h>
 

src/app/AttributePathExpandIterator.cpp

@@ -17,7 +17,7 @@
 #include <app/AttributePathExpandIterator.h>
 
 #include <app/GlobalAttributes.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataLookup.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <lib/core/DataModelTypes.h>

src/app/AttributePathExpandIterator.h

@@ -19,7 +19,7 @@
 
 #include <app/AttributePathParams.h>
 #include <app/ConcreteAttributePath.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/Provider.h>
 #include <lib/core/DataModelTypes.h>

src/app/CommandHandlerInterface.h

@@ -23,11 +23,15 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/Decode.h>
 #include <app/data-model/List.h> // So we can encode lists
+#include <app/data-model/MetadataList.h> // So we can get filled buffers
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/Iterators.h>
 
 namespace chip {
 namespace app {
+namespace DataModel {
+    struct AcceptedCommandEntry;
+}
 
 /*
  * This interface permits applications to register a server-side command handler
@@ -122,7 +126,7 @@ class CommandHandlerInterface
      * This is used by callbacks that just look for a particular value in the
      * list.
      */
-    virtual CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context)
+    virtual CHIP_ERROR EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, DataModel::ListBuilder<DataModel::AcceptedCommandEntry> & builder)
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
@@ -146,7 +150,7 @@ class CommandHandlerInterface
      * This is used by callbacks that just look for a particular value in the
      * list.
      */
-    virtual CHIP_ERROR EnumerateGeneratedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context)
+    virtual CHIP_ERROR EnumerateGeneratedCommands(const ConcreteClusterPath & cluster, CommandIdCallback, void * context)
     {
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }

src/app/InteractionModelEngine.cpp

@@ -37,7 +37,7 @@
 #include <app/EventPathParams.h>
 #include <app/RequiredPrivilege.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataLookup.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/OperationTypes.h>

src/app/clusters/descriptor/descriptor.cpp

@@ -23,7 +23,7 @@
 #include <app/AttributeAccessInterface.h>
 #include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model/List.h>
 #include <app/util/attribute-storage.h>

src/app/clusters/device-energy-management-server/device-energy-management-server.cpp

@@ -104,46 +104,46 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
 }
 
 // CommandHandlerInterface
-CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, CommandIdCallback callback, void * context)
+CHIP_ERROR Instance::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, ListBuilder<AcceptedCommandEntry> & builder)
 {
     using namespace Commands;
+    using QF = DataModel::CommandQualityFlags;
 
     if (HasFeature(Feature::kPowerAdjustment))
     {
-        for (auto && cmd : {
-                 PowerAdjustRequest::Id,
-                 CancelPowerAdjustRequest::Id,
-             })
-        {
-            VerifyOrExit(callback(cmd, context) == Loop::Continue, /**/);
-        }
+        VerifyOrExit(builder.AppendElements({
+            {PowerAdjustRequest::Id,       QF::kFabricScoped, Access::Privilege::kOperate}, //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
+            {CancelPowerAdjustRequest::Id, QF::kFabricScoped, Access::Privilege::kOperate}  //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
+        }));
     }
 
     if (HasFeature(Feature::kStartTimeAdjustment))
     {
-        VerifyOrExit(callback(StartTimeAdjustRequest::Id, context) == Loop::Continue, /**/);
+        VerifyOrExit(builder.AppendElement({StartTimeAdjustRequest::Id, QF::kFabricScoped})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
     }
 
     if (HasFeature(Feature::kPausable))
     {
-        VerifyOrExit(callback(PauseRequest::Id, context) == Loop::Continue, /**/);
-        VerifyOrExit(callback(ResumeRequest::Id, context) == Loop::Continue, /**/);
+        VerifyOrExit(builder.AppendElements({
+            {PauseRequest::Id,  QF::kFabricScoped, Access::Privilege::kOperate},
+            {ResumeRequest::Id, BitFlags<QF>(QF::kFabricScoped), Access::Privilege::kOperate}
+        }));
     }
 
     if (HasFeature(Feature::kForecastAdjustment))
     {
-        VerifyOrExit(callback(ModifyForecastRequest::Id, context) == Loop::Continue, /**/);
+        VerifyOrExit(builder.AppendElement({ModifyForecastRequest::Id, QF::kFabricScoped})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
     }
 
     if (HasFeature(Feature::kConstraintBasedAdjustment))
     {
-        VerifyOrExit(callback(RequestConstraintBasedForecast::Id, context) == Loop::Continue, /**/);
+       VerifyOrExit(builder.AppendElement({ModifyForecastRequest::Id, QF::kFabricScoped})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
     }
 
     if (HasFeature(Feature::kStartTimeAdjustment) || HasFeature(Feature::kForecastAdjustment) ||
         HasFeature(Feature::kConstraintBasedAdjustment))
     {
-        VerifyOrExit(callback(CancelRequest::Id, context) == Loop::Continue, /**/);
+        VerifyOrExit(builder.AppendElement({CancelRequest::Id, QF::kFabricScoped})); //TODO:: WHAT IS THE NEEDED PRIVILEGE AND CommandQualityFlags
     }
 
 exit:

src/app/data-model-provider/BUILD.gn

@@ -31,8 +31,6 @@ source_set("data-model-provider") {
     "ActionReturnStatus.h",
     "Context.h",
     "EventsGenerator.h",
-    "MetadataList.cpp",
-    "MetadataList.h",
     "MetadataLookup.cpp",
     "MetadataLookup.h",
     "OperationTypes.h",

src/app/data-model-provider/MetadataLookup.cpp

@@ -15,7 +15,7 @@
  */
 #include <app/data-model-provider/MetadataLookup.h>
 
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 
 namespace chip {
 namespace app {

src/app/data-model-provider/MetadataLookup.h

@@ -19,7 +19,7 @@
 
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteClusterPath.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/ProviderMetadataTree.h>
 #include <lib/core/DataModelTypes.h>

src/app/data-model-provider/ProviderMetadataTree.cpp

@@ -17,7 +17,7 @@
 
 #include <app/data-model-provider/ProviderMetadataTree.h>
 
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 
 namespace chip {
 namespace app {

src/app/data-model-provider/ProviderMetadataTree.h

@@ -21,7 +21,7 @@
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteClusterPath.h>
 #include <app/ConcreteCommandPath.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model/List.h>
 #include <lib/support/Span.h>

src/app/data-model-provider/tests/TestMetadataList.cpp

@@ -22,7 +22,7 @@
 
 #include <pw_unit_test/framework.h>
 
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 
 #include <lib/core/CHIPError.h>
 #include <lib/core/DataModelTypes.h>

src/app/data-model/BUILD.gn

@@ -38,6 +38,8 @@ source_set("data-model") {
     "FabricScopedPreEncodedValue.cpp",
     "FabricScopedPreEncodedValue.h",
     "List.h",
+    "MetadataList.cpp",
+    "MetadataList.h",
     "PreEncodedValue.cpp",
     "PreEncodedValue.h",
     "WrappedStructEncoder.h",

src/app/data-model-provider/MetadataList.cpp → src/app/data-model/MetadataList.cpp

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPMem.h>

src/app/reporting/Engine.cpp

@@ -172,7 +172,7 @@ DataModel::ActionReturnStatus RetrieveClusterData(DataModel::Provider * dataMode
     reportBuilder.Checkpoint(checkpoint);
 
     DataModel::ActionReturnStatus status(CHIP_NO_ERROR);
-    AttributeValueEncoder attributeValueEncoder(reportBuilder, subjectDescriptor, path, version, isFabricFiltered, encoderState);
+    AttributeValueEncoder attributeValueEncoder ={reportBuilder, subjectDescriptor, path, version, isFabricFiltered, encoderState};
 
     // TODO: we explicitly DO NOT validate that path is a valid cluster path (even more, above serverClusterFinder
     //       explicitly ignores that case). This means that global attribute reads as well as ReadAttribute

src/controller/tests/TestServerCommandDispatch.cpp

@@ -104,8 +104,7 @@ void TestClusterCommandHandler::InvokeCommand(chip::app::CommandHandlerInterface
         });
 }
 
-CHIP_ERROR TestClusterCommandHandler::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster,
-                                                                CommandHandlerInterface::CommandIdCallback callback, void * context)
+CHIP_ERROR TestClusterCommandHandler::EnumerateAcceptedCommands(const ConcreteClusterPath & cluster, ListBuilder<AcceptedCommandEntry> & builder)
 {
     if (!mOverrideAcceptedCommands)
     {
@@ -116,7 +115,7 @@ CHIP_ERROR TestClusterCommandHandler::EnumerateAcceptedCommands(const ConcreteCl
     {
         return CHIP_NO_ERROR;
     }
-
+    builder.get
     // We just have one command id.
     callback(Clusters::UnitTesting::Commands::TestSimpleArgumentRequest::Id, context);
     return CHIP_NO_ERROR;

src/data-model-providers/codegen/CodegenDataModelProvider.cpp

@@ -25,7 +25,7 @@
 #include <app/ConcreteCommandPath.h>
 #include <app/EventPathParams.h>
 #include <app/RequiredPrivilege.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/Provider.h>
 #include <app/util/DataModelHandler.h>
@@ -335,53 +335,7 @@ CHIP_ERROR CodegenDataModelProvider::AcceptedCommands(const ConcreteClusterPath
         CommandHandlerInterfaceRegistry::Instance().GetCommandHandler(path.mEndpointId, path.mClusterId);
     if (interface != nullptr)
     {
-        size_t commandCount = 0;
-
-        CHIP_ERROR err = interface->EnumerateAcceptedCommands(
-            path,
-            [](CommandId id, void * context) -> Loop {
-                *reinterpret_cast<size_t *>(context) += 1;
-                return Loop::Continue;
-            },
-            reinterpret_cast<void *>(&commandCount));
-
-        if (err == CHIP_NO_ERROR)
-        {
-            using EnumerationData = struct
-            {
-                ConcreteCommandPath commandPath;
-                DataModel::ListBuilder<DataModel::AcceptedCommandEntry> * acceptedCommandList;
-                CHIP_ERROR processingError;
-            };
-
-            EnumerationData enumerationData;
-            enumerationData.commandPath         = ConcreteCommandPath(path.mEndpointId, path.mClusterId, kInvalidCommandId);
-            enumerationData.processingError     = CHIP_NO_ERROR;
-            enumerationData.acceptedCommandList = &builder;
-
-            ReturnErrorOnFailure(builder.EnsureAppendCapacity(commandCount));
-
-            ReturnErrorOnFailure(interface->EnumerateAcceptedCommands(
-                path,
-                [](CommandId commandId, void * context) -> Loop {
-                    auto input                    = reinterpret_cast<EnumerationData *>(context);
-                    input->commandPath.mCommandId = commandId;
-                    CHIP_ERROR appendError        = input->acceptedCommandList->Append(AcceptedCommandEntryFor(input->commandPath));
-                    if (appendError != CHIP_NO_ERROR)
-                    {
-                        input->processingError = appendError;
-                        return Loop::Break;
-                    }
-                    return Loop::Continue;
-                },
-                reinterpret_cast<void *>(&enumerationData)));
-            ReturnErrorOnFailure(enumerationData.processingError);
-
-            // the two invocations MUST return the same sizes.
-            VerifyOrReturnError(builder.Size() == commandCount, CHIP_ERROR_INTERNAL);
-            return CHIP_NO_ERROR;
-        }
-        VerifyOrReturnError(err == CHIP_ERROR_NOT_IMPLEMENTED, err);
+        ReturnErrorOnFailure(interface->EnumerateAcceptedCommands(path, builder));
     }
 
     VerifyOrReturnError(serverCluster->acceptedCommandList != nullptr, CHIP_NO_ERROR);
@@ -420,48 +374,8 @@ CHIP_ERROR CodegenDataModelProvider::GeneratedCommands(const ConcreteClusterPath
     if (interface != nullptr)
     {
         size_t commandCount = 0;
-
-        CHIP_ERROR err = interface->EnumerateGeneratedCommands(
-            path,
-            [](CommandId id, void * context) -> Loop {
-                *reinterpret_cast<size_t *>(context) += 1;
-                return Loop::Continue;
-            },
-            reinterpret_cast<void *>(&commandCount));
-
-        if (err == CHIP_NO_ERROR)
-        {
-            ReturnErrorOnFailure(builder.EnsureAppendCapacity(commandCount));
-
-            using EnumerationData = struct
-            {
-                DataModel::ListBuilder<CommandId> * generatedCommandList;
-                CHIP_ERROR processingError;
-            };
-            EnumerationData enumerationData;
-            enumerationData.processingError      = CHIP_NO_ERROR;
-            enumerationData.generatedCommandList = &builder;
-
-            ReturnErrorOnFailure(interface->EnumerateGeneratedCommands(
-                path,
-                [](CommandId id, void * context) -> Loop {
-                    auto input = reinterpret_cast<EnumerationData *>(context);
-
-                    CHIP_ERROR appendError = input->generatedCommandList->Append(id);
-                    if (appendError != CHIP_NO_ERROR)
-                    {
-                        input->processingError = appendError;
-                        return Loop::Break;
-                    }
-                    return Loop::Continue;
-                },
-                reinterpret_cast<void *>(&enumerationData)));
-            ReturnErrorOnFailure(enumerationData.processingError);
-
-            // the two invocations MUST return the same sizes.
-            VerifyOrReturnError(builder.Size() == commandCount, CHIP_ERROR_INTERNAL);
-            return CHIP_NO_ERROR;
-        }
+        CHIP_ERROR err = interface->EnumerateGeneratedCommands(path, builder);
+        // if err == CHIP_ERROR_NOT_IMPLEMENTED then continue, else just return whatever err is
         VerifyOrReturnError(err == CHIP_ERROR_NOT_IMPLEMENTED, err);
     }
 

src/data-model-providers/codegen/CodegenDataModelProvider.h

@@ -21,7 +21,7 @@
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
-#include <app/data-model-provider/MetadataList.h>
+#include <app/data-model/MetadataList.h>
 #include <app/util/af-types.h>
 #include <lib/core/CHIPPersistentStorageDelegate.h>