Match default group and ACL values to Specification (#24338)

* Update CHIPConfig.h to match specification changes in Group Limits. * Update tests for changes to group and ACL minima. * Restyled by clang-format * Restyled by autopep8 * Correct group key assignment in test suite. * Update TC_RR_1_1.py to include new group tests as well. * Update with latest zap generated test Commands * Reduce debug log buffer for TI CC26X2X7 shell app. THere was insufficient space in SRAM region. * Resolve comments - improve errors and remove extra print. Co-authored-by: Restyled.io <[email protected]>
project-chip · Sep 5, 2023 · 07f5f59 · 07f5f59
1 parent 19a5473
commit 07f5f59
Show file tree

Hide file tree

Showing 7 changed files with 1,182 additions and 159 deletions.
diff --git a/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h b/examples/shell/cc13x2x7_26x2x7/include/CHIPProjectConfig.h
@@ -73,7 +73,7 @@
  *
  * A size, in bytes, of the individual debug event logging buffer.
  */
-#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (256)
 
 #define MATTER_CC13X2_26X2_PLATFORM_LOG_ENABLED 0
 

diff --git a/src/app/tests/suites/TestAccessControlCluster.yaml b/src/app/tests/suites/TestAccessControlCluster.yaml
@@ -69,6 +69,18 @@ tests:
                               { Cluster: 18, Endpoint: 19, DeviceType: null },
                           ],
                   },
+                  {
+                      FabricIndex: 0,
+                      Privilege: 3, # operate
+                      AuthMode: 2, # case
+                      Subjects: [20, 21, 22, 23],
+                      Targets:
+                          [
+                              { Cluster: null, Endpoint: 24, DeviceType: null },
+                              { Cluster: 25, Endpoint: null, DeviceType: null },
+                              { Cluster: 26, Endpoint: 27, DeviceType: null },
+                          ],
+                  },
               ]
 
     - label: "Verify"
@@ -112,6 +124,18 @@ tests:
                               { Cluster: 18, Endpoint: 19, DeviceType: null },
                           ],
                   },
+                  {
+                      FabricIndex: 1,
+                      Privilege: 3, # operate
+                      AuthMode: 2, # case
+                      Subjects: [20, 21, 22, 23],
+                      Targets:
+                          [
+                              { Cluster: null, Endpoint: 24, DeviceType: null },
+                              { Cluster: 25, Endpoint: null, DeviceType: null },
+                              { Cluster: 26, Endpoint: 27, DeviceType: null },
+                          ],
+                  },
               ]
 
     - label: "Write entries empty lists"
@@ -476,6 +500,18 @@ tests:
                               { Cluster: 26, Endpoint: 27, DeviceType: null },
                           ],
                   },
+                  {
+                      FabricIndex: 0,
+                      Privilege: 3, # operate
+                      AuthMode: 2, # case
+                      Subjects: [28, 29, 30, 31],
+                      Targets:
+                          [
+                              { Cluster: null, Endpoint: 32, DeviceType: null },
+                              { Cluster: 33, Endpoint: null, DeviceType: null },
+                              { Cluster: 34, Endpoint: 35, DeviceType: null },
+                          ],
+                  },
               ]
       response:
           error: RESOURCE_EXHAUSTED
@@ -521,6 +557,18 @@ tests:
                               { Cluster: 18, Endpoint: 19, DeviceType: null },
                           ],
                   },
+                  {
+                      FabricIndex: 1,
+                      Privilege: 1, # view
+                      AuthMode: 2, # case
+                      Subjects: [20, 21, 22, 23],
+                      Targets:
+                          [
+                              { Cluster: null, Endpoint: 24, DeviceType: null },
+                              { Cluster: 25, Endpoint: null, DeviceType: null },
+                              { Cluster: 26, Endpoint: 27, DeviceType: null },
+                          ],
+                  },
               ]
 
     # note missing last entry
@@ -571,4 +619,4 @@ tests:
       attribute: "AccessControlEntriesPerFabric"
       response:
           constraints:
-              minValue: 3
+              minValue: 4
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -33,7 +33,7 @@ tests:
       attribute: "maxGroupsPerFabric"
       response:
           constraints:
-              minValue: 2
+              minValue: 4
 
     - label: "Read maxGroupKeysPerFabric"
       command: "readAttribute"
@@ -123,6 +123,8 @@ tests:
                   { FabricIndex: 1, GroupId: 0x0101, GroupKeySetID: 0x01a2 },
                   { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a1 },
                   { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
+                  { FabricIndex: 1, GroupId: 0x0103, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 1, GroupId: 0x0103, GroupKeySetID: 0x01a2 },
               ]
       response:
           error: FAILURE
@@ -134,8 +136,9 @@ tests:
           value:
               [
                   { FabricIndex: 1, GroupId: 0x0101, GroupKeySetID: 0x01a1 },
-                  { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a1 },
                   { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
+                  { FabricIndex: 1, GroupId: 0x0103, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 1, GroupId: 0x0104, GroupKeySetID: 0x01a2 },
               ]
 
     - label: "Read Group Keys"
@@ -145,8 +148,9 @@ tests:
           value:
               [
                   { FabricIndex: 1, GroupId: 0x0101, GroupKeySetID: 0x01a1 },
-                  { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a1 },
                   { FabricIndex: 1, GroupId: 0x0102, GroupKeySetID: 0x01a2 },
+                  { FabricIndex: 1, GroupId: 0x0103, GroupKeySetID: 0x01a1 },
+                  { FabricIndex: 1, GroupId: 0x0104, GroupKeySetID: 0x01a2 },
               ]
 
     - label: "Add Group 1"
@@ -183,6 +187,40 @@ tests:
               - name: "GroupID"
                 value: 0x0102
 
+    - label: "Add Group 3"
+      cluster: "Groups"
+      endpoint: 1
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: 0x0103
+              - name: "GroupName"
+                value: "Group #3"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: 0x0103
+
+    - label: "Add Group 4"
+      cluster: "Groups"
+      endpoint: 1
+      command: "AddGroup"
+      arguments:
+          values:
+              - name: "GroupID"
+                value: 0x0104
+              - name: "GroupName"
+                value: "Group #4"
+      response:
+          values:
+              - name: "Status"
+                value: 0
+              - name: "GroupID"
+                value: 0x0104
+
     - label: "Read GroupTable"
       command: "readAttribute"
       attribute: "GroupTable"
@@ -201,6 +239,18 @@ tests:
                       Endpoints: [1],
                       GroupName: "Group #2",
                   },
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0103,
+                      endpoints: [1],
+                      GroupName: "Group #3",
+                  },
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0104,
+                      endpoints: [1],
+                      GroupName: "Group #4",
+                  },
               ]
 
     - label: "KeySet Remove 1"
@@ -267,6 +317,18 @@ tests:
                       Endpoints: [1],
                       GroupName: "Group #2",
                   },
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0103,
+                      endpoints: [1],
+                      GroupName: "Group #3",
+                  },
+                  {
+                      FabricIndex: 1,
+                      GroupId: 0x0104,
+                      endpoints: [1],
+                      GroupName: "Group #4",
+                  },
               ]
 
     - label: "Remove All"

diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
@@ -983,6 +983,17 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #define CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES 4
 #endif
 
+/**
+ * @def CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC
+ *
+ * @brief Defines the number of "endpoint->controlling group" mappings per fabric.
+ *
+ * Binds to number of GroupMapping entries per fabric
+ */
+#ifndef CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC
+#define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 1
+#endif
+
 /**
  * @def CHIP_CONFIG_MAX_GROUPS_PER_FABRIC
  *
@@ -991,7 +1002,11 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  * Binds to number of GroupState entries to support per fabric
  */
 #ifndef CHIP_CONFIG_MAX_GROUPS_PER_FABRIC
-#define CHIP_CONFIG_MAX_GROUPS_PER_FABRIC 3
+#define CHIP_CONFIG_MAX_GROUPS_PER_FABRIC (4 * CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC)
+#endif
+
+#if CHIP_CONFIG_MAX_GROUPS_PER_FABRIC < (4 * CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC)
+#error "Please ensure CHIP_CONFIG_MAX_GROUPS_PER_FABRIC meets minimum requirements. See Group Limits in the specification."
 #endif
 
 /**
@@ -1009,17 +1024,6 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
 #error "Please ensure CHIP_CONFIG_MAX_GROUP_KEYS_PER_FABRIC > 0 to support at least the IPK."
 #endif
 
-/**
- * @def CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC
- *
- * @brief Defines the number of "endpoint->controlling group" mappings per fabric.
- *
- * Binds to number of GroupMapping entries per fabric
- */
-#ifndef CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC
-#define CHIP_CONFIG_MAX_GROUP_ENDPOINTS_PER_FABRIC 1
-#endif
-
 /**
  * @def CHIP_CONFIG_MAX_GROUP_CONCURRENT_ITERATORS
  *
@@ -1047,7 +1051,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  * example access control code.
  */
 #ifndef CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC
-#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 3
+#define CHIP_CONFIG_EXAMPLE_ACCESS_CONTROL_MAX_ENTRIES_PER_FABRIC 4
 #endif
 
 /**