From df5023a56c7fb147c42ef9a6b9541f0109ae166e Mon Sep 17 00:00:00 2001
From: Wang Qixiang <43193572+wqx6@users.noreply.github.com>
Date: Tue, 25 Feb 2025 07:05:09 +0800
Subject: [PATCH] zap-template: remove provisional marks for the NIM clusters
that were added in v1.4 SPEC (#37677)
---
.../network-manager-app.matter | 18 +++++++-------
.../placeholder/linux/apps/app1/config.matter | 14 +++++------
.../nxp/zap/thermostat_matter_br.matter | 14 +++++------
.../thread-br-common/thread-br-app.matter | 14 +++++------
...hread-border-router-management-cluster.xml | 24 +++++++++----------
.../chip/thread-network-directory-cluster.xml | 4 ++--
.../chip/wifi-network-management-cluster.xml | 2 +-
.../data_model/controller-clusters.matter | 18 +++++++-------
8 files changed, 54 insertions(+), 54 deletions(-)
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 1d7e8c0b9f0d58..efa22f98888133 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
@@ -1439,7 +1439,7 @@ cluster GroupKeyManagement = 63 {
}
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
-provisional cluster WiFiNetworkManagement = 1105 {
+cluster WiFiNetworkManagement = 1105 {
revision 1;
readonly attribute nullable octet_string<32> ssid = 0;
@@ -1460,19 +1460,19 @@ provisional cluster WiFiNetworkManagement = 1105 {
}
/** Manage the Thread network of Thread Border Router */
-provisional cluster ThreadBorderRouterManagement = 1106 {
+cluster ThreadBorderRouterManagement = 1106 {
revision 1;
bitmap Feature : bitmap32 {
kPANChange = 0x1;
}
- provisional readonly attribute char_string<63> borderRouterName = 0;
- provisional readonly attribute octet_string<254> borderAgentID = 1;
- provisional readonly attribute int16u threadVersion = 2;
- provisional readonly attribute boolean interfaceEnabled = 3;
- provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
- provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
+ readonly attribute char_string<63> borderRouterName = 0;
+ readonly attribute octet_string<254> borderAgentID = 1;
+ readonly attribute int16u threadVersion = 2;
+ readonly attribute boolean interfaceEnabled = 3;
+ readonly attribute nullable int64u activeDatasetTimestamp = 4;
+ readonly attribute nullable int64u pendingDatasetTimestamp = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1504,7 +1504,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
}
/** Manages the names and credentials of Thread networks visible to the user. */
-provisional cluster ThreadNetworkDirectory = 1107 {
+cluster ThreadNetworkDirectory = 1107 {
revision 1;
struct ThreadNetworkStruct {
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 2d69fa14a79485..40610feee35e8a 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -6724,19 +6724,19 @@ cluster OccupancySensing = 1030 {
}
/** Manage the Thread network of Thread Border Router */
-provisional cluster ThreadBorderRouterManagement = 1106 {
+cluster ThreadBorderRouterManagement = 1106 {
revision 1;
bitmap Feature : bitmap32 {
kPANChange = 0x1;
}
- provisional readonly attribute char_string<63> borderRouterName = 0;
- provisional readonly attribute octet_string<254> borderAgentID = 1;
- provisional readonly attribute int16u threadVersion = 2;
- provisional readonly attribute boolean interfaceEnabled = 3;
- provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
- provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
+ readonly attribute char_string<63> borderRouterName = 0;
+ readonly attribute octet_string<254> borderAgentID = 1;
+ readonly attribute int16u threadVersion = 2;
+ readonly attribute boolean interfaceEnabled = 3;
+ readonly attribute nullable int64u activeDatasetTimestamp = 4;
+ readonly attribute nullable int64u pendingDatasetTimestamp = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_br.matter b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
index 078c1781eabe04..16b85eb285093c 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_br.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_br.matter
@@ -2204,19 +2204,19 @@ cluster Thermostat = 513 {
}
/** Manage the Thread network of Thread Border Router */
-provisional cluster ThreadBorderRouterManagement = 1106 {
+cluster ThreadBorderRouterManagement = 1106 {
revision 1;
bitmap Feature : bitmap32 {
kPANChange = 0x1;
}
- provisional readonly attribute char_string<63> borderRouterName = 0;
- provisional readonly attribute octet_string<254> borderAgentID = 1;
- provisional readonly attribute int16u threadVersion = 2;
- provisional readonly attribute boolean interfaceEnabled = 3;
- provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
- provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
+ readonly attribute char_string<63> borderRouterName = 0;
+ readonly attribute octet_string<254> borderAgentID = 1;
+ readonly attribute int16u threadVersion = 2;
+ readonly attribute boolean interfaceEnabled = 3;
+ readonly attribute nullable int64u activeDatasetTimestamp = 4;
+ readonly attribute nullable int64u pendingDatasetTimestamp = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
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 cb2e924d55f16b..4bd5754ebff303 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
@@ -1357,19 +1357,19 @@ cluster UserLabel = 65 {
}
/** Manage the Thread network of Thread Border Router */
-provisional cluster ThreadBorderRouterManagement = 1106 {
+cluster ThreadBorderRouterManagement = 1106 {
revision 1;
bitmap Feature : bitmap32 {
kPANChange = 0x1;
}
- provisional readonly attribute char_string<63> borderRouterName = 0;
- provisional readonly attribute octet_string<254> borderAgentID = 1;
- provisional readonly attribute int16u threadVersion = 2;
- provisional readonly attribute boolean interfaceEnabled = 3;
- provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
- provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
+ readonly attribute char_string<63> borderRouterName = 0;
+ readonly attribute octet_string<254> borderAgentID = 1;
+ readonly attribute int16u threadVersion = 2;
+ readonly attribute boolean interfaceEnabled = 3;
+ readonly attribute nullable int64u activeDatasetTimestamp = 4;
+ readonly attribute nullable int64u pendingDatasetTimestamp = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml
index d05ce70c34aca3..b09b8c59fd7832 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml
@@ -22,7 +22,7 @@ limitations under the License.
<field name="PANChange" mask="0x1"/>
</bitmap>
- <cluster apiMaturity="provisional">
+ <cluster>
<domain>Network Infrastructure</domain>
<name>Thread Border Router Management</name>
<code>0x0452</code>
@@ -33,41 +33,41 @@ limitations under the License.
<globalAttribute code="0xFFFD" side="either" value="1"/>
- <attribute side="server" code="0x0000" apiMaturity="provisional" define="BORDER_ROUTER_NAME" type="char_string" length="63">BorderRouterName</attribute>
+ <attribute side="server" code="0x0000" define="BORDER_ROUTER_NAME" type="char_string" length="63">BorderRouterName</attribute>
- <attribute side="server" code="0x0001" apiMaturity="provisional" define="BORDER_AGENT_ID" type="octet_string">BorderAgentID</attribute>
+ <attribute side="server" code="0x0001" define="BORDER_AGENT_ID" type="octet_string">BorderAgentID</attribute>
- <attribute side="server" code="0x0002" apiMaturity="provisional" define="THREAD_VERSION" type="int16u">ThreadVersion</attribute>
+ <attribute side="server" code="0x0002" define="THREAD_VERSION" type="int16u">ThreadVersion</attribute>
- <attribute side="server" code="0x0003" apiMaturity="provisional" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
+ <attribute side="server" code="0x0003" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
- <attribute side="server" code="0x0004" apiMaturity="provisional" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
+ <attribute side="server" code="0x0004" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
- <attribute side="server" code="0x0005" apiMaturity="provisional" define="PENDING_DATASET_TIMESTAMP" type="int64u" isNullable="true">PendingDatasetTimestamp</attribute>
+ <attribute side="server" code="0x0005" define="PENDING_DATASET_TIMESTAMP" type="int64u" isNullable="true">PendingDatasetTimestamp</attribute>
- <command source="client" code="0x00" apiMaturity="provisional" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
+ <command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
<description>Command to request the active operational dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session</description>
<access op="invoke" privilege="manage"/>
</command>
- <command source="client" code="0x01" apiMaturity="provisional" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
+ <command source="client" code="0x01" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
<description>Command to request the pending dataset of the Thread network to which the border router is connected. This command must be sent over a valid CASE session</description>
<access op="invoke" privilege="manage"/>
</command>
- <command source="server" code="0x02" apiMaturity="provisional" name="DatasetResponse" optional="false">
+ <command source="server" code="0x02" name="DatasetResponse" optional="false">
<description>Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands.</description>
<arg name="Dataset" type="octet_string" length="254"/>
</command>
- <command source="client" code="0x03" apiMaturity="provisional" name="SetActiveDatasetRequest" optional="false">
+ <command source="client" code="0x03" name="SetActiveDatasetRequest" optional="false">
<description>Command to set or update the active Dataset of the Thread network to which the Border Router is connected.</description>
<arg name="ActiveDataset" type="octet_string" length="254"/>
<arg name="Breadcrumb" type="int64u" optional="true"/>
<access op="invoke" privilege="manage"/>
</command>
- <command source="client" code="0x04" apiMaturity="provisional" name="SetPendingDatasetRequest" optional="true">
+ <command source="client" code="0x04" name="SetPendingDatasetRequest" optional="true">
<description>Command set or update the pending Dataset of the Thread network to which the Border Router is connected.</description>
<arg name="PendingDataset" type="octet_string" length="254"/>
<access op="invoke" privilege="manage"/>
diff --git a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml
index 3a6445b15bbad3..cadc0f6425772d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml
@@ -17,7 +17,7 @@ limitations under the License.
<configurator>
<domain name="CHIP"/>
- <struct name="ThreadNetworkStruct" apiMaturity="provisional">
+ <struct name="ThreadNetworkStruct">
<cluster code="0x0453"/>
<item name="ExtendedPanID" type="octet_string" length="8"/>
<item name="NetworkName" type="char_string" length="16"/>
@@ -25,7 +25,7 @@ limitations under the License.
<item name="ActiveTimestamp" type="int64u"/>
</struct>
- <cluster apiMaturity="provisional">
+ <cluster>
<domain>Network Infrastructure</domain>
<name>Thread Network Directory</name>
<code>0x0453</code>
diff --git a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml
index 8c8b4d40c3abdd..14a0ef0e2ec94e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml
@@ -17,7 +17,7 @@ limitations under the License.
<configurator>
<domain name="CHIP"/>
- <cluster apiMaturity="provisional">
+ <cluster>
<domain>Network Infrastructure</domain>
<name>Wi-Fi Network Management</name>
<code>0x0451</code>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index ca2a0f9e0dc27a..195bafbcd1aba4 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -8270,7 +8270,7 @@ cluster RadonConcentrationMeasurement = 1071 {
}
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
-provisional cluster WiFiNetworkManagement = 1105 {
+cluster WiFiNetworkManagement = 1105 {
revision 1;
readonly attribute nullable octet_string<32> ssid = 0;
@@ -8291,19 +8291,19 @@ provisional cluster WiFiNetworkManagement = 1105 {
}
/** Manage the Thread network of Thread Border Router */
-provisional cluster ThreadBorderRouterManagement = 1106 {
+cluster ThreadBorderRouterManagement = 1106 {
revision 1;
bitmap Feature : bitmap32 {
kPANChange = 0x1;
}
- provisional readonly attribute char_string<63> borderRouterName = 0;
- provisional readonly attribute octet_string<254> borderAgentID = 1;
- provisional readonly attribute int16u threadVersion = 2;
- provisional readonly attribute boolean interfaceEnabled = 3;
- provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
- provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
+ readonly attribute char_string<63> borderRouterName = 0;
+ readonly attribute octet_string<254> borderAgentID = 1;
+ readonly attribute int16u threadVersion = 2;
+ readonly attribute boolean interfaceEnabled = 3;
+ readonly attribute nullable int64u activeDatasetTimestamp = 4;
+ readonly attribute nullable int64u pendingDatasetTimestamp = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -8335,7 +8335,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
}
/** Manages the names and credentials of Thread networks visible to the user. */
-provisional cluster ThreadNetworkDirectory = 1107 {
+cluster ThreadNetworkDirectory = 1107 {
revision 1;
struct ThreadNetworkStruct {