Skip to content

Commit

Permalink
Fix ACL cluster ZAP XML and regen ZAP
Browse files Browse the repository at this point in the history
- Remove dead event AccessRestrictionEntryChanged
- Set response command for ReviewFabricRestrictions
- Set correct optionality for FabricRestrictionReviewUpdate
  • Loading branch information
tcarmelveilleux committed Sep 4, 2024
1 parent 6144736 commit 4e29639
Show file tree
Hide file tree
Showing 121 changed files with 545 additions and 1,128 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -443,7 +439,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -443,7 +439,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -811,14 +811,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -845,7 +841,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,14 +704,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -738,7 +734,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
Expand Down
24 changes: 8 additions & 16 deletions examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -627,14 +627,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -661,7 +657,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** The Access Control Cluster exposes a data model view of a
Expand Down Expand Up @@ -756,14 +752,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -790,7 +782,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides a standardized way for a Node (typically a Bridge, but could be any Node) to expose action information. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,14 +704,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -738,7 +734,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
12 changes: 4 additions & 8 deletions examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
Original file line number Diff line number Diff line change
Expand Up @@ -481,14 +481,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -515,7 +511,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,14 +486,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -520,7 +516,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -443,7 +439,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,14 +606,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -640,7 +636,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -683,14 +683,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -717,7 +713,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
12 changes: 4 additions & 8 deletions examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -443,7 +439,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
12 changes: 4 additions & 8 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
Original file line number Diff line number Diff line change
Expand Up @@ -507,14 +507,10 @@ cluster AccessControl = 31 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) AccessRestrictionEntryChanged = 2 {
fabric_idx fabricIndex = 254;
}

fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 3 {
fabric_sensitive info event access(read: administer) FabricRestrictionReviewUpdate = 2 {
int64u token = 0;
nullable long_char_string instruction = 1;
nullable long_char_string redirectURL = 2;
optional long_char_string instruction = 1;
optional long_char_string redirectURL = 2;
fabric_idx fabricIndex = 254;
}

Expand All @@ -541,7 +537,7 @@ cluster AccessControl = 31 {
}

/** This command signals to the service associated with the device vendor that the fabric administrator would like a review of the current restrictions on the accessing fabric. */
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) ReviewFabricRestrictions(ReviewFabricRestrictionsRequest): ReviewFabricRestrictionsResponse = 0;
}

/** This cluster provides attributes and events for determining basic information about Nodes, which supports both
Expand Down
Loading

0 comments on commit 4e29639

Please sign in to comment.