Skip to content

Commit f9731a8

Browse files
bzbarsky-applebzbarsky-apple
authored
Align Access Control cluster XML with the spec. (#26773)
* Align Access Control cluster XML with the spec. Spec changes happened in CHIP-Specifications/connectedhomeip-spec#6276 Fixes #25340 * Regenerate generated code.
1 parent bf95967 commit f9731a8

File tree

79 files changed

+895
-821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+895
-821
lines changed

‎docs/guides/access-control-guide.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -552,13 +552,13 @@ await devCtrl.WriteAttribute(1, [ (0, Clusters.AccessControl.Attributes.Acl( [
552552
authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kGroup,
553553
subjects = [ 123, 456 ],
554554
targets = [
555-
Clusters.AccessControl.Structs.Target(
555+
Clusters.AccessControl.Structs.AccessControlTargetStruct(
556556
cluster = Clusters.OnOff.id,
557557
),
558-
Clusters.AccessControl.Structs.Target(
558+
Clusters.AccessControl.Structs.AccessControlTargetStruct(
559559
endpoint = 1,
560560
),
561-
Clusters.AccessControl.Structs.Target(
561+
Clusters.AccessControl.Structs.AccessControlTargetStruct(
562562
cluster = Clusters.LevelControl.id,
563563
endpoint = 2,
564564
),

‎docs/guides/repl/Matter_Access_Control.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
" fabricIndex = 1,\n",
734734
" privilege = Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kOperate,\n",
735735
" authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,\n",
736-
" targets = [ Clusters.AccessControl.Structs.Target(\n",
736+
" targets = [ Clusters.AccessControl.Structs.AccessControlTargetStruct(\n",
737737
" endpoint = 1,\n",
738738
" ) ] ) )\n",
739739
"acl"

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ server cluster AccessControl = 31 {
565565
kRemoved = 2;
566566
}
567567

568-
struct Target {
568+
struct AccessControlTargetStruct {
569569
nullable cluster_id cluster = 0;
570570
nullable endpoint_no endpoint = 1;
571571
nullable devtype_id deviceType = 2;
@@ -575,7 +575,7 @@ server cluster AccessControl = 31 {
575575
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
576576
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
577577
nullable fabric_sensitive int64u subjects[] = 3;
578-
nullable fabric_sensitive Target targets[] = 4;
578+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
579579
fabric_idx fabricIndex = 254;
580580
}
581581

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ server cluster AccessControl = 31 {
437437
kRemoved = 2;
438438
}
439439

440-
struct Target {
440+
struct AccessControlTargetStruct {
441441
nullable cluster_id cluster = 0;
442442
nullable endpoint_no endpoint = 1;
443443
nullable devtype_id deviceType = 2;
@@ -447,7 +447,7 @@ server cluster AccessControl = 31 {
447447
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
448448
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
449449
nullable fabric_sensitive int64u subjects[] = 3;
450-
nullable fabric_sensitive Target targets[] = 4;
450+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
451451
fabric_idx fabricIndex = 254;
452452
}
453453

‎examples/bridge-app/bridge-common/bridge-app.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ client cluster AccessControl = 31 {
272272
kRemoved = 2;
273273
}
274274

275-
struct Target {
275+
struct AccessControlTargetStruct {
276276
nullable cluster_id cluster = 0;
277277
nullable endpoint_no endpoint = 1;
278278
nullable devtype_id deviceType = 2;
@@ -282,7 +282,7 @@ client cluster AccessControl = 31 {
282282
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
283283
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
284284
nullable fabric_sensitive int64u subjects[] = 3;
285-
nullable fabric_sensitive Target targets[] = 4;
285+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
286286
fabric_idx fabricIndex = 254;
287287
}
288288

@@ -345,7 +345,7 @@ server cluster AccessControl = 31 {
345345
kRemoved = 2;
346346
}
347347

348-
struct Target {
348+
struct AccessControlTargetStruct {
349349
nullable cluster_id cluster = 0;
350350
nullable endpoint_no endpoint = 1;
351351
nullable devtype_id deviceType = 2;
@@ -355,7 +355,7 @@ server cluster AccessControl = 31 {
355355
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
356356
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
357357
nullable fabric_sensitive int64u subjects[] = 3;
358-
nullable fabric_sensitive Target targets[] = 4;
358+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
359359
fabric_idx fabricIndex = 254;
360360
}
361361

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
328328
kRemoved = 2;
329329
}
330330

331-
struct Target {
331+
struct AccessControlTargetStruct {
332332
nullable cluster_id cluster = 0;
333333
nullable endpoint_no endpoint = 1;
334334
nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
338338
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
339339
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
340340
nullable fabric_sensitive int64u subjects[] = 3;
341-
nullable fabric_sensitive Target targets[] = 4;
341+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
342342
fabric_idx fabricIndex = 254;
343343
}
344344

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ server cluster AccessControl = 31 {
327327
kRemoved = 2;
328328
}
329329

330-
struct Target {
330+
struct AccessControlTargetStruct {
331331
nullable cluster_id cluster = 0;
332332
nullable endpoint_no endpoint = 1;
333333
nullable devtype_id deviceType = 2;
@@ -337,7 +337,7 @@ server cluster AccessControl = 31 {
337337
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
338338
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
339339
nullable fabric_sensitive int64u subjects[] = 3;
340-
nullable fabric_sensitive Target targets[] = 4;
340+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
341341
fabric_idx fabricIndex = 254;
342342
}
343343

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
179179
kRemoved = 2;
180180
}
181181

182-
struct Target {
182+
struct AccessControlTargetStruct {
183183
nullable cluster_id cluster = 0;
184184
nullable endpoint_no endpoint = 1;
185185
nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
189189
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
190190
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
191191
nullable fabric_sensitive int64u subjects[] = 3;
192-
nullable fabric_sensitive Target targets[] = 4;
192+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
193193
fabric_idx fabricIndex = 254;
194194
}
195195

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
328328
kRemoved = 2;
329329
}
330330

331-
struct Target {
331+
struct AccessControlTargetStruct {
332332
nullable cluster_id cluster = 0;
333333
nullable endpoint_no endpoint = 1;
334334
nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
338338
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
339339
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
340340
nullable fabric_sensitive int64u subjects[] = 3;
341-
nullable fabric_sensitive Target targets[] = 4;
341+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
342342
fabric_idx fabricIndex = 254;
343343
}
344344

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
179179
kRemoved = 2;
180180
}
181181

182-
struct Target {
182+
struct AccessControlTargetStruct {
183183
nullable cluster_id cluster = 0;
184184
nullable endpoint_no endpoint = 1;
185185
nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
189189
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
190190
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
191191
nullable fabric_sensitive int64u subjects[] = 3;
192-
nullable fabric_sensitive Target targets[] = 4;
192+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
193193
fabric_idx fabricIndex = 254;
194194
}
195195

‎examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
328328
kRemoved = 2;
329329
}
330330

331-
struct Target {
331+
struct AccessControlTargetStruct {
332332
nullable cluster_id cluster = 0;
333333
nullable endpoint_no endpoint = 1;
334334
nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
338338
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
339339
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
340340
nullable fabric_sensitive int64u subjects[] = 3;
341-
nullable fabric_sensitive Target targets[] = 4;
341+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
342342
fabric_idx fabricIndex = 254;
343343
}
344344

‎examples/chef/devices/rootnode_fan_7N2TobIlOX.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ server cluster AccessControl = 31 {
166166
kRemoved = 2;
167167
}
168168

169-
struct Target {
169+
struct AccessControlTargetStruct {
170170
nullable cluster_id cluster = 0;
171171
nullable endpoint_no endpoint = 1;
172172
nullable devtype_id deviceType = 2;
@@ -176,7 +176,7 @@ server cluster AccessControl = 31 {
176176
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
177177
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
178178
nullable fabric_sensitive int64u subjects[] = 3;
179-
nullable fabric_sensitive Target targets[] = 4;
179+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
180180
fabric_idx fabricIndex = 254;
181181
}
182182

‎examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
250250
kRemoved = 2;
251251
}
252252

253-
struct Target {
253+
struct AccessControlTargetStruct {
254254
nullable cluster_id cluster = 0;
255255
nullable endpoint_no endpoint = 1;
256256
nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
260260
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
261261
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
262262
nullable fabric_sensitive int64u subjects[] = 3;
263-
nullable fabric_sensitive Target targets[] = 4;
263+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
264264
fabric_idx fabricIndex = 254;
265265
}
266266

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ server cluster AccessControl = 31 {
322322
kRemoved = 2;
323323
}
324324

325-
struct Target {
325+
struct AccessControlTargetStruct {
326326
nullable cluster_id cluster = 0;
327327
nullable endpoint_no endpoint = 1;
328328
nullable devtype_id deviceType = 2;
@@ -332,7 +332,7 @@ server cluster AccessControl = 31 {
332332
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
333333
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
334334
nullable fabric_sensitive int64u subjects[] = 3;
335-
nullable fabric_sensitive Target targets[] = 4;
335+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
336336
fabric_idx fabricIndex = 254;
337337
}
338338

‎examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
250250
kRemoved = 2;
251251
}
252252

253-
struct Target {
253+
struct AccessControlTargetStruct {
254254
nullable cluster_id cluster = 0;
255255
nullable endpoint_no endpoint = 1;
256256
nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
260260
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
261261
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
262262
nullable fabric_sensitive int64u subjects[] = 3;
263-
nullable fabric_sensitive Target targets[] = 4;
263+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
264264
fabric_idx fabricIndex = 254;
265265
}
266266

‎examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
250250
kRemoved = 2;
251251
}
252252

253-
struct Target {
253+
struct AccessControlTargetStruct {
254254
nullable cluster_id cluster = 0;
255255
nullable endpoint_no endpoint = 1;
256256
nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
260260
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
261261
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
262262
nullable fabric_sensitive int64u subjects[] = 3;
263-
nullable fabric_sensitive Target targets[] = 4;
263+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
264264
fabric_idx fabricIndex = 254;
265265
}
266266

‎examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
250250
kRemoved = 2;
251251
}
252252

253-
struct Target {
253+
struct AccessControlTargetStruct {
254254
nullable cluster_id cluster = 0;
255255
nullable endpoint_no endpoint = 1;
256256
nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
260260
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
261261
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
262262
nullable fabric_sensitive int64u subjects[] = 3;
263-
nullable fabric_sensitive Target targets[] = 4;
263+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
264264
fabric_idx fabricIndex = 254;
265265
}
266266

‎examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
328328
kRemoved = 2;
329329
}
330330

331-
struct Target {
331+
struct AccessControlTargetStruct {
332332
nullable cluster_id cluster = 0;
333333
nullable endpoint_no endpoint = 1;
334334
nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
338338
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
339339
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
340340
nullable fabric_sensitive int64u subjects[] = 3;
341-
nullable fabric_sensitive Target targets[] = 4;
341+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
342342
fabric_idx fabricIndex = 254;
343343
}
344344

‎examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ server cluster AccessControl = 31 {
291291
kRemoved = 2;
292292
}
293293

294-
struct Target {
294+
struct AccessControlTargetStruct {
295295
nullable cluster_id cluster = 0;
296296
nullable endpoint_no endpoint = 1;
297297
nullable devtype_id deviceType = 2;
@@ -301,7 +301,7 @@ server cluster AccessControl = 31 {
301301
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
302302
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
303303
nullable fabric_sensitive int64u subjects[] = 3;
304-
nullable fabric_sensitive Target targets[] = 4;
304+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
305305
fabric_idx fabricIndex = 254;
306306
}
307307

‎examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ server cluster AccessControl = 31 {
227227
kRemoved = 2;
228228
}
229229

230-
struct Target {
230+
struct AccessControlTargetStruct {
231231
nullable cluster_id cluster = 0;
232232
nullable endpoint_no endpoint = 1;
233233
nullable devtype_id deviceType = 2;
@@ -237,7 +237,7 @@ server cluster AccessControl = 31 {
237237
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
238238
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
239239
nullable fabric_sensitive int64u subjects[] = 3;
240-
nullable fabric_sensitive Target targets[] = 4;
240+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
241241
fabric_idx fabricIndex = 254;
242242
}
243243

‎examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
250250
kRemoved = 2;
251251
}
252252

253-
struct Target {
253+
struct AccessControlTargetStruct {
254254
nullable cluster_id cluster = 0;
255255
nullable endpoint_no endpoint = 1;
256256
nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
260260
fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
261261
fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
262262
nullable fabric_sensitive int64u subjects[] = 3;
263-
nullable fabric_sensitive Target targets[] = 4;
263+
nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
264264
fabric_idx fabricIndex = 254;
265265
}
266266

0 commit comments

Comments
 (0)