Be explicit between server clusters and client (binding) clusters on …

…endpoints (project-chip#13649) * Be explicit between server clusters and client (binding) clusters on endpoints * ZAP regen * Fix up the spacing a bit without comment hacks
selissia · Jan 28, 2022 · 4f01195 · 4f01195
1 parent ea498a4
commit 4f01195
Show file tree

Hide file tree

Showing 19 changed files with 481 additions and 480 deletions.
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
@@ -2999,86 +2999,86 @@ server cluster WindowCovering = 258 {
 
 
 endpoint 0 {
-  instantiate cluster AccessControl;
-  instantiate cluster AdministratorCommissioning;
-  instantiate cluster Basic;
-  instantiate cluster Binding;
-  instantiate cluster Descriptor;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster EthernetNetworkDiagnostics;
-  instantiate cluster FixedLabel;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster GeneralDiagnostics;
-  instantiate cluster GroupKeyManagement;
-  instantiate cluster Groups;
-  instantiate cluster Identify;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OtaSoftwareUpdateProvider;
-  instantiate cluster OtaSoftwareUpdateRequestor;
-  instantiate cluster OperationalCredentials;
-  instantiate cluster PowerSourceConfiguration;
-  instantiate cluster RelativeHumidityMeasurement;
-  instantiate cluster SoftwareDiagnostics;
-  instantiate cluster ThreadNetworkDiagnostics;
-  instantiate cluster UserLabel;
-  instantiate cluster WiFiNetworkDiagnostics;
+  server  cluster AccessControl;
+  server  cluster AdministratorCommissioning;
+  server  cluster Basic;
+  server  cluster Binding;
+  server  cluster Descriptor;
+  server  cluster DiagnosticLogs;
+  server  cluster EthernetNetworkDiagnostics;
+  server  cluster FixedLabel;
+  server  cluster GeneralCommissioning;
+  server  cluster GeneralDiagnostics;
+  server  cluster GroupKeyManagement;
+  server  cluster Groups;
+  server  cluster Identify;
+  server  cluster LocalizationConfiguration;
+  server  cluster NetworkCommissioning;
+  binding cluster OtaSoftwareUpdateProvider;
+  server  cluster OtaSoftwareUpdateRequestor;
+  server  cluster OperationalCredentials;
+  server  cluster PowerSourceConfiguration;
+  server  cluster RelativeHumidityMeasurement;
+  server  cluster SoftwareDiagnostics;
+  server  cluster ThreadNetworkDiagnostics;
+  server  cluster UserLabel;
+  server  cluster WiFiNetworkDiagnostics;
 }
 
 endpoint 1 {
-  instantiate cluster AccountLogin;
-  instantiate cluster ApplicationBasic;
-  instantiate cluster ApplicationLauncher;
-  instantiate cluster AudioOutput;
-  instantiate cluster BarrierControl;
-  instantiate cluster BinaryInputBasic;
-  instantiate cluster Binding;
-  instantiate cluster BooleanState;
-  instantiate cluster BridgedActions;
-  instantiate cluster BridgedDeviceBasic;
-  instantiate cluster Channel;
-  instantiate cluster ColorControl;
-  instantiate cluster ContentLauncher;
-  instantiate cluster Descriptor;
-  instantiate cluster DoorLock;
-  instantiate cluster ElectricalMeasurement;
-  instantiate cluster FixedLabel;
-  instantiate cluster FlowMeasurement;
-  instantiate cluster Groups;
-  instantiate cluster IasZone;
-  instantiate cluster Identify;
-  instantiate cluster IlluminanceMeasurement;
-  instantiate cluster KeypadInput;
-  instantiate cluster LevelControl;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster LowPower;
-  instantiate cluster MediaInput;
-  instantiate cluster MediaPlayback;
-  instantiate cluster ModeSelect;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OccupancySensing;
-  instantiate cluster OnOff;
-  instantiate cluster OnOffSwitchConfiguration;
-  instantiate cluster PowerSource;
-  instantiate cluster PressureMeasurement;
-  instantiate cluster PumpConfigurationAndControl;
-  instantiate cluster RelativeHumidityMeasurement;
-  instantiate cluster Scenes;
-  instantiate cluster Switch;
-  instantiate cluster TargetNavigator;
-  instantiate cluster TemperatureMeasurement;
-  instantiate cluster TestCluster;
-  instantiate cluster Thermostat;
-  instantiate cluster ThermostatUserInterfaceConfiguration;
-  instantiate cluster UserLabel;
-  instantiate cluster WakeOnLan;
-  instantiate cluster WindowCovering;
+  server  cluster AccountLogin;
+  server  cluster ApplicationBasic;
+  server  cluster ApplicationLauncher;
+  server  cluster AudioOutput;
+  server  cluster BarrierControl;
+  server  cluster BinaryInputBasic;
+  server  cluster Binding;
+  server  cluster BooleanState;
+  server  cluster BridgedActions;
+  server  cluster BridgedDeviceBasic;
+  server  cluster Channel;
+  server  cluster ColorControl;
+  server  cluster ContentLauncher;
+  server  cluster Descriptor;
+  server  cluster DoorLock;
+  server  cluster ElectricalMeasurement;
+  server  cluster FixedLabel;
+  server  cluster FlowMeasurement;
+  server  cluster Groups;
+  server  cluster IasZone;
+  server  cluster Identify;
+  server  cluster IlluminanceMeasurement;
+  server  cluster KeypadInput;
+  server  cluster LevelControl;
+  server  cluster LocalizationConfiguration;
+  server  cluster LowPower;
+  server  cluster MediaInput;
+  server  cluster MediaPlayback;
+  server  cluster ModeSelect;
+  server  cluster NetworkCommissioning;
+  server  cluster OccupancySensing;
+  server  cluster OnOff;
+  server  cluster OnOffSwitchConfiguration;
+  server  cluster PowerSource;
+  server  cluster PressureMeasurement;
+  server  cluster PumpConfigurationAndControl;
+  server  cluster RelativeHumidityMeasurement;
+  server  cluster Scenes;
+  server  cluster Switch;
+  server  cluster TargetNavigator;
+  server  cluster TemperatureMeasurement;
+  server  cluster TestCluster;
+  server  cluster Thermostat;
+  server  cluster ThermostatUserInterfaceConfiguration;
+  server  cluster UserLabel;
+  server  cluster WakeOnLan;
+  server  cluster WindowCovering;
 }
 
 endpoint 2 {
-  instantiate cluster Descriptor;
-  instantiate cluster Groups;
-  instantiate cluster OccupancySensing;
-  instantiate cluster OnOff;
+  server  cluster Descriptor;
+  server  cluster Groups;
+  server  cluster OccupancySensing;
+  server  cluster OnOff;
 }
 
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -895,28 +895,28 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 
 endpoint 0 {
-  instantiate cluster AdministratorCommissioning;
-  instantiate cluster Basic;
-  instantiate cluster Descriptor;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster EthernetNetworkDiagnostics;
-  instantiate cluster FixedLabel;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster GeneralDiagnostics;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OperationalCredentials;
-  instantiate cluster SoftwareDiagnostics;
-  instantiate cluster ThreadNetworkDiagnostics;
-  instantiate cluster UserLabel;
-  instantiate cluster WiFiNetworkDiagnostics;
+  server  cluster AdministratorCommissioning;
+  server  cluster Basic;
+  server  cluster Descriptor;
+  server  cluster DiagnosticLogs;
+  server  cluster EthernetNetworkDiagnostics;
+  server  cluster FixedLabel;
+  server  cluster GeneralCommissioning;
+  server  cluster GeneralDiagnostics;
+  server  cluster LocalizationConfiguration;
+  server  cluster NetworkCommissioning;
+  server  cluster OperationalCredentials;
+  server  cluster SoftwareDiagnostics;
+  server  cluster ThreadNetworkDiagnostics;
+  server  cluster UserLabel;
+  server  cluster WiFiNetworkDiagnostics;
 }
 
 endpoint 1 {
-  instantiate cluster Descriptor;
-  instantiate cluster FixedLabel;
-  instantiate cluster LevelControl;
-  instantiate cluster OnOff;
-  instantiate cluster Switch;
+  server  cluster Descriptor;
+  server  cluster FixedLabel;
+  server  cluster LevelControl;
+  server  cluster OnOff;
+  server  cluster Switch;
 }
 
diff --git a/examples/door-lock-app/door-lock-common/door-lock-app.matter b/examples/door-lock-app/door-lock-common/door-lock-app.matter
@@ -1103,28 +1103,28 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 
 endpoint 0 {
-  instantiate cluster AdministratorCommissioning;
-  instantiate cluster Basic;
-  instantiate cluster Descriptor;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster EthernetNetworkDiagnostics;
-  instantiate cluster FixedLabel;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster GeneralDiagnostics;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OperationalCredentials;
-  instantiate cluster PowerSource;
-  instantiate cluster PowerSourceConfiguration;
-  instantiate cluster SoftwareDiagnostics;
-  instantiate cluster ThreadNetworkDiagnostics;
-  instantiate cluster UserLabel;
-  instantiate cluster WiFiNetworkDiagnostics;
+  server  cluster AdministratorCommissioning;
+  server  cluster Basic;
+  server  cluster Descriptor;
+  server  cluster DiagnosticLogs;
+  server  cluster EthernetNetworkDiagnostics;
+  server  cluster FixedLabel;
+  server  cluster GeneralCommissioning;
+  server  cluster GeneralDiagnostics;
+  server  cluster LocalizationConfiguration;
+  server  cluster NetworkCommissioning;
+  server  cluster OperationalCredentials;
+  server  cluster PowerSource;
+  server  cluster PowerSourceConfiguration;
+  server  cluster SoftwareDiagnostics;
+  server  cluster ThreadNetworkDiagnostics;
+  server  cluster UserLabel;
+  server  cluster WiFiNetworkDiagnostics;
 }
 
 endpoint 1 {
-  instantiate cluster Descriptor;
-  instantiate cluster DoorLock;
-  instantiate cluster PowerSource;
+  server  cluster Descriptor;
+  server  cluster DoorLock;
+  server  cluster PowerSource;
 }
 
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -1381,37 +1381,37 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 
 endpoint 0 {
-  instantiate cluster AdministratorCommissioning;
-  instantiate cluster Basic;
-  instantiate cluster Descriptor;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster EthernetNetworkDiagnostics;
-  instantiate cluster FixedLabel;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster GeneralDiagnostics;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OtaSoftwareUpdateProvider;
-  instantiate cluster OtaSoftwareUpdateRequestor;
-  instantiate cluster OperationalCredentials;
-  instantiate cluster SoftwareDiagnostics;
-  instantiate cluster Switch;
-  instantiate cluster ThreadNetworkDiagnostics;
-  instantiate cluster UserLabel;
-  instantiate cluster WiFiNetworkDiagnostics;
+  server  cluster AdministratorCommissioning;
+  server  cluster Basic;
+  server  cluster Descriptor;
+  server  cluster DiagnosticLogs;
+  server  cluster EthernetNetworkDiagnostics;
+  server  cluster FixedLabel;
+  server  cluster GeneralCommissioning;
+  server  cluster GeneralDiagnostics;
+  server  cluster LocalizationConfiguration;
+  server  cluster NetworkCommissioning;
+  binding cluster OtaSoftwareUpdateProvider;
+  server  cluster OtaSoftwareUpdateRequestor;
+  server  cluster OperationalCredentials;
+  server  cluster SoftwareDiagnostics;
+  server  cluster Switch;
+  server  cluster ThreadNetworkDiagnostics;
+  server  cluster UserLabel;
+  server  cluster WiFiNetworkDiagnostics;
 }
 
 endpoint 1 {
-  instantiate cluster ColorControl;
-  instantiate cluster Descriptor;
-  instantiate cluster Identify;
-  instantiate cluster LevelControl;
-  instantiate cluster OccupancySensing;
-  instantiate cluster OnOff;
+  server  cluster ColorControl;
+  server  cluster Descriptor;
+  server  cluster Identify;
+  server  cluster LevelControl;
+  server  cluster OccupancySensing;
+  server  cluster OnOff;
 }
 
 endpoint 2 {
-  instantiate cluster OnOff;
-  instantiate cluster OnOffSwitchConfiguration;
+  binding cluster OnOff;
+  server  cluster OnOffSwitchConfiguration;
 }
 
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
@@ -799,28 +799,28 @@ server cluster WiFiNetworkDiagnostics = 54 {
 
 
 endpoint 0 {
-  instantiate cluster AdministratorCommissioning;
-  instantiate cluster Basic;
-  instantiate cluster Descriptor;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster EthernetNetworkDiagnostics;
-  instantiate cluster FixedLabel;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster GeneralDiagnostics;
-  instantiate cluster LocalizationConfiguration;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OperationalCredentials;
-  instantiate cluster PowerSource;
-  instantiate cluster PowerSourceConfiguration;
-  instantiate cluster SoftwareDiagnostics;
-  instantiate cluster ThreadNetworkDiagnostics;
-  instantiate cluster UserLabel;
-  instantiate cluster WiFiNetworkDiagnostics;
+  server  cluster AdministratorCommissioning;
+  server  cluster Basic;
+  server  cluster Descriptor;
+  server  cluster DiagnosticLogs;
+  server  cluster EthernetNetworkDiagnostics;
+  server  cluster FixedLabel;
+  server  cluster GeneralCommissioning;
+  server  cluster GeneralDiagnostics;
+  server  cluster LocalizationConfiguration;
+  server  cluster NetworkCommissioning;
+  server  cluster OperationalCredentials;
+  server  cluster PowerSource;
+  server  cluster PowerSourceConfiguration;
+  server  cluster SoftwareDiagnostics;
+  server  cluster ThreadNetworkDiagnostics;
+  server  cluster UserLabel;
+  server  cluster WiFiNetworkDiagnostics;
 }
 
 endpoint 1 {
-  instantiate cluster Descriptor;
-  instantiate cluster OnOff;
-  instantiate cluster PowerSource;
+  server  cluster Descriptor;
+  server  cluster OnOff;
+  server  cluster PowerSource;
 }
 
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
@@ -312,10 +312,10 @@ server cluster OperationalCredentials = 62 {
 
 
 endpoint 0 {
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster DiagnosticLogs;
-  instantiate cluster GeneralCommissioning;
-  instantiate cluster NetworkCommissioning;
-  instantiate cluster OperationalCredentials;
+  binding cluster DiagnosticLogs;
+  server  cluster DiagnosticLogs;
+  server  cluster GeneralCommissioning;
+  server  cluster NetworkCommissioning;
+  server  cluster OperationalCredentials;
 }