Fix ACL XML for MACL and sample conformance (#35411)
* Fix ACL cluster ZAP XML and regen ZAP
- Remove dead event AccessRestrictionEntryChanged
- Set response command for ReviewFabricRestrictions
- Set correct optionality for FabricRestrictionReviewUpdate
* Fix access control server after XML change
* Remove unsupportable commnad
* Rename RedirectURL field to ARLRequestFlowUrl
* Kick CI
* Kick CI
* Remove non-longer-applicable files
* Increase size of event buffer pool in NIM sample
* Restyled by clang-format
* Fix format
* Remove subscription for event that no longer exists
---------
Co-authored-by: Restyled.io <commits@restyled.io>
diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
index c35b8b6..ef3be8e 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
index 0566f91..4087549 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
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
index 9769afd..8debb1a 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -811,14 +811,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -845,7 +841,7 @@
}
/** 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. */
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 9424fab..7c209b8 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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. */
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 1cc3729..f1cdf94 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -627,14 +627,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -661,7 +657,7 @@
}
/** 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
@@ -756,14 +752,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -790,7 +782,7 @@
}
/** 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. */
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 79dfef5..b837d4b 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
index e4584f1..a9706c7 100644
--- a/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
+++ b/examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter
@@ -481,14 +481,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -515,7 +511,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
index d47b3a9..2af9aa1 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
index e155c0b..ef127a4 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
index f76efbe..60e29ae 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -606,14 +606,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -640,7 +636,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 0a59101..b09fc6f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
index 830abb4..8b30190 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index eff62c6..3e3a4ea 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 767012e..4c659dc 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
index b73b986..92b0237 100644
--- a/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
+++ b/examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index c8e4199..07232aa 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 71f96db..2b27a22 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 53984bb..265dc26 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 05a176e..19e0d8a 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 93eac70..eb578e7 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
index 8748b8c..9c8d947 100644
--- a/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
+++ b/examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
index 4c8e67c..a083afc 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 84b5d94..84675ef 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index adc500a..00f7af0 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
index 06e8ba8..42e7362 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index be3a039..902658e 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 9d7e22c..65a0c9c 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 9d4aa0c..6cbdac2 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter
index 9013135..35addbe 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -704,14 +704,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -738,7 +734,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index cffe70d..7c82c5b 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -651,14 +651,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -685,7 +681,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index a5e0f55..5fe0482 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -579,14 +579,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -613,7 +609,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 2b9b403..44ad0bf 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
index cf42fed..e8141a4 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -481,14 +481,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -515,7 +511,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 78ae33b..bb889d6 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -481,14 +481,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -515,7 +511,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
index 7d8c54a..13d8b98 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index ae1989b..2922ddc 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index 20b7d6b..654c955 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -558,14 +558,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -592,7 +588,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
index 3408fc6..1057b85 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index bf55ae4..a4fe9d8 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -627,14 +627,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -661,7 +657,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index b317823..60aacfe 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 77e8854..c38c38b 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
index e41e0b8..dec13bd 100644
--- a/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
+++ b/examples/chef/devices/rootnode_waterleakdetector_0b067acfa3.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index f49ed58..a57c946 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index eb551dd..60e67e4 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
index 4a3e015..5e877d1 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
index d8d2734..e60ea68 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
index 661a2e7..0df498e 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -507,14 +507,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -541,7 +537,7 @@
}
/** 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
diff --git a/examples/energy-management-app/energy-management-common/energy-management-app.matter b/examples/energy-management-app/energy-management-common/energy-management-app.matter
index c340138..9b9bf14 100644
--- a/examples/energy-management-app/energy-management-common/energy-management-app.matter
+++ b/examples/energy-management-app/energy-management-common/energy-management-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
index 22f5ae6..7df3c29 100644
--- a/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
+++ b/examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
@@ -538,14 +534,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -572,7 +564,7 @@
}
/** 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
diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
index 7ecbd20..adc4fe3 100644
--- a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
+++ b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
@@ -579,14 +579,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -613,7 +609,7 @@
}
/** 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
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index 3909b60..a18f0c9 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -629,14 +629,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -663,7 +659,7 @@
}
/** 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
diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
index c93a50b..23033c7 100644
--- a/examples/light-switch-app/qpg/zap/switch.matter
+++ b/examples/light-switch-app/qpg/zap/switch.matter
@@ -754,14 +754,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -788,7 +784,7 @@
}
/** 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
diff --git a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
index 066d3d4..c19c7d7 100644
--- a/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
+++ b/examples/lighting-app-data-mode-no-unique-id/lighting-common/lighting-app.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
index 9536120..c51e6ee 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index 5a26a33..33d68c7 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index 08172f4..78eed27 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 578fa85..16e722d 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 1f88cfb..0bca04d 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index 8ce7501..6509c92 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
index d77bd64..03373bf 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
index 978f277..ae68bac 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -683,14 +683,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -717,7 +713,7 @@
}
/** 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
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index e76ccb9..6c5e4af 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index a925bf7..2f2b9dd 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index cb2cbcc..347ad97 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index ee7a955..303b079 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index e9baa77..18f096a 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -326,14 +326,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -360,7 +356,7 @@
}
/** 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 is used to manage global aspects of the Commissioning flow. */
diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
index cea8d41..0ac59af 100644
--- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
+++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/network-manager-app/linux/include/CHIPProjectAppConfig.h b/examples/network-manager-app/linux/include/CHIPProjectAppConfig.h
index 1ef9862..c5c31c3 100644
--- a/examples/network-manager-app/linux/include/CHIPProjectAppConfig.h
+++ b/examples/network-manager-app/linux/include/CHIPProjectAppConfig.h
@@ -21,5 +21,8 @@
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 144 // 0x0090 Network Infrastructure Manager
#define CHIP_DEVICE_CONFIG_DEVICE_NAME "Network Infrastructure Manager"
+// Sufficient space for ArlReviewEvent of several fabrics.
+#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE (32 * 1024)
+
// Inherit defaults from config/standalone/CHIPProjectConfig.h
#include <CHIPProjectConfig.h>
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter
index 57118d3..273b523 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.matter
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
@@ -1623,7 +1619,6 @@
server cluster AccessControl {
emits event AccessControlEntryChanged;
emits event AccessControlExtensionChanged;
- emits event AccessRestrictionEntryChanged;
emits event FabricRestrictionReviewUpdate;
callback attribute acl;
callback attribute extension;
@@ -1635,7 +1630,7 @@
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
- ram attribute featureMap default = 1;
+ ram attribute featureMap default = 3;
callback attribute clusterRevision;
handle command ReviewFabricRestrictions;
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.zap b/examples/network-manager-app/network-manager-common/network-manager-app.zap
index 240cd49..f471bb2 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.zap
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.zap
@@ -503,7 +503,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "3",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2393,7 +2393,7 @@
"mfgCode": null,
"source": "client",
"isIncoming": 1,
- "isEnabled": 1
+ "isEnabled": 0
}
],
"attributes": [
@@ -3886,4 +3886,4 @@
"parentEndpointIdentifier": null
}
]
-}
\ No newline at end of file
+}
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index a066629..5958192 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -359,14 +359,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -393,7 +389,7 @@
}
/** 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
@@ -488,14 +484,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -522,7 +514,7 @@
}
/** 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
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 3412f30..c61a490 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -558,14 +558,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -592,7 +588,7 @@
}
/** 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
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 96c3b72..bf5e6d6 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -930,14 +930,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -964,7 +960,7 @@
}
/** 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. */
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index facd9c9..2665168 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -930,14 +930,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -964,7 +960,7 @@
}
/** 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. */
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index a356b78..7031fc2 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -627,14 +627,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -661,7 +657,7 @@
}
/** 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
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index f88f268..7dca9cc 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -627,14 +627,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -661,7 +657,7 @@
}
/** 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
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index f88f268..7dca9cc 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -627,14 +627,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -661,7 +657,7 @@
}
/** 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
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index 7365654..0207abc 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -502,14 +502,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -536,7 +532,7 @@
}
/** 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
diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
index f028a3b..8920120 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -359,14 +359,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -393,7 +389,7 @@
}
/** 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
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 4c0ebdf..974c0dc 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -409,14 +409,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -443,7 +439,7 @@
}
/** 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
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 21d1ceb..1af9ccc 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index 4ebc3dc..cf4d715 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -359,14 +359,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -393,7 +389,7 @@
}
/** 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
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index cbe6a62..179a2c5 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -557,14 +557,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -591,7 +587,7 @@
}
/** 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
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index cd9ddc3..820bd33 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -557,14 +557,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -591,7 +587,7 @@
}
/** 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
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
index 548db02..d88d6ec 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
@@ -557,14 +557,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -591,7 +587,7 @@
}
/** 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
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index a66c2df..6feefe3 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -557,14 +557,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -591,7 +587,7 @@
}
/** 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
diff --git a/examples/thread-br-app/thread-br-common/thread-br-app.matter b/examples/thread-br-app/thread-br-common/thread-br-app.matter
index 1b043a7..9498dee 100644
--- a/examples/thread-br-app/thread-br-common/thread-br-app.matter
+++ b/examples/thread-br-app/thread-br-common/thread-br-app.matter
@@ -359,14 +359,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -393,7 +389,7 @@
}
/** 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
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index f2a2a6f..bd2f29d 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -598,14 +598,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -632,7 +628,7 @@
}
/** 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
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 196e59a..3e4fe7f 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -758,14 +758,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -792,7 +788,7 @@
}
/** 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
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
index 3c20256..07baa25 100644
--- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
+++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter
@@ -579,14 +579,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -613,7 +609,7 @@
}
/** 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
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index f31a191..61a8208 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -486,14 +486,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -520,7 +516,7 @@
}
/** 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
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
index 8f0c8ef..9b35ecb 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -511,7 +511,6 @@
#define GENERATED_ACCESS_READ_EVENT__CLUSTER { \
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- 0x0000001F, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
@@ -519,15 +518,13 @@
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- 0x00000002, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
- 0x00000003, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
+ 0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
index 45b93e9..acef167 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
@@ -292,7 +292,6 @@
#define GENERATED_ACCESS_READ_EVENT__CLUSTER { \
0x0000001F, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- 0x0000001F, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
0x0000001F, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
@@ -300,15 +299,13 @@
#define GENERATED_ACCESS_READ_EVENT__EVENT { \
0x00000000, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
0x00000001, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- 0x00000002, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
- 0x00000003, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
+ 0x00000002, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
// Parallel array data (cluster, event, *privilege*) for read event
#define GENERATED_ACCESS_READ_EVENT__PRIVILEGE { \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessControlExtensionChanged, Privilege: administer */ \
- chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: AccessRestrictionEntryChanged, Privilege: administer */ \
chip::Access::Privilege::kAdminister, /* Cluster: Access Control, Event: FabricRestrictionReviewUpdate, Privilege: administer */ \
}
diff --git a/src/app/clusters/access-control-server/access-control-server.cpp b/src/app/clusters/access-control-server/access-control-server.cpp
index 295b553..d525e55 100644
--- a/src/app/clusters/access-control-server/access-control-server.cpp
+++ b/src/app/clusters/access-control-server/access-control-server.cpp
@@ -88,7 +88,7 @@
void MarkRestrictionListChanged(FabricIndex fabricIndex) override;
void OnFabricRestrictionReviewUpdate(FabricIndex fabricIndex, uint64_t token, Optional<CharSpan> instruction,
- Optional<CharSpan> redirectUrl) override;
+ Optional<CharSpan> arlRequestFlowUrl) override;
#endif
private:
@@ -517,20 +517,13 @@
}
void AccessControlAttribute::OnFabricRestrictionReviewUpdate(FabricIndex fabricIndex, uint64_t token,
- Optional<CharSpan> instruction, Optional<CharSpan> redirectUrl)
+ Optional<CharSpan> instruction, Optional<CharSpan> arlRequestFlowUrl)
{
CHIP_ERROR err;
ArlReviewEvent event{ .token = token, .fabricIndex = fabricIndex };
- if (instruction.HasValue())
- {
- event.instruction.SetNonNull(instruction.Value());
- }
-
- if (redirectUrl.HasValue())
- {
- event.redirectURL.SetNonNull(redirectUrl.Value());
- }
+ event.instruction = instruction;
+ event.ARLRequestFlowUrl = arlRequestFlowUrl;
EventNumber eventNumber;
SuccessOrExit(err = LogEvent(event, kRootEndpointId, eventNumber));
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
index a159580..edf1b65 100644
--- 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
@@ -127,7 +127,7 @@
<attribute code="0x0005" side="server" define="COMMISSIONING_ARL" type="array" entryType="CommissioningAccessRestrictionEntryStruct" optional="true">CommissioningARL</attribute>
<attribute code="0x0006" side="server" define="ARL" type="array" entryType="AccessRestrictionEntryStruct" optional="true">ARL</attribute>
- <command code="0x00" source="client" name="ReviewFabricRestrictions" isFabricScoped="true" optional="true">
+ <command code="0x00" source="client" name="ReviewFabricRestrictions" isFabricScoped="true" optional="true" response="ReviewFabricRestrictionsResponse">
<description>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.</description>
<access op="invoke" privilege="administer"/>
<arg id="0" name="ARL" array="true" type="CommissioningAccessRestrictionEntryStruct"/>
@@ -156,16 +156,11 @@
<access op="read" privilege="administer"/>
</event>
- <event code="0x0002" name="AccessRestrictionEntryChanged" priority="info" side="server" isFabricSensitive="true" optional="true">
- <description>The cluster SHALL send AccessRestrictionEntryChanged events whenever its ARL attribute data is changed by the device maker.</description>
- <access op="read" privilege="administer"/>
- </event>
-
- <event code="0x0003" name="FabricRestrictionReviewUpdate" priority="info" side="server" isFabricSensitive="true" optional="true">
+ <event side="server" code="0x0002" name="FabricRestrictionReviewUpdate" priority="info" isFabricSensitive="true" optional="true">
<description>The cluster SHALL send FabricRestrictionReviewUpdate events to indicate completion of a fabric restriction review.</description>
<field id="0" name="Token" type="int64u"/>
- <field id="1" name="Instruction" type="long_char_string" isNullable="true" length="512"/>
- <field id="2" name="RedirectURL" type="long_char_string" isNullable="true" length="256"/>
+ <field id="1" name="Instruction" type="long_char_string" optional="true" length="512"/>
+ <field id="2" name="ARLRequestFlowUrl" type="long_char_string" optional="true" length="256"/>
<access op="read" privilege="administer"/>
</event>
</cluster>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index cbe81c4..eac83d8 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -751,14 +751,10 @@
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 ARLRequestFlowUrl = 2;
fabric_idx fabricIndex = 254;
}
@@ -785,7 +781,7 @@
}
/** 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. */
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index 9001413..ae90022 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -3982,11 +3982,11 @@
return 0L;
}
- public void reviewFabricRestrictions(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct> arl) {
+ public void reviewFabricRestrictions(ReviewFabricRestrictionsResponseCallback callback, ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct> arl) {
reviewFabricRestrictions(callback, arl, 0);
}
- public void reviewFabricRestrictions(DefaultClusterCallback callback, ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct> arl, int timedInvokeTimeoutMs) {
+ public void reviewFabricRestrictions(ReviewFabricRestrictionsResponseCallback callback, ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct> arl, int timedInvokeTimeoutMs) {
final long commandId = 0L;
ArrayList<StructElement> elements = new ArrayList<>();
@@ -3998,10 +3998,24 @@
invoke(new InvokeCallbackImpl(callback) {
@Override
public void onResponse(StructType invokeStructValue) {
- callback.onSuccess();
+ final long tokenFieldID = 0L;
+ Long token = null;
+ for (StructElement element: invokeStructValue.value()) {
+ if (element.contextTagNum() == tokenFieldID) {
+ if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
+ UIntType castingValue = element.value(UIntType.class);
+ token = castingValue.value(Long.class);
+ }
+ }
+ }
+ callback.onSuccess(token);
}}, commandId, commandArgs, timedInvokeTimeoutMs);
}
+ public interface ReviewFabricRestrictionsResponseCallback extends BaseClusterCallback {
+ void onSuccess(Long token);
+ }
+
public interface AclAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<ChipStructs.AccessControlClusterAccessControlEntryStruct> value);
}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
index 916493f..179b6e3 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipEventStructs.java
@@ -236,79 +236,33 @@
return output.toString();
}
}
-public static class AccessControlClusterAccessRestrictionEntryChangedEvent {
- public Integer fabricIndex;
- private static final long FABRIC_INDEX_ID = 254L;
-
- public AccessControlClusterAccessRestrictionEntryChangedEvent(
- Integer fabricIndex
- ) {
- this.fabricIndex = fabricIndex;
- }
-
- public StructType encodeTlv() {
- ArrayList<StructElement> values = new ArrayList<>();
- values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
-
- return new StructType(values);
- }
-
- public static AccessControlClusterAccessRestrictionEntryChangedEvent decodeTlv(BaseTLVType tlvValue) {
- if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
- return null;
- }
- Integer fabricIndex = null;
- for (StructElement element: ((StructType)tlvValue).value()) {
- if (element.contextTagNum() == FABRIC_INDEX_ID) {
- if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
- UIntType castingValue = element.value(UIntType.class);
- fabricIndex = castingValue.value(Integer.class);
- }
- }
- }
- return new AccessControlClusterAccessRestrictionEntryChangedEvent(
- fabricIndex
- );
- }
-
- @Override
- public String toString() {
- StringBuilder output = new StringBuilder();
- output.append("AccessControlClusterAccessRestrictionEntryChangedEvent {\n");
- output.append("\tfabricIndex: ");
- output.append(fabricIndex);
- output.append("\n");
- output.append("}\n");
- return output.toString();
- }
-}
public static class AccessControlClusterFabricRestrictionReviewUpdateEvent {
public Long token;
- public @Nullable String instruction;
- public @Nullable String redirectURL;
+ public Optional<String> instruction;
+ public Optional<String> ARLRequestFlowUrl;
public Integer fabricIndex;
private static final long TOKEN_ID = 0L;
private static final long INSTRUCTION_ID = 1L;
- private static final long REDIRECT_URL_ID = 2L;
+ private static final long ARL_REQUEST_FLOW_URL_ID = 2L;
private static final long FABRIC_INDEX_ID = 254L;
public AccessControlClusterFabricRestrictionReviewUpdateEvent(
Long token,
- @Nullable String instruction,
- @Nullable String redirectURL,
+ Optional<String> instruction,
+ Optional<String> ARLRequestFlowUrl,
Integer fabricIndex
) {
this.token = token;
this.instruction = instruction;
- this.redirectURL = redirectURL;
+ this.ARLRequestFlowUrl = ARLRequestFlowUrl;
this.fabricIndex = fabricIndex;
}
public StructType encodeTlv() {
ArrayList<StructElement> values = new ArrayList<>();
values.add(new StructElement(TOKEN_ID, new UIntType(token)));
- values.add(new StructElement(INSTRUCTION_ID, instruction != null ? new StringType(instruction) : new NullType()));
- values.add(new StructElement(REDIRECT_URL_ID, redirectURL != null ? new StringType(redirectURL) : new NullType()));
+ values.add(new StructElement(INSTRUCTION_ID, instruction.<BaseTLVType>map((nonOptionalinstruction) -> new StringType(nonOptionalinstruction)).orElse(new EmptyType())));
+ values.add(new StructElement(ARL_REQUEST_FLOW_URL_ID, ARLRequestFlowUrl.<BaseTLVType>map((nonOptionalARLRequestFlowUrl) -> new StringType(nonOptionalARLRequestFlowUrl)).orElse(new EmptyType())));
values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
return new StructType(values);
@@ -319,8 +273,8 @@
return null;
}
Long token = null;
- @Nullable String instruction = null;
- @Nullable String redirectURL = null;
+ Optional<String> instruction = Optional.empty();
+ Optional<String> ARLRequestFlowUrl = Optional.empty();
Integer fabricIndex = null;
for (StructElement element: ((StructType)tlvValue).value()) {
if (element.contextTagNum() == TOKEN_ID) {
@@ -331,12 +285,12 @@
} else if (element.contextTagNum() == INSTRUCTION_ID) {
if (element.value(BaseTLVType.class).type() == TLVType.String) {
StringType castingValue = element.value(StringType.class);
- instruction = castingValue.value(String.class);
+ instruction = Optional.of(castingValue.value(String.class));
}
- } else if (element.contextTagNum() == REDIRECT_URL_ID) {
+ } else if (element.contextTagNum() == ARL_REQUEST_FLOW_URL_ID) {
if (element.value(BaseTLVType.class).type() == TLVType.String) {
StringType castingValue = element.value(StringType.class);
- redirectURL = castingValue.value(String.class);
+ ARLRequestFlowUrl = Optional.of(castingValue.value(String.class));
}
} else if (element.contextTagNum() == FABRIC_INDEX_ID) {
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -348,7 +302,7 @@
return new AccessControlClusterFabricRestrictionReviewUpdateEvent(
token,
instruction,
- redirectURL,
+ ARLRequestFlowUrl,
fabricIndex
);
}
@@ -363,8 +317,8 @@
output.append("\tinstruction: ");
output.append(instruction);
output.append("\n");
- output.append("\tredirectURL: ");
- output.append(redirectURL);
+ output.append("\tARLRequestFlowUrl: ");
+ output.append(ARLRequestFlowUrl);
output.append("\n");
output.append("\tfabricIndex: ");
output.append(fabricIndex);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index e0099cc..8ae6ae6 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -1717,8 +1717,7 @@
public enum Event {
AccessControlEntryChanged(0L),
AccessControlExtensionChanged(1L),
- AccessRestrictionEntryChanged(2L),
- FabricRestrictionReviewUpdate(3L),;
+ FabricRestrictionReviewUpdate(2L),;
private final long id;
Event(long id) {
this.id = id;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
index 55659d8..b65ff7b 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -1341,6 +1341,28 @@
}
}
+
+ public static class DelegatedAccessControlClusterReviewFabricRestrictionsResponseCallback implements ChipClusters.AccessControlCluster.ReviewFabricRestrictionsResponseCallback, DelegatedClusterCallback {
+ private ClusterCommandCallback callback;
+ @Override
+ public void setCallbackDelegate(ClusterCommandCallback callback) {
+ this.callback = callback;
+ }
+
+ @Override
+ public void onSuccess(Long token) {
+ Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+
+ CommandResponseInfo tokenResponseValue = new CommandResponseInfo("token", "Long");
+ responseValues.put(tokenResponseValue, token);
+ callback.onSuccess(responseValues);
+ }
+
+ @Override
+ public void onError(Exception error) {
+ callback.onFailure(error);
+ }
+ }
public static class DelegatedAccessControlClusterAclAttributeCallback implements ChipClusters.AccessControlCluster.AclAttributeCallback, DelegatedClusterCallback {
private ClusterCommandCallback callback;
@Override
@@ -23368,14 +23390,15 @@
InteractionInfo accessControlreviewFabricRestrictionsInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.AccessControlCluster) cluster)
- .reviewFabricRestrictions((DefaultClusterCallback) callback
- , (ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct>)
- commandArguments.get("arl")
- );
- },
- () -> new DelegatedDefaultClusterCallback(),
+ .reviewFabricRestrictions((ChipClusters.AccessControlCluster.ReviewFabricRestrictionsResponseCallback) callback
+ , (ArrayList<ChipStructs.AccessControlClusterCommissioningAccessRestrictionEntryStruct>)
+ commandArguments.get("arl")
+
+ );
+ },
+ () -> new DelegatedAccessControlClusterReviewFabricRestrictionsResponseCallback(),
accessControlreviewFabricRestrictionsCommandParams
- );
+ );
accessControlClusterInteractionInfoMap.put("reviewFabricRestrictions", accessControlreviewFabricRestrictionsInteractionInfo);
commandMap.put("accessControl", accessControlClusterInteractionInfoMap);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt
deleted file mode 100644
index 56d9b39..0000000
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Copyright (c) 2023 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package chip.devicecontroller.cluster.eventstructs
-
-import chip.devicecontroller.cluster.*
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class AccessControlClusterAccessRestrictionEntryChangedEvent(val fabricIndex: UInt) {
- override fun toString(): String = buildString {
- append("AccessControlClusterAccessRestrictionEntryChangedEvent {\n")
- append("\tfabricIndex : $fabricIndex\n")
- append("}\n")
- }
-
- fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
- tlvWriter.apply {
- startStructure(tlvTag)
- put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
- endStructure()
- }
- }
-
- companion object {
- private const val TAG_FABRIC_INDEX = 254
-
- fun fromTlv(
- tlvTag: Tag,
- tlvReader: TlvReader,
- ): AccessControlClusterAccessRestrictionEntryChangedEvent {
- tlvReader.enterStructure(tlvTag)
- val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
-
- tlvReader.exitContainer()
-
- return AccessControlClusterAccessRestrictionEntryChangedEvent(fabricIndex)
- }
- }
-}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
index 7ea3d3f..2f2f4bd 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
@@ -17,6 +17,7 @@
package chip.devicecontroller.cluster.eventstructs
import chip.devicecontroller.cluster.*
+import java.util.Optional
import matter.tlv.ContextSpecificTag
import matter.tlv.Tag
import matter.tlv.TlvReader
@@ -24,15 +25,15 @@
class AccessControlClusterFabricRestrictionReviewUpdateEvent(
val token: ULong,
- val instruction: String?,
- val redirectURL: String?,
+ val instruction: Optional<String>,
+ val ARLRequestFlowUrl: Optional<String>,
val fabricIndex: UInt,
) {
override fun toString(): String = buildString {
append("AccessControlClusterFabricRestrictionReviewUpdateEvent {\n")
append("\ttoken : $token\n")
append("\tinstruction : $instruction\n")
- append("\tredirectURL : $redirectURL\n")
+ append("\tARLRequestFlowUrl : $ARLRequestFlowUrl\n")
append("\tfabricIndex : $fabricIndex\n")
append("}\n")
}
@@ -41,15 +42,13 @@
tlvWriter.apply {
startStructure(tlvTag)
put(ContextSpecificTag(TAG_TOKEN), token)
- if (instruction != null) {
- put(ContextSpecificTag(TAG_INSTRUCTION), instruction)
- } else {
- putNull(ContextSpecificTag(TAG_INSTRUCTION))
+ if (instruction.isPresent) {
+ val optinstruction = instruction.get()
+ put(ContextSpecificTag(TAG_INSTRUCTION), optinstruction)
}
- if (redirectURL != null) {
- put(ContextSpecificTag(TAG_REDIRECT_URL), redirectURL)
- } else {
- putNull(ContextSpecificTag(TAG_REDIRECT_URL))
+ if (ARLRequestFlowUrl.isPresent) {
+ val optARLRequestFlowUrl = ARLRequestFlowUrl.get()
+ put(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL), optARLRequestFlowUrl)
}
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
endStructure()
@@ -59,7 +58,7 @@
companion object {
private const val TAG_TOKEN = 0
private const val TAG_INSTRUCTION = 1
- private const val TAG_REDIRECT_URL = 2
+ private const val TAG_ARL_REQUEST_FLOW_URL = 2
private const val TAG_FABRIC_INDEX = 254
fun fromTlv(
@@ -69,18 +68,16 @@
tlvReader.enterStructure(tlvTag)
val token = tlvReader.getULong(ContextSpecificTag(TAG_TOKEN))
val instruction =
- if (!tlvReader.isNull()) {
- tlvReader.getString(ContextSpecificTag(TAG_INSTRUCTION))
+ if (tlvReader.isNextTag(ContextSpecificTag(TAG_INSTRUCTION))) {
+ Optional.of(tlvReader.getString(ContextSpecificTag(TAG_INSTRUCTION)))
} else {
- tlvReader.getNull(ContextSpecificTag(TAG_INSTRUCTION))
- null
+ Optional.empty()
}
- val redirectURL =
- if (!tlvReader.isNull()) {
- tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_URL))
+ val ARLRequestFlowUrl =
+ if (tlvReader.isNextTag(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL))) {
+ Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL)))
} else {
- tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_URL))
- null
+ Optional.empty()
}
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
@@ -89,7 +86,7 @@
return AccessControlClusterFabricRestrictionReviewUpdateEvent(
token,
instruction,
- redirectURL,
+ ARLRequestFlowUrl,
fabricIndex,
)
}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
index 3642d23..bbaa611 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
@@ -164,7 +164,6 @@
eventstructs_sources = [
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt",
- "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
index 099162a..e0a5c59 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
@@ -46,6 +46,8 @@
private val controller: MatterController,
private val endpointId: UShort,
) {
+ class ReviewFabricRestrictionsResponse(val token: ULong)
+
class AclAttribute(val value: List<AccessControlClusterAccessControlEntryStruct>)
sealed class AclAttributeSubscriptionState {
@@ -136,7 +138,7 @@
suspend fun reviewFabricRestrictions(
arl: List<AccessControlClusterCommissioningAccessRestrictionEntryStruct>,
timedInvokeTimeout: Duration? = null,
- ) {
+ ): ReviewFabricRestrictionsResponse {
val commandId: UInt = 0u
val tlvWriter = TlvWriter()
@@ -159,6 +161,29 @@
val response: InvokeResponse = controller.invoke(request)
logger.log(Level.FINE, "Invoke command succeeded: ${response}")
+
+ val tlvReader = TlvReader(response.payload)
+ tlvReader.enterStructure(AnonymousTag)
+ val TAG_TOKEN: Int = 0
+ var token_decoded: ULong? = null
+
+ while (!tlvReader.isEndOfContainer()) {
+ val tag = tlvReader.peekElement().tag
+
+ if (tag == ContextSpecificTag(TAG_TOKEN)) {
+ token_decoded = tlvReader.getULong(tag)
+ } else {
+ tlvReader.skipElement()
+ }
+ }
+
+ if (token_decoded == null) {
+ throw IllegalStateException("token not found in TLV")
+ }
+
+ tlvReader.exitContainer()
+
+ return ReviewFabricRestrictionsResponse(token_decoded)
}
suspend fun readAclAttribute(): AclAttribute {
diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt
deleted file mode 100644
index 8a272f8..0000000
--- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * Copyright (c) 2023 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package matter.controller.cluster.eventstructs
-
-import matter.controller.cluster.*
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class AccessControlClusterAccessRestrictionEntryChangedEvent(val fabricIndex: UByte) {
- override fun toString(): String = buildString {
- append("AccessControlClusterAccessRestrictionEntryChangedEvent {\n")
- append("\tfabricIndex : $fabricIndex\n")
- append("}\n")
- }
-
- fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
- tlvWriter.apply {
- startStructure(tlvTag)
- put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
- endStructure()
- }
- }
-
- companion object {
- private const val TAG_FABRIC_INDEX = 254
-
- fun fromTlv(
- tlvTag: Tag,
- tlvReader: TlvReader,
- ): AccessControlClusterAccessRestrictionEntryChangedEvent {
- tlvReader.enterStructure(tlvTag)
- val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
-
- tlvReader.exitContainer()
-
- return AccessControlClusterAccessRestrictionEntryChangedEvent(fabricIndex)
- }
- }
-}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
index 6bf03e6..1a9670c 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt
@@ -16,6 +16,7 @@
*/
package matter.controller.cluster.eventstructs
+import java.util.Optional
import matter.controller.cluster.*
import matter.tlv.ContextSpecificTag
import matter.tlv.Tag
@@ -24,15 +25,15 @@
class AccessControlClusterFabricRestrictionReviewUpdateEvent(
val token: ULong,
- val instruction: String?,
- val redirectURL: String?,
+ val instruction: Optional<String>,
+ val ARLRequestFlowUrl: Optional<String>,
val fabricIndex: UByte,
) {
override fun toString(): String = buildString {
append("AccessControlClusterFabricRestrictionReviewUpdateEvent {\n")
append("\ttoken : $token\n")
append("\tinstruction : $instruction\n")
- append("\tredirectURL : $redirectURL\n")
+ append("\tARLRequestFlowUrl : $ARLRequestFlowUrl\n")
append("\tfabricIndex : $fabricIndex\n")
append("}\n")
}
@@ -41,15 +42,13 @@
tlvWriter.apply {
startStructure(tlvTag)
put(ContextSpecificTag(TAG_TOKEN), token)
- if (instruction != null) {
- put(ContextSpecificTag(TAG_INSTRUCTION), instruction)
- } else {
- putNull(ContextSpecificTag(TAG_INSTRUCTION))
+ if (instruction.isPresent) {
+ val optinstruction = instruction.get()
+ put(ContextSpecificTag(TAG_INSTRUCTION), optinstruction)
}
- if (redirectURL != null) {
- put(ContextSpecificTag(TAG_REDIRECT_URL), redirectURL)
- } else {
- putNull(ContextSpecificTag(TAG_REDIRECT_URL))
+ if (ARLRequestFlowUrl.isPresent) {
+ val optARLRequestFlowUrl = ARLRequestFlowUrl.get()
+ put(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL), optARLRequestFlowUrl)
}
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
endStructure()
@@ -59,7 +58,7 @@
companion object {
private const val TAG_TOKEN = 0
private const val TAG_INSTRUCTION = 1
- private const val TAG_REDIRECT_URL = 2
+ private const val TAG_ARL_REQUEST_FLOW_URL = 2
private const val TAG_FABRIC_INDEX = 254
fun fromTlv(
@@ -69,18 +68,16 @@
tlvReader.enterStructure(tlvTag)
val token = tlvReader.getULong(ContextSpecificTag(TAG_TOKEN))
val instruction =
- if (!tlvReader.isNull()) {
- tlvReader.getString(ContextSpecificTag(TAG_INSTRUCTION))
+ if (tlvReader.isNextTag(ContextSpecificTag(TAG_INSTRUCTION))) {
+ Optional.of(tlvReader.getString(ContextSpecificTag(TAG_INSTRUCTION)))
} else {
- tlvReader.getNull(ContextSpecificTag(TAG_INSTRUCTION))
- null
+ Optional.empty()
}
- val redirectURL =
- if (!tlvReader.isNull()) {
- tlvReader.getString(ContextSpecificTag(TAG_REDIRECT_URL))
+ val ARLRequestFlowUrl =
+ if (tlvReader.isNextTag(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL))) {
+ Optional.of(tlvReader.getString(ContextSpecificTag(TAG_ARL_REQUEST_FLOW_URL)))
} else {
- tlvReader.getNull(ContextSpecificTag(TAG_REDIRECT_URL))
- null
+ Optional.empty()
}
val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
@@ -89,7 +86,7 @@
return AccessControlClusterFabricRestrictionReviewUpdateEvent(
token,
instruction,
- redirectURL,
+ ARLRequestFlowUrl,
fabricIndex,
)
}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni
index 90d1e06..1f287a1 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/files.gni
+++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni
@@ -164,7 +164,6 @@
matter_eventstructs_sources = [
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt",
- "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessRestrictionEntryChangedEvent.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterFabricRestrictionReviewUpdateEvent.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index e695cd1..d9bf294 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -500,46 +500,6 @@
return value;
}
- case Events::AccessRestrictionEntryChanged::Id: {
- Events::AccessRestrictionEntryChanged::DecodableType cppValue;
- *aError = app::DataModel::Decode(aReader, cppValue);
- if (*aError != CHIP_NO_ERROR)
- {
- return nullptr;
- }
- jobject value_fabricIndex;
- std::string value_fabricIndexClassName = "java/lang/Integer";
- std::string value_fabricIndexCtorSignature = "(I)V";
- jint jnivalue_fabricIndex = static_cast<jint>(cppValue.fabricIndex);
- chip::JniReferences::GetInstance().CreateBoxedObject<jint>(value_fabricIndexClassName.c_str(),
- value_fabricIndexCtorSignature.c_str(), jnivalue_fabricIndex,
- value_fabricIndex);
-
- jclass accessRestrictionEntryChangedStructClass;
- err = chip::JniReferences::GetInstance().GetLocalClassRef(
- env, "chip/devicecontroller/ChipEventStructs$AccessControlClusterAccessRestrictionEntryChangedEvent",
- accessRestrictionEntryChangedStructClass);
- if (err != CHIP_NO_ERROR)
- {
- ChipLogError(Zcl, "Could not find class ChipEventStructs$AccessControlClusterAccessRestrictionEntryChangedEvent");
- return nullptr;
- }
-
- jmethodID accessRestrictionEntryChangedStructCtor;
- err = chip::JniReferences::GetInstance().FindMethod(env, accessRestrictionEntryChangedStructClass, "<init>",
- "(Ljava/lang/Integer;)V", &accessRestrictionEntryChangedStructCtor);
- if (err != CHIP_NO_ERROR || accessRestrictionEntryChangedStructCtor == nullptr)
- {
- ChipLogError(Zcl,
- "Could not find ChipEventStructs$AccessControlClusterAccessRestrictionEntryChangedEvent constructor");
- return nullptr;
- }
-
- jobject value = env->NewObject(accessRestrictionEntryChangedStructClass, accessRestrictionEntryChangedStructCtor,
- value_fabricIndex);
-
- return value;
- }
case Events::FabricRestrictionReviewUpdate::Id: {
Events::FabricRestrictionReviewUpdate::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
@@ -555,25 +515,29 @@
value_tokenClassName.c_str(), value_tokenCtorSignature.c_str(), jnivalue_token, value_token);
jobject value_instruction;
- if (cppValue.instruction.IsNull())
+ if (!cppValue.instruction.HasValue())
{
- value_instruction = nullptr;
+ chip::JniReferences::GetInstance().CreateOptional(nullptr, value_instruction);
}
else
{
- LogErrorOnFailure(
- chip::JniReferences::GetInstance().CharToStringUTF(cppValue.instruction.Value(), value_instruction));
+ jobject value_instructionInsideOptional;
+ LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.instruction.Value(),
+ value_instructionInsideOptional));
+ chip::JniReferences::GetInstance().CreateOptional(value_instructionInsideOptional, value_instruction);
}
- jobject value_redirectURL;
- if (cppValue.redirectURL.IsNull())
+ jobject value_ARLRequestFlowUrl;
+ if (!cppValue.ARLRequestFlowUrl.HasValue())
{
- value_redirectURL = nullptr;
+ chip::JniReferences::GetInstance().CreateOptional(nullptr, value_ARLRequestFlowUrl);
}
else
{
- LogErrorOnFailure(
- chip::JniReferences::GetInstance().CharToStringUTF(cppValue.redirectURL.Value(), value_redirectURL));
+ jobject value_ARLRequestFlowUrlInsideOptional;
+ LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.ARLRequestFlowUrl.Value(),
+ value_ARLRequestFlowUrlInsideOptional));
+ chip::JniReferences::GetInstance().CreateOptional(value_ARLRequestFlowUrlInsideOptional, value_ARLRequestFlowUrl);
}
jobject value_fabricIndex;
@@ -597,7 +561,7 @@
jmethodID fabricRestrictionReviewUpdateStructCtor;
err = chip::JniReferences::GetInstance().FindMethod(
env, fabricRestrictionReviewUpdateStructClass, "<init>",
- "(Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;)V",
+ "(Ljava/lang/Long;Ljava/util/Optional;Ljava/util/Optional;Ljava/lang/Integer;)V",
&fabricRestrictionReviewUpdateStructCtor);
if (err != CHIP_NO_ERROR || fabricRestrictionReviewUpdateStructCtor == nullptr)
{
@@ -607,7 +571,7 @@
}
jobject value = env->NewObject(fabricRestrictionReviewUpdateStructClass, fabricRestrictionReviewUpdateStructCtor,
- value_token, value_instruction, value_redirectURL, value_fabricIndex);
+ value_token, value_instruction, value_ARLRequestFlowUrl, value_fabricIndex);
return value;
}
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 482fe33..688b4d6 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -3096,7 +3096,7 @@
cluster_id: typing.ClassVar[int] = 0x0000001F
command_id: typing.ClassVar[int] = 0x00000000
is_client: typing.ClassVar[bool] = True
- response_type: typing.ClassVar[str] = None
+ response_type: typing.ClassVar[str] = 'ReviewFabricRestrictionsResponse'
@ChipUtility.classproperty
def descriptor(cls) -> ClusterObjectDescriptor:
@@ -3388,7 +3388,7 @@
fabricIndex: 'uint' = 0
@dataclass
- class AccessRestrictionEntryChanged(ClusterEvent):
+ class FabricRestrictionReviewUpdate(ClusterEvent):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0000001F
@@ -3401,34 +3401,15 @@
def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields=[
- ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
- ])
-
- fabricIndex: 'uint' = 0
-
- @dataclass
- class FabricRestrictionReviewUpdate(ClusterEvent):
- @ChipUtility.classproperty
- def cluster_id(cls) -> int:
- return 0x0000001F
-
- @ChipUtility.classproperty
- def event_id(cls) -> int:
- return 0x00000003
-
- @ChipUtility.classproperty
- def descriptor(cls) -> ClusterObjectDescriptor:
- return ClusterObjectDescriptor(
- Fields=[
ClusterObjectFieldDescriptor(Label="token", Tag=0, Type=uint),
- ClusterObjectFieldDescriptor(Label="instruction", Tag=1, Type=typing.Union[Nullable, str]),
- ClusterObjectFieldDescriptor(Label="redirectURL", Tag=2, Type=typing.Union[Nullable, str]),
+ ClusterObjectFieldDescriptor(Label="instruction", Tag=1, Type=typing.Optional[str]),
+ ClusterObjectFieldDescriptor(Label="ARLRequestFlowUrl", Tag=2, Type=typing.Optional[str]),
ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
])
token: 'uint' = 0
- instruction: 'typing.Union[Nullable, str]' = NullValue
- redirectURL: 'typing.Union[Nullable, str]' = NullValue
+ instruction: 'typing.Optional[str]' = None
+ ARLRequestFlowUrl: 'typing.Optional[str]' = None
fabricIndex: 'uint' = 0
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 9360e68..60c65ac 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -1012,7 +1012,7 @@
*
* 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.
*/
-- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params completion:(void (^)(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
- (void)readAttributeACLWithParams:(MTRReadParams * _Nullable)params completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
- (void)writeAttributeACLWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 696d1f8..84e03c5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -7742,7 +7742,7 @@
@implementation MTRBaseClusterAccessControl
-- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params completion:(MTRStatusCompletion)completion
+- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params completion:(void (^)(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable data, NSError * _Nullable error))completion
{
if (params == nil) {
params = [[MTRAccessControlClusterReviewFabricRestrictionsParams
@@ -7750,7 +7750,7 @@
}
auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
- completion(error);
+ completion(response, error);
};
auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
@@ -7762,7 +7762,7 @@
commandPayload:params
timedInvokeTimeout:timedInvokeTimeoutMs
serverSideProcessingTimeout:params.serverSideProcessingTimeout
- responseClass:nil
+ responseClass:MTRAccessControlClusterReviewFabricRestrictionsResponseParams.class
queue:self.callbackQueue
completion:responseHandler];
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 1ffa3ec..3ab3417 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -7143,8 +7143,7 @@
// Cluster AccessControl events
MTREventIDTypeClusterAccessControlEventAccessControlEntryChangedID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000,
MTREventIDTypeClusterAccessControlEventAccessControlExtensionChangedID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000001,
- MTREventIDTypeClusterAccessControlEventAccessRestrictionEntryChangedID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
- MTREventIDTypeClusterAccessControlEventFabricRestrictionReviewUpdateID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+ MTREventIDTypeClusterAccessControlEventFabricRestrictionReviewUpdateID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
// Cluster Actions deprecated event names
MTRClusterActionsEventStateChangedID
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
index 69ec92c..f5beab9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
@@ -9515,10 +9515,6 @@
result = @"AccessControlExtensionChanged";
break;
- case MTREventIDTypeClusterAccessControlEventAccessRestrictionEntryChangedID:
- result = @"AccessRestrictionEntryChanged";
- break;
-
case MTREventIDTypeClusterAccessControlEventFabricRestrictionReviewUpdateID:
result = @"FabricRestrictionReviewUpdate";
break;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index a717868..e219778 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -510,7 +510,7 @@
MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@interface MTRClusterAccessControl : MTRGenericCluster
-- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
- (NSDictionary<NSString *, id> * _Nullable)readAttributeACLWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
- (void)writeAttributeACLWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 6f6db16..26d1ec9 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -1617,7 +1617,7 @@
@implementation MTRClusterAccessControl
-- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)reviewFabricRestrictionsWithParams:(MTRAccessControlClusterReviewFabricRestrictionsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable data, NSError * _Nullable error))completion
{
if (params == nil) {
params = [[MTRAccessControlClusterReviewFabricRestrictionsParams
@@ -1625,7 +1625,7 @@
}
auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
- completion(error);
+ completion(response, error);
};
auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
@@ -1639,7 +1639,7 @@
expectedValueInterval:expectedValueIntervalMs
timedInvokeTimeout:timedInvokeTimeoutMs
serverSideProcessingTimeout:params.serverSideProcessingTimeout
- responseClass:nil
+ responseClass:MTRAccessControlClusterReviewFabricRestrictionsResponseParams.class
queue:self.callbackQueue
completion:responseHandler];
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 99f43ea..85dcba3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -304,23 +304,6 @@
return value;
}
- case Events::AccessRestrictionEntryChanged::Id: {
- Events::AccessRestrictionEntryChanged::DecodableType cppValue;
- *aError = DataModel::Decode(aReader, cppValue);
- if (*aError != CHIP_NO_ERROR) {
- return nil;
- }
-
- __auto_type * value = [MTRAccessControlClusterAccessRestrictionEntryChangedEvent new];
-
- do {
- NSNumber * _Nonnull memberValue;
- memberValue = [NSNumber numberWithUnsignedChar:cppValue.fabricIndex];
- value.fabricIndex = memberValue;
- } while (0);
-
- return value;
- }
case Events::FabricRestrictionReviewUpdate::Id: {
Events::FabricRestrictionReviewUpdate::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
@@ -337,31 +320,31 @@
} while (0);
do {
NSString * _Nullable memberValue;
- if (cppValue.instruction.IsNull()) {
- memberValue = nil;
- } else {
+ if (cppValue.instruction.HasValue()) {
memberValue = AsString(cppValue.instruction.Value());
if (memberValue == nil) {
CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
*aError = err;
return nil;
}
+ } else {
+ memberValue = nil;
}
value.instruction = memberValue;
} while (0);
do {
NSString * _Nullable memberValue;
- if (cppValue.redirectURL.IsNull()) {
- memberValue = nil;
- } else {
- memberValue = AsString(cppValue.redirectURL.Value());
+ if (cppValue.ARLRequestFlowUrl.HasValue()) {
+ memberValue = AsString(cppValue.ARLRequestFlowUrl.Value());
if (memberValue == nil) {
CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT;
*aError = err;
return nil;
}
+ } else {
+ memberValue = nil;
}
- value.redirectURL = memberValue;
+ value.arlRequestFlowUrl = memberValue;
} while (0);
do {
NSNumber * _Nonnull memberValue;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 93632e8..b0dcf5a 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -152,15 +152,10 @@
@end
MTR_PROVISIONALLY_AVAILABLE
-@interface MTRAccessControlClusterAccessRestrictionEntryChangedEvent : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
-@end
-
-MTR_PROVISIONALLY_AVAILABLE
@interface MTRAccessControlClusterFabricRestrictionReviewUpdateEvent : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull token MTR_PROVISIONALLY_AVAILABLE;
@property (nonatomic, copy) NSString * _Nullable instruction MTR_PROVISIONALLY_AVAILABLE;
-@property (nonatomic, copy) NSString * _Nullable redirectURL MTR_PROVISIONALLY_AVAILABLE;
+@property (nonatomic, copy) NSString * _Nullable arlRequestFlowUrl MTR_PROVISIONALLY_AVAILABLE;
@property (nonatomic, copy) NSNumber * _Nonnull fabricIndex MTR_PROVISIONALLY_AVAILABLE;
@end
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 917332e..2d5a383 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -532,33 +532,6 @@
@end
-@implementation MTRAccessControlClusterAccessRestrictionEntryChangedEvent
-- (instancetype)init
-{
- if (self = [super init]) {
-
- _fabricIndex = @(0);
- }
- return self;
-}
-
-- (id)copyWithZone:(NSZone * _Nullable)zone
-{
- auto other = [[MTRAccessControlClusterAccessRestrictionEntryChangedEvent alloc] init];
-
- other.fabricIndex = self.fabricIndex;
-
- return other;
-}
-
-- (NSString *)description
-{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: fabricIndex:%@; >", NSStringFromClass([self class]), _fabricIndex];
- return descriptionString;
-}
-
-@end
-
@implementation MTRAccessControlClusterFabricRestrictionReviewUpdateEvent
- (instancetype)init
{
@@ -568,7 +541,7 @@
_instruction = nil;
- _redirectURL = nil;
+ _arlRequestFlowUrl = nil;
_fabricIndex = @(0);
}
@@ -581,7 +554,7 @@
other.token = self.token;
other.instruction = self.instruction;
- other.redirectURL = self.redirectURL;
+ other.arlRequestFlowUrl = self.arlRequestFlowUrl;
other.fabricIndex = self.fabricIndex;
return other;
@@ -589,7 +562,7 @@
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: token:%@; instruction:%@; redirectURL:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _token, _instruction, _redirectURL, _fabricIndex];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: token:%@; instruction:%@; arlRequestFlowUrl:%@; fabricIndex:%@; >", NSStringFromClass([self class]), _token, _instruction, _arlRequestFlowUrl, _fabricIndex];
return descriptionString;
}
diff --git a/src/python_testing/TC_ACL_2_11.py b/src/python_testing/TC_ACL_2_11.py
index a9f63b2..ce8034a 100644
--- a/src/python_testing/TC_ACL_2_11.py
+++ b/src/python_testing/TC_ACL_2_11.py
@@ -173,19 +173,10 @@
arru_cb = EventChangeCallback(Clusters.AccessControl.Events.FabricRestrictionReviewUpdate, arru_queue)
urgent = 1
- subscription_arru = await dev_ctrl.ReadEvent(dut_node_id, events=[(0, Clusters.AccessControl.Events.FabricRestrictionReviewUpdate, urgent)], reportInterval=(1, 5), keepSubscriptions=True, autoResubscribe=False)
+ subscription_arru = await dev_ctrl.ReadEvent(dut_node_id, events=[(0, Clusters.AccessControl.Events.FabricRestrictionReviewUpdate, urgent)], reportInterval=(0, 30), keepSubscriptions=True, autoResubscribe=False)
subscription_arru.SetEventUpdateCallback(callback=arru_cb)
# end
- # Belongs to step 7, but needs to be subscribed before executing step 5: begin
- arec_queue = queue.Queue()
- arec_cb = EventChangeCallback(Clusters.AccessControl.Events.AccessRestrictionEntryChanged, arec_queue)
-
- urgent = 1
- subscription_arec = await dev_ctrl.ReadEvent(dut_node_id, events=[(0, Clusters.AccessControl.Events.AccessRestrictionEntryChanged, urgent)], reportInterval=(1, 5), keepSubscriptions=True, autoResubscribe=False)
- subscription_arec.SetEventUpdateCallback(callback=arec_cb)
- # end
-
self.step(5)
root_node_endpoint = 0
root_part_list = await dev_ctrl.ReadAttribute(dut_node_id, [(root_node_endpoint, Clusters.Descriptor.Attributes.PartsList)])
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index 354eb75..e75804a 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -2717,41 +2717,6 @@
}
}
} // namespace AccessControlExtensionChanged.
-namespace AccessRestrictionEntryChanged {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
-{
- TLV::TLVType outer;
- ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
- ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFabricIndex), fabricIndex));
- return aWriter.EndContainer(outer);
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
- detail::StructDecodeIterator __iterator(reader);
- while (true)
- {
- auto __element = __iterator.Next();
- if (std::holds_alternative<CHIP_ERROR>(__element))
- {
- return std::get<CHIP_ERROR>(__element);
- }
-
- CHIP_ERROR err = CHIP_NO_ERROR;
- const uint8_t __context_tag = std::get<uint8_t>(__element);
-
- if (__context_tag == to_underlying(Fields::kFabricIndex))
- {
- err = DataModel::Decode(reader, fabricIndex);
- }
- else
- {
- }
-
- ReturnErrorOnFailure(err);
- }
-}
-} // namespace AccessRestrictionEntryChanged.
namespace FabricRestrictionReviewUpdate {
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
{
@@ -2759,7 +2724,7 @@
ReturnErrorOnFailure(aWriter.StartContainer(aTag, TLV::kTLVType_Structure, outer));
ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kToken), token));
ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kInstruction), instruction));
- ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kRedirectURL), redirectURL));
+ ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kARLRequestFlowUrl), ARLRequestFlowUrl));
ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kFabricIndex), fabricIndex));
return aWriter.EndContainer(outer);
}
@@ -2786,9 +2751,9 @@
{
err = DataModel::Decode(reader, instruction);
}
- else if (__context_tag == to_underlying(Fields::kRedirectURL))
+ else if (__context_tag == to_underlying(Fields::kARLRequestFlowUrl))
{
- err = DataModel::Decode(reader, redirectURL);
+ err = DataModel::Decode(reader, ARLRequestFlowUrl);
}
else if (__context_tag == to_underlying(Fields::kFabricIndex))
{
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
index e96a078..b2fc8fb 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -2928,7 +2928,7 @@
CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
- using ResponseType = DataModel::NullObjectType;
+ using ResponseType = Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::DecodableType;
static constexpr bool MustUseTimedInvoke() { return false; }
};
@@ -3228,50 +3228,15 @@
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
} // namespace AccessControlExtensionChanged
-namespace AccessRestrictionEntryChanged {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
-enum class Fields : uint8_t
-{
- kFabricIndex = 254,
-};
-
-struct Type
-{
-public:
- static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
- static constexpr EventId GetEventId() { return Events::AccessRestrictionEntryChanged::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
- static constexpr bool kIsFabricScoped = true;
-
- chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
-
- auto GetFabricIndex() const { return fabricIndex; }
-
- CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
-
-struct DecodableType
-{
-public:
- static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
- static constexpr EventId GetEventId() { return Events::AccessRestrictionEntryChanged::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
-
- chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
-
- CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace AccessRestrictionEntryChanged
namespace FabricRestrictionReviewUpdate {
static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
enum class Fields : uint8_t
{
- kToken = 0,
- kInstruction = 1,
- kRedirectURL = 2,
- kFabricIndex = 254,
+ kToken = 0,
+ kInstruction = 1,
+ kARLRequestFlowUrl = 2,
+ kFabricIndex = 254,
};
struct Type
@@ -3283,8 +3248,8 @@
static constexpr bool kIsFabricScoped = true;
uint64_t token = static_cast<uint64_t>(0);
- DataModel::Nullable<chip::CharSpan> instruction;
- DataModel::Nullable<chip::CharSpan> redirectURL;
+ Optional<chip::CharSpan> instruction;
+ Optional<chip::CharSpan> ARLRequestFlowUrl;
chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
auto GetFabricIndex() const { return fabricIndex; }
@@ -3300,8 +3265,8 @@
static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
uint64_t token = static_cast<uint64_t>(0);
- DataModel::Nullable<chip::CharSpan> instruction;
- DataModel::Nullable<chip::CharSpan> redirectURL;
+ Optional<chip::CharSpan> instruction;
+ Optional<chip::CharSpan> ARLRequestFlowUrl;
chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
CHIP_ERROR Decode(TLV::TLVReader & reader);
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
index 01caeea..0756af5 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
@@ -36,12 +36,8 @@
static constexpr EventId Id = 0x00000001;
} // namespace AccessControlExtensionChanged
-namespace AccessRestrictionEntryChanged {
-static constexpr EventId Id = 0x00000002;
-} // namespace AccessRestrictionEntryChanged
-
namespace FabricRestrictionReviewUpdate {
-static constexpr EventId Id = 0x00000003;
+static constexpr EventId Id = 0x00000002;
} // namespace FabricRestrictionReviewUpdate
} // namespace Events
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 5e6f77d..1c6f6af 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -1273,8 +1273,7 @@
| Events: | |
| * AccessControlEntryChanged | 0x0000 |
| * AccessControlExtensionChanged | 0x0001 |
-| * AccessRestrictionEntryChanged | 0x0002 |
-| * FabricRestrictionReviewUpdate | 0x0003 |
+| * FabricRestrictionReviewUpdate | 0x0002 |
\*----------------------------------------------------------------------------*/
/*
@@ -16285,8 +16284,6 @@
make_unique<ReadEvent>(Id, "access-control-entry-changed", Events::AccessControlEntryChanged::Id, credsIssuerConfig), //
make_unique<ReadEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
credsIssuerConfig), //
- make_unique<ReadEvent>(Id, "access-restriction-entry-changed", Events::AccessRestrictionEntryChanged::Id,
- credsIssuerConfig), //
make_unique<ReadEvent>(Id, "fabric-restriction-review-update", Events::FabricRestrictionReviewUpdate::Id,
credsIssuerConfig), //
make_unique<SubscribeEvent>(Id, credsIssuerConfig), //
@@ -16294,8 +16291,6 @@
credsIssuerConfig), //
make_unique<SubscribeEvent>(Id, "access-control-extension-changed", Events::AccessControlExtensionChanged::Id,
credsIssuerConfig), //
- make_unique<SubscribeEvent>(Id, "access-restriction-entry-changed", Events::AccessRestrictionEntryChanged::Id,
- credsIssuerConfig), //
make_unique<SubscribeEvent>(Id, "fabric-restriction-review-update", Events::FabricRestrictionReviewUpdate::Id,
credsIssuerConfig), //
};
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index b61e6e9..f8946b7 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -5614,22 +5614,6 @@
return CHIP_NO_ERROR;
}
CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const AccessControl::Events::AccessRestrictionEntryChanged::DecodableType & value)
-{
- DataModelLogger::LogString(label, indent, "{");
- {
- CHIP_ERROR err = DataModelLogger::LogValue("FabricIndex", indent + 1, value.fabricIndex);
- if (err != CHIP_NO_ERROR)
- {
- DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'FabricIndex'");
- return err;
- }
- }
- DataModelLogger::LogString(indent, "}");
-
- return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
const AccessControl::Events::FabricRestrictionReviewUpdate::DecodableType & value)
{
DataModelLogger::LogString(label, indent, "{");
@@ -5650,10 +5634,10 @@
}
}
{
- CHIP_ERROR err = DataModelLogger::LogValue("RedirectURL", indent + 1, value.redirectURL);
+ CHIP_ERROR err = DataModelLogger::LogValue("ARLRequestFlowUrl", indent + 1, value.ARLRequestFlowUrl);
if (err != CHIP_NO_ERROR)
{
- DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'RedirectURL'");
+ DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'ARLRequestFlowUrl'");
return err;
}
}
@@ -20270,11 +20254,6 @@
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("AccessControlExtensionChanged", 1, value);
}
- case AccessControl::Events::AccessRestrictionEntryChanged::Id: {
- chip::app::Clusters::AccessControl::Events::AccessRestrictionEntryChanged::DecodableType value;
- ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("AccessRestrictionEntryChanged", 1, value);
- }
case AccessControl::Events::FabricRestrictionReviewUpdate::Id: {
chip::app::Clusters::AccessControl::Events::FabricRestrictionReviewUpdate::DecodableType value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index c2b9cfb..ce1aa0b 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -437,8 +437,6 @@
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::AccessControl::Events::AccessRestrictionEntryChanged::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::AccessControl::Events::FabricRestrictionReviewUpdate::DecodableType & value);
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Actions::Events::StateChanged::DecodableType & value);
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 7fdfb6f..85632c6 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -10090,8 +10090,7 @@
| Events: | |
| * AccessControlEntryChanged | 0x0000 |
| * AccessControlExtensionChanged | 0x0001 |
-| * AccessRestrictionEntryChanged | 0x0002 |
-| * FabricRestrictionReviewUpdate | 0x0003 |
+| * FabricRestrictionReviewUpdate | 0x0002 |
\*----------------------------------------------------------------------------*/
#if MTR_ENABLE_PROVISIONAL
@@ -10153,12 +10152,18 @@
uint16_t __block responsesNeeded = repeatCount;
while (repeatCount--) {
[cluster reviewFabricRestrictionsWithParams:params completion:
- ^(NSError * _Nullable error) {
+ ^(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable values, NSError * _Nullable error) {
+ NSLog(@"Values: %@", values);
+ if (error == nil) {
+ constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
+ RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+ }
responsesNeeded--;
if (error != nil) {
mError = error;
LogNSError("Error", error);
- RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+ constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
+ RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
}
if (responsesNeeded == 0) {
SetCommandExitStatus(mError);
