Groups cluster: GroupInfo is now removed from the GroupTable whenever…

… the last endpoint is removed from the group. (#19221)
project-chip · Jul 5, 2022 · e3a3f65 · e3a3f65
1 parent c5477e4
commit e3a3f65
Show file tree

Hide file tree

Showing 4 changed files with 173 additions and 18 deletions.
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -223,6 +223,35 @@ tests:
                         EpochStartTime2: 2110002,
                     }
 
+    - label: "Remove Group 1"
+      cluster: "Groups"
+      endpoint: 1
+      command: "RemoveGroup"
+      arguments:
+          values:
+              - name: "groupId"
+                value: 0x0101
+      response:
+          values:
+              - name: "status"
+                value: 0
+              - name: "groupId"
+                value: 0x0101
+
+    - label: "Read GroupTable 2"
+      command: "readAttribute"
+      attribute: "GroupTable"
+      response:
+          value:
+              [
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0102,
+                      endpoints: [1],
+                      GroupName: "Group #2",
+                  },
+              ]
+
     - label: "Remove All"
       cluster: "Groups"
       endpoint: 1

diff --git a/src/credentials/GroupDataProviderImpl.cpp b/src/credentials/GroupDataProviderImpl.cpp
@@ -1187,11 +1187,15 @@ CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index,
         prev.next = endpoint.next;
         ReturnErrorOnFailure(prev.Save(mStorage));
     }
-    if (group.endpoint_count > 0)
+
+    if (group.endpoint_count > 1)
     {
         group.endpoint_count--;
+        return group.Save(mStorage);
     }
-    return group.Save(mStorage);
+
+    // No more endpoints, remove the group
+    return RemoveGroupInfoAt(fabric_index, group.index);
 }
 
 CHIP_ERROR GroupDataProviderImpl::RemoveEndpoint(chip::FabricIndex fabric_index, chip::EndpointId endpoint_id)

diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h