Create an AAI registry for PwRPC services to allow registration of custom AAI classes

examples/common/pigweed/rpc_services/Attributes.h

@@ -24,6 +24,7 @@
 
 #include <app-common/zap-generated/attribute-type.h>
 #include <app/AppConfig.h>
+#include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/AttributeValueEncoder.h>
 #include <app/InteractionModelEngine.h>
 #include <app/MessageDef/AttributeReportIBs.h>
@@ -33,6 +34,7 @@
 #include <app/data-model-provider/Provider.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/attribute-table.h>
+#include <data-model-providers/codegen/CodegenDataModelProvider.h>
 #include <lib/core/TLV.h>
 #include <lib/core/TLVTags.h>
 #include <lib/core/TLVTypes.h>
@@ -41,6 +43,25 @@
 namespace chip {
 namespace rpc {
 
+/** @brief
+ *    This class is specifically meant for registering custom Attribute Access Interfaces that
+ *    allow to read/modify the state of an attribute at its raw storage location. This should
+ *    not be used in code paths that need to be matter spec compliant. It is meant to be used
+ *    by Pw RPC to add device simulation for tests.
+ */
+class RawAttributeAccessInterfaceRegistry : public chip::app::AttributeAccessInterfaceRegistry
+{
+public:
+    /**
+     *  Get the singleton instance.
+     */
+    static RawAttributeAccessInterfaceRegistry & Instance()
+    {
+        static RawAttributeAccessInterfaceRegistry instance;
+        return instance;
+    }
+};
+
 // Implementation class for chip.rpc.Attributes.
 class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
 {
@@ -207,6 +228,31 @@ class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
         }
 
         app::AttributeValueDecoder decoder(tlvReader.value(), subjectDescriptor);
+
+        // Try to write using a custom AAI first
+        chip::app::AttributeAccessInterface * customAai =
+            RawAttributeAccessInterfaceRegistry::Instance().Get(write_request.path.mEndpointId, write_request.path.mClusterId);
+        std::optional<CHIP_ERROR> aaiResult = chip::app::TryWriteViaAccessInterface(write_request.path, customAai, decoder);
+        if (aaiResult.has_value())
+        {
+            if (*aaiResult == CHIP_NO_ERROR)
+            {
+                ChipLogProgress(Support, "Successfully changed attribute value using custom AAI Write.");
+                // TODO: Call emberAfAttributeChanged here or let AAI decide?
+                return pw::OkStatus();
+            }
+            else
+            {
+                ChipLogError(Support, "Failed to write data: %" CHIP_ERROR_FORMAT, (*aaiResult).Format());
+                return ::pw::Status::Internal();
+            }
+        }
+        else
+        {
+            ChipLogProgress(Support, "No custom AAI Write registration found for: endpoint=%u cluster=%u",
+                            write_request.path.mEndpointId, write_request.path.mClusterId);
+        }
+
         app::DataModel::ActionReturnStatus result = provider->WriteAttribute(write_request, decoder);
 
         if (!result.IsSuccess())

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

@@ -18,6 +18,7 @@
 
 #include <app/data-model-provider/Provider.h>
 
+#include <app/AttributeAccessInterface.h>
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
@@ -121,5 +122,7 @@ class CodegenDataModelProvider : public DataModel::Provider
     std::optional<unsigned> TryFindEndpointIndex(EndpointId id) const;
 };
 
+std::optional<CHIP_ERROR> TryWriteViaAccessInterface(const ConcreteDataAttributePath & path, AttributeAccessInterface * aai,
+                                                     AttributeValueDecoder & decoder);
 } // namespace app
 } // namespace chip

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

@@ -57,6 +57,7 @@ class ContextAttributesChangeListener : public AttributesChangedListener
 private:
     DataModel::ProviderChangeListener * mListener;
 };
+} // namespace
 
 /// Attempts to write via an attribute access interface (AAI)
 ///
@@ -86,8 +87,6 @@ std::optional<CHIP_ERROR> TryWriteViaAccessInterface(const ConcreteDataAttribute
     return decoder.TriedDecode() ? std::make_optional(CHIP_NO_ERROR) : std::nullopt;
 }
 
-} // namespace
-
 DataModel::ActionReturnStatus CodegenDataModelProvider::WriteAttribute(const DataModel::WriteAttributeRequest & request,
                                                                        AttributeValueDecoder & decoder)
 {