Align Access Control cluster XML with the spec.

Spec changes happened in CHIP-Specifications/connectedhomeip-spec#6276 Fixes #25340
project-chip · May 23, 2023 · c176be5 · c176be5
1 parent c24294a
commit c176be5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/app/server/AclStorage.cpp b/src/app/server/AclStorage.cpp
@@ -27,7 +27,7 @@ using Entry            = AccessControl::Entry;
 using EntryListener    = AccessControl::EntryListener;
 using StagingAuthMode  = Clusters::AccessControl::AccessControlEntryAuthModeEnum;
 using StagingPrivilege = Clusters::AccessControl::AccessControlEntryPrivilegeEnum;
-using StagingTarget    = Clusters::AccessControl::Structs::Target::Type;
+using StagingTarget    = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 using Target           = AccessControl::Entry::Target;
 
 namespace {

diff --git a/src/app/server/AclStorage.h b/src/app/server/AclStorage.h
@@ -94,7 +94,7 @@ class AclStorage
     {
         using Entry         = Access::AccessControl::Entry;
         using StagingEntry  = Clusters::AccessControl::Structs::AccessControlEntryStruct::Type;
-        using StagingTarget = Clusters::AccessControl::Structs::Target::Type;
+        using StagingTarget = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 
     public:
         EncodableEntry(const Entry & entry) : mEntry(entry) {}

diff --git a/src/app/server/DefaultAclStorage.cpp b/src/app/server/DefaultAclStorage.cpp
@@ -28,7 +28,7 @@ using Entry            = AccessControl::Entry;
 using EntryListener    = AccessControl::EntryListener;
 using StagingAuthMode  = Clusters::AccessControl::AccessControlEntryAuthModeEnum;
 using StagingPrivilege = Clusters::AccessControl::AccessControlEntryPrivilegeEnum;
-using StagingTarget    = Clusters::AccessControl::Structs::Target::Type;
+using StagingTarget    = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 using Target           = AccessControl::Entry::Target;
 
 namespace {

diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
@@ -40,7 +40,7 @@ limitations under the License.
     <item name="Removed" value="0x02"/>
   </enum>
 
-  <struct name="Target">
+  <struct name="AccessControlTargetStruct">
     <cluster code="0x001F"/>
     <item fieldId="0" name="Cluster" type="cluster_id" isNullable="true"/>
     <item fieldId="1" name="Endpoint" type="endpoint_no" isNullable="true"/>
@@ -52,7 +52,7 @@ limitations under the License.
     <item fieldId="1" name="Privilege" type="AccessControlEntryPrivilegeEnum" isFabricSensitive="true"/>
     <item fieldId="2" name="AuthMode" type="AccessControlEntryAuthModeEnum" isFabricSensitive="true"/>
     <item fieldId="3" name="Subjects" type="INT64U" isNullable="true" array="true" isFabricSensitive="true"/>
-    <item fieldId="4" name="Targets" type="Target" isNullable="true" array="true" isFabricSensitive="true"/>
+    <item fieldId="4" name="Targets" type="AccessControlTargetStruct" isNullable="true" array="true" isFabricSensitive="true"/>
   </struct>
 
   <struct name="AccessControlExtensionStruct" isFabricScoped="true">

diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7410,13 +7410,20 @@
                   - targetTemperature
                   - targetTemperatureLevel
       structs:
+          AccessControl:
+              - AccessControlTargetStruct
           BasicInformation:
               - ProductAppearanceStruct
           BridgedDeviceBasicInformation:
               - ProductAppearanceStruct
           TemperatureControl:
               - TemperatureLevelStruct
       struct fields:
+          AccessControl:
+              AccessControlTargetStruct:
+                  - cluster
+                  - endpoint
+                  - deviceType
           BasicInformation:
               ProductAppearanceStruct:
                   - finish
@@ -7854,6 +7861,9 @@
           # We apparently forgot to deprecate BridgedDeviceBasic when we
           # introduced BridgedDeviceBasicInformation.
           - BridgedDeviceBasic
+      structs:
+          AccessControl:
+              - Target
       bitmaps:
           Groups:
               - GroupClusterFeature
@@ -7870,6 +7880,9 @@
       commands:
           TimeSynchronization:
               SetUTCTime: SetUtcTime
+      structs:
+          AccessControl:
+              AccessControlTargetStruct: Target
       enum values:
           TimeSynchronization:
               TimeSourceEnum: