Skip to content

Commit

Permalink
Align naming in Administrator Commissioning cluster XML with the spec. (
Browse files Browse the repository at this point in the history 
#24318)

* Align naming in Administrator Commissioning cluster XML with the spec.

* Regenerate generated code.
  • Loading branch information
@bzbarsky-apple @pull
bzbarsky-apple authored and pull[bot] committed Aug 28, 2023
1 parent 1cf551d commit 1304210
Show file tree
Hide file tree
Showing 67 changed files with 154 additions and 124 deletions.
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/nxp/zap/lighting-on-off.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,7 +1288,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/pump-common/pump-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-app/tv-common/tv-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/window-app/common/window-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ server cluster AdministratorCommissioning = 60 {

request struct OpenCommissioningWindowRequest {
INT16U commissioningTimeout = 0;
OCTET_STRING PAKEVerifier = 1;
OCTET_STRING PAKEPasscodeVerifier = 1;
INT16U discriminator = 2;
INT32U iterations = 3;
OCTET_STRING salt = 4;
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(
const Commands::OpenCommissioningWindow::DecodableType & commandData)
{
auto commissioningTimeout = System::Clock::Seconds16(commandData.commissioningTimeout);
auto & pakeVerifier = commandData.PAKEVerifier;
auto & pakeVerifier = commandData.PAKEPasscodeVerifier;
auto & discriminator = commandData.discriminator;
auto & iterations = commandData.iterations;
auto & salt = commandData.salt;
Expand Down
Loading

0 comments on commit 1304210

Please sign in to comment.