Enable AttributeAccessInterface for Basic cluster (#13852)

* Enable AttributeAccessInterface for Basic cluster * Run codegen
project-chip · Jan 27, 2022 · 1c6b3c8 · 1c6b3c8
1 parent a5e3b54
commit 1c6b3c8
Show file tree

Hide file tree

Showing 9 changed files with 181 additions and 37 deletions.
diff --git a/src/app/clusters/basic/basic.cpp b/src/app/clusters/basic/basic.cpp
@@ -320,5 +320,6 @@ void emberAfBasicClusterServerInitCallback(chip::EndpointId endpoint)
 
 void MatterBasicPluginServerInitCallback()
 {
+    registerAttributeAccessOverride(&gAttrAccess);
     PlatformMgr().SetDelegate(&gPlatformMgrDelegate);
 }
diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml
@@ -22,9 +22,8 @@ tests:
     - label: "Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
-    #Disabled due to issue-12983
+
     - label: "Read location"
-      disabled: true
       command: "readAttribute"
       attribute: "location"
       response:
@@ -35,9 +34,8 @@ tests:
       attribute: "location"
       arguments:
           value: "us"
-    #Disabled due to issue-12983
+
     - label: "Read back location"
-      disabled: true
       command: "readAttribute"
       attribute: "location"
       response:
@@ -47,7 +45,7 @@ tests:
       command: "writeAttribute"
       attribute: "location"
       arguments:
-          value: ""
+          value: "XX"
 
     - label: "Read AttributeList value"
       command: "readAttribute"

diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml
@@ -84,14 +84,14 @@ tests:
       attribute: "location"
       groupId: "1"
       arguments:
-          value: ""
+          value: "XX"
 
     # Test Pair 2 : Validates previous group write attribute with a unicast to read
     - label: "Read back Attribute"
       command: "readAttribute"
       attribute: "location"
       response:
-          value: ""
+          value: "XX"
 
     # Test Pair 3 : Sends a Group command
     - label: "Turn On the light to see attribute change"

diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py
@@ -260,7 +260,7 @@ class AttributeWriteRequest:
         requests = [
             AttributeWriteRequest("Basic", "NodeLabel", "Test"),
             AttributeWriteRequest("Basic", "Location",
-                                  "a pretty loooooooooooooog string", IM.Status.InvalidValue),
+                                  "a pretty loooooooooooooog string", IM.Status.Failure),
         ]
         failed_zcl = []
         for req in requests:

diff --git a/src/controller/python/test/test_scripts/cluster_objects.py b/src/controller/python/test/test_scripts/cluster_objects.py
@@ -114,7 +114,7 @@ async def SendWriteRequest(cls, devCtrl):
             AttributeStatus(Path=AttributePath(EndpointId=0, ClusterId=40,
                             AttributeId=5), Status=chip.interaction_model.Status.Success),
             AttributeStatus(Path=AttributePath(EndpointId=0, ClusterId=40,
-                            AttributeId=6), Status=chip.interaction_model.Status.InvalidValue)
+                            AttributeId=6), Status=chip.interaction_model.Status.Failure)
         ]
 
         if res != expectedRes:

diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
diff --git a/src/platform/Darwin/ConfigurationManagerImpl.cpp b/src/platform/Darwin/ConfigurationManagerImpl.cpp
@@ -30,6 +30,7 @@
 #include <platform/Darwin/PosixConfig.h>
 #include <platform/internal/GenericConfigurationManagerImpl.cpp>
 
+#include <lib/support/CHIPMemString.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/logging/CHIPLogging.h>
 
@@ -193,6 +194,20 @@ CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(::chip::Platform
     return WriteConfigValue(configKey, value);
 }
 
+CHIP_ERROR ConfigurationManagerImpl::StoreCountryCode(const char * code, size_t codeLen)
+{
+    Platform::CopyString(mCountryCode, kCountryCodeLength + 1, code);
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR ConfigurationManagerImpl::GetCountryCode(char * buf, size_t bufSize, size_t & codeLen)
+{
+    Platform::CopyString(buf, kCountryCodeLength + 1, mCountryCode);
+    codeLen = strlen(mCountryCode);
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR ConfigurationManagerImpl::ReadConfigValue(Key key, bool & val)
 {
     return PosixConfig::ReadConfigValue(key, val);

diff --git a/src/platform/Darwin/ConfigurationManagerImpl.h b/src/platform/Darwin/ConfigurationManagerImpl.h
@@ -30,6 +30,8 @@
 namespace chip {
 namespace DeviceLayer {
 
+static constexpr int kCountryCodeLength = 2;
+
 /**
  * Concrete implementation of the ConfigurationManager singleton object for the Darwin platform.
  */
@@ -40,6 +42,8 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     static ConfigurationManagerImpl & GetDefaultInstance();
 
 private:
+    char mCountryCode[kCountryCodeLength + 1];
+
     // ===== Members that implement the ConfigurationManager public interface.
 
     CHIP_ERROR Init(void) override;
@@ -48,6 +52,8 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     void InitiateFactoryReset(void) override;
     CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
     CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
+    CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen) override;
+    CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen) override;
 
     // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.