Skip to content

Commit

Permalink
Update ZAP to tip. (#21210) (#21244)
Browse files Browse the repository at this point in the history 
This update stops guessing at fabric-scoping based on the types of struct/event
fields and instead explicitly says which structs are fabric-scoped and which
events are fabric-sensitive in the XML.

The required FabricIndex field is then synthesized by ZAP, so we don't want it
in the XML anymore.

This fixes the naming of the FabricIndex field for some of the structs involved
and lays the groundwork for a per-spec implementation of LeaveEvent (which is
not fabric-sensitive but has a fabric-idx-typed field).

Co-authored-by: Boris Zbarsky <[email protected]>
  • Loading branch information
@woody-apple @bzbarsky-apple
woody-apple and bzbarsky-apple authored Jul 27, 2022
1 parent bc36684 commit 43db8fa
Show file tree
Hide file tree
Showing 56 changed files with 207 additions and 223 deletions.
6 changes: 3 additions & 3 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -3606,7 +3606,7 @@ server cluster TestCluster = 4294048773 {
}

info event TestFabricScopedEvent = 2 {
fabric_idx arg1 = 254;
fabric_idx fabricIndex = 254;
}

attribute boolean boolean = 0;
Expand Down
6 changes: 3 additions & 3 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,15 +396,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -3032,7 +3032,7 @@ server cluster TestCluster = 4294048773 {
}

info event TestFabricScopedEvent = 2 {
fabric_idx arg1 = 254;
fabric_idx fabricIndex = 254;
}

attribute boolean boolean = 0;
Expand Down
8 changes: 4 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,15 @@ client cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down Expand Up @@ -322,15 +322,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,15 +296,15 @@ server cluster AccessControl = 31 {
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable AccessControlEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

info event access(read: administer) AccessControlExtensionChanged = 1 {
nullable node_id adminNodeID = 1;
nullable INT16U adminPasscodeID = 2;
ChangeTypeEnum changeType = 3;
nullable ExtensionEntry latestValue = 4;
fabric_idx adminFabricIndex = 254;
fabric_idx fabricIndex = 254;
}

attribute access(read: administer, write: administer) AccessControlEntry acl[] = 0;
Expand Down
Loading

0 comments on commit 43db8fa

Please sign in to comment.