Apply PR comments

project-chip · Nov 16, 2021 · 9317ec0 · 9317ec0
1 parent c71b92e
commit 9317ec0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -164,7 +164,7 @@ class {{filename}}: public TestCommand
         {{else}}
         chip::Controller::{{asUpperCamelCase cluster}}ClusterTest cluster;
         {{#if isGroupCommand}}
-        cluster.Associate(groupId, mDevice);
+        cluster.AssociateWithGroup(mDevice, groupId);
         {{else}}
         cluster.Associate(mDevice, endpoint);
         {{/if}}

diff --git a/src/controller/CHIPCluster.cpp b/src/controller/CHIPCluster.cpp
@@ -42,10 +42,11 @@ CHIP_ERROR ClusterBase::Associate(DeviceProxy * device, EndpointId endpoint)
     return err;
 }
 
-CHIP_ERROR ClusterBase::Associate(GroupId groupId, DeviceProxy * device)
+CHIP_ERROR ClusterBase::AssociateWithGroup(DeviceProxy * device, GroupId groupId)
 {
+    // TODO Update this function to work in all possible conditions Issue #11850
+
     CHIP_ERROR err = CHIP_NO_ERROR;
-    // TODO: Check if the device supports mCluster at the requested endpoint
 
     mDevice = device;
     if (mDevice->GetSecureSession().HasValue())

diff --git a/src/controller/CHIPCluster.h b/src/controller/CHIPCluster.h
@@ -51,7 +51,7 @@ class DLL_EXPORT ClusterBase
     virtual ~ClusterBase() {}
 
     CHIP_ERROR Associate(DeviceProxy * device, EndpointId endpoint);
-    CHIP_ERROR Associate(GroupId groupId, DeviceProxy * device);
+    CHIP_ERROR AssociateWithGroup(DeviceProxy * device, GroupId groupId);
 
     void Dissociate();