Update the ACL event fields to align with the spec (#13738)

project-chip · Jan 11, 2024 · 3320121 · 3320121
1 parent 012ee55
commit 3320121
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 46 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -48,18 +48,18 @@ server cluster AccessControl = 31 {
 
   info event AccessControlEntryChanged = 0 {
     fabric_idx adminFabricIndex = 0;
-    node_id adminNodeID = 1;
-    INT16U adminPasscodeID = 2;
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
-    AccessControlEntry latestValue = 4;
+    nullable AccessControlEntry latestValue = 4;
   }
 
   info event AccessControlExtensionChanged = 1 {
     fabric_idx adminFabricIndex = 0;
-    node_id adminNodeID = 1;
-    INT16U adminPasscodeID = 2;
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
-    ExtensionEntry latestValue = 4;
+    nullable ExtensionEntry latestValue = 4;
   }
 
   attribute AccessControlEntry acl[] = 0;

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
@@ -89,18 +89,18 @@ limitations under the License.
     <event side="server" code="0x0000" name="AccessControlEntryChanged" priority="info" optional="false">
       <description>The cluster SHALL send AccessControlEntryChanged events whenever its ACL attribute data is changed by an Administrator.</description>
       <field id="0" name="AdminFabricIndex" type="fabric_idx"/>
-      <field id="1" name="AdminNodeID" type="node_id"/>
-      <field id="2" name="AdminPasscodeID" type="INT16U"/>
+      <field id="1" name="AdminNodeID" type="node_id" isNullable="true"/>
+      <field id="2" name="AdminPasscodeID" type="INT16U" isNullable="true"/>
       <field id="3" name="ChangeType" type="ChangeTypeEnum"/>
-      <field id="4" name="LatestValue" type="AccessControlEntry"/>
+      <field id="4" name="LatestValue" type="AccessControlEntry" isNullable="true"/>
     </event>
     <event side="server" code="0x0001" name="AccessControlExtensionChanged" priority="info" optional="false">
       <description>The cluster SHALL send AccessControlExtensionChanged events whenever its extension attribute data is changed by an Administrator.</description>
       <field id="0" name="AdminFabricIndex" type="fabric_idx"/>
-      <field id="1" name="AdminNodeID" type="node_id"/>
-      <field id="2" name="AdminPasscodeID" type="INT16U"/>
+      <field id="1" name="AdminNodeID" type="node_id" isNullable="true"/>
+      <field id="2" name="AdminPasscodeID" type="INT16U" isNullable="true"/>
       <field id="3" name="ChangeType" type="ChangeTypeEnum"/>
-      <field id="4" name="LatestValue" type="ExtensionEntry"/>
+      <field id="4" name="LatestValue" type="ExtensionEntry" isNullable="true"/>
     </event>    
   </cluster>
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -48,18 +48,18 @@ client cluster AccessControl = 31 {
 
   info event AccessControlEntryChanged = 0 {
     fabric_idx adminFabricIndex = 0;
-    node_id adminNodeID = 1;
-    INT16U adminPasscodeID = 2;
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
-    AccessControlEntry latestValue = 4;
+    nullable AccessControlEntry latestValue = 4;
   }
 
   info event AccessControlExtensionChanged = 1 {
     fabric_idx adminFabricIndex = 0;
-    node_id adminNodeID = 1;
-    INT16U adminPasscodeID = 2;
+    nullable node_id adminNodeID = 1;
+    nullable INT16U adminPasscodeID = 2;
     ChangeTypeEnum changeType = 3;
-    ExtensionEntry latestValue = 4;
+    nullable ExtensionEntry latestValue = 4;
   }
 
   attribute AccessControlEntry acl[] = 0;

diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h