Skip to content

Commit 3f2b1aa

Browse files
wqx6wqx6
authored
zap-template: remove provisional marks for the NIM clusters that were added in v1.4 SPEC (#37677)
1 parent fd800c2 commit 3f2b1aa

File tree

8 files changed

+54
-54
lines changed

8 files changed

+54
-54
lines changed

‎examples/network-manager-app/network-manager-common/network-manager-app.matter

+9-9
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ cluster GroupKeyManagement = 63 {
14621462
}
14631463

14641464
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
1465-
provisional cluster WiFiNetworkManagement = 1105 {
1465+
cluster WiFiNetworkManagement = 1105 {
14661466
revision 1;
14671467

14681468
readonly attribute nullable octet_string<32> ssid = 0;
@@ -1483,19 +1483,19 @@ provisional cluster WiFiNetworkManagement = 1105 {
14831483
}
14841484

14851485
/** Manage the Thread network of Thread Border Router */
1486-
provisional cluster ThreadBorderRouterManagement = 1106 {
1486+
cluster ThreadBorderRouterManagement = 1106 {
14871487
revision 1;
14881488

14891489
bitmap Feature : bitmap32 {
14901490
kPANChange = 0x1;
14911491
}
14921492

1493-
provisional readonly attribute char_string<63> borderRouterName = 0;
1494-
provisional readonly attribute octet_string<254> borderAgentID = 1;
1495-
provisional readonly attribute int16u threadVersion = 2;
1496-
provisional readonly attribute boolean interfaceEnabled = 3;
1497-
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
1498-
provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
1493+
readonly attribute char_string<63> borderRouterName = 0;
1494+
readonly attribute octet_string<254> borderAgentID = 1;
1495+
readonly attribute int16u threadVersion = 2;
1496+
readonly attribute boolean interfaceEnabled = 3;
1497+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
1498+
readonly attribute nullable int64u pendingDatasetTimestamp = 5;
14991499
readonly attribute command_id generatedCommandList[] = 65528;
15001500
readonly attribute command_id acceptedCommandList[] = 65529;
15011501
readonly attribute event_id eventList[] = 65530;
@@ -1527,7 +1527,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
15271527
}
15281528

15291529
/** Manages the names and credentials of Thread networks visible to the user. */
1530-
provisional cluster ThreadNetworkDirectory = 1107 {
1530+
cluster ThreadNetworkDirectory = 1107 {
15311531
revision 1;
15321532

15331533
struct ThreadNetworkStruct {

‎examples/placeholder/linux/apps/app1/config.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -6770,19 +6770,19 @@ cluster OccupancySensing = 1030 {
67706770
}
67716771

67726772
/** Manage the Thread network of Thread Border Router */
6773-
provisional cluster ThreadBorderRouterManagement = 1106 {
6773+
cluster ThreadBorderRouterManagement = 1106 {
67746774
revision 1;
67756775

67766776
bitmap Feature : bitmap32 {
67776777
kPANChange = 0x1;
67786778
}
67796779

6780-
provisional readonly attribute char_string<63> borderRouterName = 0;
6781-
provisional readonly attribute octet_string<254> borderAgentID = 1;
6782-
provisional readonly attribute int16u threadVersion = 2;
6783-
provisional readonly attribute boolean interfaceEnabled = 3;
6784-
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
6785-
provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
6780+
readonly attribute char_string<63> borderRouterName = 0;
6781+
readonly attribute octet_string<254> borderAgentID = 1;
6782+
readonly attribute int16u threadVersion = 2;
6783+
readonly attribute boolean interfaceEnabled = 3;
6784+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
6785+
readonly attribute nullable int64u pendingDatasetTimestamp = 5;
67866786
readonly attribute command_id generatedCommandList[] = 65528;
67876787
readonly attribute command_id acceptedCommandList[] = 65529;
67886788
readonly attribute event_id eventList[] = 65530;

‎examples/thermostat/nxp/zap/thermostat_matter_br.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -2100,19 +2100,19 @@ cluster Thermostat = 513 {
21002100
}
21012101

21022102
/** Manage the Thread network of Thread Border Router */
2103-
provisional cluster ThreadBorderRouterManagement = 1106 {
2103+
cluster ThreadBorderRouterManagement = 1106 {
21042104
revision 1;
21052105

21062106
bitmap Feature : bitmap32 {
21072107
kPANChange = 0x1;
21082108
}
21092109

2110-
provisional readonly attribute char_string<63> borderRouterName = 0;
2111-
provisional readonly attribute octet_string<254> borderAgentID = 1;
2112-
provisional readonly attribute int16u threadVersion = 2;
2113-
provisional readonly attribute boolean interfaceEnabled = 3;
2114-
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
2115-
provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
2110+
readonly attribute char_string<63> borderRouterName = 0;
2111+
readonly attribute octet_string<254> borderAgentID = 1;
2112+
readonly attribute int16u threadVersion = 2;
2113+
readonly attribute boolean interfaceEnabled = 3;
2114+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
2115+
readonly attribute nullable int64u pendingDatasetTimestamp = 5;
21162116
readonly attribute command_id generatedCommandList[] = 65528;
21172117
readonly attribute command_id acceptedCommandList[] = 65529;
21182118
readonly attribute event_id eventList[] = 65530;

‎examples/thread-br-app/thread-br-common/thread-br-app.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1380,19 +1380,19 @@ cluster UserLabel = 65 {
13801380
}
13811381

13821382
/** Manage the Thread network of Thread Border Router */
1383-
provisional cluster ThreadBorderRouterManagement = 1106 {
1383+
cluster ThreadBorderRouterManagement = 1106 {
13841384
revision 1;
13851385

13861386
bitmap Feature : bitmap32 {
13871387
kPANChange = 0x1;
13881388
}
13891389

1390-
provisional readonly attribute char_string<63> borderRouterName = 0;
1391-
provisional readonly attribute octet_string<254> borderAgentID = 1;
1392-
provisional readonly attribute int16u threadVersion = 2;
1393-
provisional readonly attribute boolean interfaceEnabled = 3;
1394-
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
1395-
provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
1390+
readonly attribute char_string<63> borderRouterName = 0;
1391+
readonly attribute octet_string<254> borderAgentID = 1;
1392+
readonly attribute int16u threadVersion = 2;
1393+
readonly attribute boolean interfaceEnabled = 3;
1394+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
1395+
readonly attribute nullable int64u pendingDatasetTimestamp = 5;
13961396
readonly attribute command_id generatedCommandList[] = 65528;
13971397
readonly attribute command_id acceptedCommandList[] = 65529;
13981398
readonly attribute event_id eventList[] = 65530;

‎src/app/zap-templates/zcl/data-model/chip/thread-border-router-management-cluster.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
<field name="PANChange" mask="0x1"/>
2323
</bitmap>
2424

25-
<cluster apiMaturity="provisional">
25+
<cluster>
2626
<domain>Network Infrastructure</domain>
2727
<name>Thread Border Router Management</name>
2828
<code>0x0452</code>
@@ -33,57 +33,57 @@ limitations under the License.
3333

3434
<globalAttribute code="0xFFFD" side="either" value="1"/>
3535

36-
<attribute side="server" code="0x0000" name="BorderRouterName" apiMaturity="provisional" define="BORDER_ROUTER_NAME" type="char_string" length="63">
36+
<attribute side="server" code="0x0000" name="BorderRouterName" define="BORDER_ROUTER_NAME" type="char_string" length="63">
3737
<mandatoryConform/>
3838
</attribute>
3939

40-
<attribute side="server" code="0x0001" name="BorderAgentID" apiMaturity="provisional" define="BORDER_AGENT_ID" type="octet_string">
40+
<attribute side="server" code="0x0001" name="BorderAgentID" define="BORDER_AGENT_ID" type="octet_string">
4141
<mandatoryConform/>
4242
</attribute>
4343

44-
<attribute side="server" code="0x0002" name="ThreadVersion" apiMaturity="provisional" define="THREAD_VERSION" type="int16u">
44+
<attribute side="server" code="0x0002" name="ThreadVersion" define="THREAD_VERSION" type="int16u">
4545
<mandatoryConform/>
4646
</attribute>
4747

48-
<attribute side="server" code="0x0003" name="InterfaceEnabled" apiMaturity="provisional" define="INTERFACE_ENABLED" type="boolean" default="0">
48+
<attribute side="server" code="0x0003" name="InterfaceEnabled" define="INTERFACE_ENABLED" type="boolean" default="0">
4949
<mandatoryConform/>
5050
</attribute>
5151

52-
<attribute side="server" code="0x0004" name="ActiveDatasetTimestamp" apiMaturity="provisional" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">
52+
<attribute side="server" code="0x0004" name="ActiveDatasetTimestamp" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">
5353
<mandatoryConform/>
5454
</attribute>
5555

56-
<attribute side="server" code="0x0005" name="PendingDatasetTimestamp" apiMaturity="provisional" define="PENDING_DATASET_TIMESTAMP" type="int64u" isNullable="true">
56+
<attribute side="server" code="0x0005" name="PendingDatasetTimestamp" define="PENDING_DATASET_TIMESTAMP" type="int64u" isNullable="true">
5757
<mandatoryConform/>
5858
</attribute>
5959

60-
<command source="client" code="0x00" apiMaturity="provisional" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
60+
<command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
6161
<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>
6262
<access op="invoke" privilege="manage"/>
6363
<mandatoryConform/>
6464
</command>
6565

66-
<command source="client" code="0x01" apiMaturity="provisional" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
66+
<command source="client" code="0x01" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
6767
<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>
6868
<access op="invoke" privilege="manage"/>
6969
<mandatoryConform/>
7070
</command>
7171

72-
<command source="server" code="0x02" apiMaturity="provisional" name="DatasetResponse" optional="false">
72+
<command source="server" code="0x02" name="DatasetResponse" optional="false">
7373
<description>Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands.</description>
7474
<arg name="Dataset" type="octet_string" length="254"/>
7575
<mandatoryConform/>
7676
</command>
7777

78-
<command source="client" code="0x03" apiMaturity="provisional" name="SetActiveDatasetRequest" optional="false">
78+
<command source="client" code="0x03" name="SetActiveDatasetRequest" optional="false">
7979
<description>Command to set or update the active Dataset of the Thread network to which the Border Router is connected.</description>
8080
<arg name="ActiveDataset" type="octet_string" length="254"/>
8181
<arg name="Breadcrumb" type="int64u" optional="true"/>
8282
<access op="invoke" privilege="manage"/>
8383
<mandatoryConform/>
8484
</command>
8585

86-
<command source="client" code="0x04" apiMaturity="provisional" name="SetPendingDatasetRequest" optional="true">
86+
<command source="client" code="0x04" name="SetPendingDatasetRequest" optional="true">
8787
<description>Command set or update the pending Dataset of the Thread network to which the Border Router is connected.</description>
8888
<arg name="PendingDataset" type="octet_string" length="254"/>
8989
<access op="invoke" privilege="manage"/>

‎src/app/zap-templates/zcl/data-model/chip/thread-network-directory-cluster.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ limitations under the License.
1717
<configurator>
1818
<domain name="CHIP"/>
1919

20-
<struct name="ThreadNetworkStruct" apiMaturity="provisional">
20+
<struct name="ThreadNetworkStruct">
2121
<cluster code="0x0453"/>
2222
<item name="ExtendedPanID" type="octet_string" length="8"/>
2323
<item name="NetworkName" type="char_string" length="16"/>
2424
<item name="Channel" type="int16u"/>
2525
<item name="ActiveTimestamp" type="int64u"/>
2626
</struct>
2727

28-
<cluster apiMaturity="provisional">
28+
<cluster>
2929
<domain>Network Infrastructure</domain>
3030
<name>Thread Network Directory</name>
3131
<code>0x0453</code>

‎src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
<configurator>
1818
<domain name="CHIP"/>
1919

20-
<cluster apiMaturity="provisional">
20+
<cluster>
2121
<domain>Network Infrastructure</domain>
2222
<name>Wi-Fi Network Management</name>
2323
<code>0x0451</code>

‎src/controller/data_model/controller-clusters.matter

+9-9
Original file line numberDiff line numberDiff line change
@@ -8426,7 +8426,7 @@ cluster RadonConcentrationMeasurement = 1071 {
84268426
}
84278427

84288428
/** Functionality to retrieve operational information about a managed Wi-Fi network. */
8429-
provisional cluster WiFiNetworkManagement = 1105 {
8429+
cluster WiFiNetworkManagement = 1105 {
84308430
revision 1;
84318431

84328432
readonly attribute nullable octet_string<32> ssid = 0;
@@ -8447,19 +8447,19 @@ provisional cluster WiFiNetworkManagement = 1105 {
84478447
}
84488448

84498449
/** Manage the Thread network of Thread Border Router */
8450-
provisional cluster ThreadBorderRouterManagement = 1106 {
8450+
cluster ThreadBorderRouterManagement = 1106 {
84518451
revision 1;
84528452

84538453
bitmap Feature : bitmap32 {
84548454
kPANChange = 0x1;
84558455
}
84568456

8457-
provisional readonly attribute char_string<63> borderRouterName = 0;
8458-
provisional readonly attribute octet_string<254> borderAgentID = 1;
8459-
provisional readonly attribute int16u threadVersion = 2;
8460-
provisional readonly attribute boolean interfaceEnabled = 3;
8461-
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
8462-
provisional readonly attribute nullable int64u pendingDatasetTimestamp = 5;
8457+
readonly attribute char_string<63> borderRouterName = 0;
8458+
readonly attribute octet_string<254> borderAgentID = 1;
8459+
readonly attribute int16u threadVersion = 2;
8460+
readonly attribute boolean interfaceEnabled = 3;
8461+
readonly attribute nullable int64u activeDatasetTimestamp = 4;
8462+
readonly attribute nullable int64u pendingDatasetTimestamp = 5;
84638463
readonly attribute command_id generatedCommandList[] = 65528;
84648464
readonly attribute command_id acceptedCommandList[] = 65529;
84658465
readonly attribute event_id eventList[] = 65530;
@@ -8491,7 +8491,7 @@ provisional cluster ThreadBorderRouterManagement = 1106 {
84918491
}
84928492

84938493
/** Manages the names and credentials of Thread networks visible to the user. */
8494-
provisional cluster ThreadNetworkDirectory = 1107 {
8494+
cluster ThreadNetworkDirectory = 1107 {
84958495
revision 1;
84968496

84978497
struct ThreadNetworkStruct {

0 commit comments

Comments
 (0)