Skip to content

Commit 46b4d95

Browse files
Fix numbering and maturity level of TBR Management XML
- Address spec PRs #9305/#9401 re: removing gaps in attribute and command numbering. - Introduce maturity level to everything.
1 parent fbb44ea commit 46b4d95

File tree

12 files changed

+55
-56
lines changed

12 files changed

+55
-56
lines changed

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

+11-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>
25+
<cluster apiMaturity="provisional">
2626
<domain>HRAP</domain>
2727
<name>Thread Border Router Management</name>
2828
<code>0x0452</code>
@@ -33,40 +33,39 @@ limitations under the License.
3333

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

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

38-
<attribute side="server" code="0x0001" define="BORDER_AGENT_ID" type="octet_string">BorderAgentID</attribute>
38+
<attribute side="server" code="0x0001" apiMaturity="provisional" define="BORDER_AGENT_ID" type="octet_string">BorderAgentID</attribute>
3939

40-
<attribute side="server" code="0x0002" define="THREAD_VERSION" type="int16u">ThreadVersion</attribute>
40+
<attribute side="server" code="0x0002" apiMaturity="provisional" define="THREAD_VERSION" type="int16u">ThreadVersion</attribute>
4141

42-
<attribute side="server" code="0x0003" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
42+
<attribute side="server" code="0x0003" apiMaturity="provisional" define="INTERFACE_ENABLED" type="boolean" default="0">InterfaceEnabled</attribute>
4343

44-
<attribute side="server" code="0x0005" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
44+
<attribute side="server" code="0x0004" apiMaturity="provisional" define="ACTIVE_DATASET_TIMESTAMP" type="int64u" isNullable="true">ActiveDatasetTimestamp</attribute>
4545

46-
47-
<command source="client" code="0x00" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
46+
<command source="client" code="0x00" apiMaturity="provisional" name="GetActiveDatasetRequest" response="DatasetResponse" optional="false">
4847
<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>
4948
<access op="invoke" privilege="manage"/>
5049
</command>
5150

52-
<command source="client" code="0x01" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
51+
<command source="client" code="0x01" apiMaturity="provisional" name="GetPendingDatasetRequest" response="DatasetResponse" optional="false">
5352
<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>
5453
<access op="invoke" privilege="manage"/>
5554
</command>
5655

57-
<command source="server" code="0x03" name="DatasetResponse" optional="false">
56+
<command source="server" code="0x02" apiMaturity="provisional" name="DatasetResponse" optional="false">
5857
<description>Generated response to GetActiveDatasetRequest or GetPendingDatasetRequest commands.</description>
5958
<arg name="Dataset" type="octet_string" length="254"/>
6059
</command>
6160

62-
<command source="client" code="0x04" name="SetActiveDatasetRequest" optional="false">
61+
<command source="client" code="0x03" apiMaturity="provisional" name="SetActiveDatasetRequest" optional="false">
6362
<description>Command to set or update the active Dataset of the Thread network to which the Border Router is connected.</description>
6463
<arg name="ActiveDataset" type="octet_string" length="254"/>
6564
<arg name="Breadcrumb" type="int64u" optional="true"/>
6665
<access op="invoke" privilege="manage"/>
6766
</command>
6867

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

src/controller/data_model/controller-clusters.matter

+9-9
Original file line numberDiff line numberDiff line change
@@ -8010,26 +8010,26 @@ cluster WiFiNetworkManagement = 1105 {
80108010
}
80118011

80128012
/** Manage the Thread network of Thread Border Router */
8013-
cluster ThreadBorderRouterManagement = 1106 {
8013+
provisional cluster ThreadBorderRouterManagement = 1106 {
80148014
revision 1;
80158015

80168016
bitmap Feature : bitmap32 {
80178017
kPANChange = 0x1;
80188018
}
80198019

8020-
readonly attribute char_string<63> borderRouterName = 0;
8021-
readonly attribute octet_string<254> borderAgentID = 1;
8022-
readonly attribute int16u threadVersion = 2;
8023-
readonly attribute boolean interfaceEnabled = 3;
8024-
readonly attribute nullable int64u activeDatasetTimestamp = 5;
8020+
provisional readonly attribute char_string<63> borderRouterName = 0;
8021+
provisional readonly attribute octet_string<254> borderAgentID = 1;
8022+
provisional readonly attribute int16u threadVersion = 2;
8023+
provisional readonly attribute boolean interfaceEnabled = 3;
8024+
provisional readonly attribute nullable int64u activeDatasetTimestamp = 4;
80258025
readonly attribute command_id generatedCommandList[] = 65528;
80268026
readonly attribute command_id acceptedCommandList[] = 65529;
80278027
readonly attribute event_id eventList[] = 65530;
80288028
readonly attribute attrib_id attributeList[] = 65531;
80298029
readonly attribute bitmap32 featureMap = 65532;
80308030
readonly attribute int16u clusterRevision = 65533;
80318031

8032-
response struct DatasetResponse = 3 {
8032+
response struct DatasetResponse = 2 {
80338033
octet_string<254> dataset = 0;
80348034
}
80358035

@@ -8047,9 +8047,9 @@ cluster ThreadBorderRouterManagement = 1106 {
80478047
/** 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 */
80488048
command access(invoke: manage) GetPendingDatasetRequest(): DatasetResponse = 1;
80498049
/** Command to set or update the active Dataset of the Thread network to which the Border Router is connected. */
8050-
command access(invoke: manage) SetActiveDatasetRequest(SetActiveDatasetRequestRequest): DefaultSuccess = 4;
8050+
command access(invoke: manage) SetActiveDatasetRequest(SetActiveDatasetRequestRequest): DefaultSuccess = 3;
80518051
/** Command set or update the pending Dataset of the Thread network to which the Border Router is connected. */
8052-
command access(invoke: manage) SetPendingDatasetRequest(SetPendingDatasetRequestRequest): DefaultSuccess = 5;
8052+
command access(invoke: manage) SetPendingDatasetRequest(SetPendingDatasetRequestRequest): DefaultSuccess = 4;
80538053
}
80548054

80558055
/** Manages the names and credentials of Thread networks visible to the user. */

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -53618,7 +53618,7 @@ public static class ThreadBorderRouterManagementCluster extends BaseChipCluster
5361853618
private static final long BORDER_AGENT_I_D_ATTRIBUTE_ID = 1L;
5361953619
private static final long THREAD_VERSION_ATTRIBUTE_ID = 2L;
5362053620
private static final long INTERFACE_ENABLED_ATTRIBUTE_ID = 3L;
53621-
private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 5L;
53621+
private static final long ACTIVE_DATASET_TIMESTAMP_ATTRIBUTE_ID = 4L;
5362253622
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
5362353623
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
5362453624
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
@@ -53693,7 +53693,7 @@ public void setActiveDatasetRequest(DefaultClusterCallback callback, byte[] acti
5369353693
}
5369453694

5369553695
public void setActiveDatasetRequest(DefaultClusterCallback callback, byte[] activeDataset, Optional<Long> breadcrumb, int timedInvokeTimeoutMs) {
53696-
final long commandId = 4L;
53696+
final long commandId = 3L;
5369753697

5369853698
ArrayList<StructElement> elements = new ArrayList<>();
5369953699
final long activeDatasetFieldID = 0L;
@@ -53717,7 +53717,7 @@ public void setPendingDatasetRequest(DefaultClusterCallback callback, byte[] pen
5371753717
}
5371853718

5371953719
public void setPendingDatasetRequest(DefaultClusterCallback callback, byte[] pendingDataset, int timedInvokeTimeoutMs) {
53720-
final long commandId = 5L;
53720+
final long commandId = 4L;
5372153721

5372253722
ArrayList<StructElement> elements = new ArrayList<>();
5372353723
final long pendingDatasetFieldID = 0L;

src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14565,7 +14565,7 @@ public enum Attribute {
1456514565
BorderAgentID(1L),
1456614566
ThreadVersion(2L),
1456714567
InterfaceEnabled(3L),
14568-
ActiveDatasetTimestamp(5L),
14568+
ActiveDatasetTimestamp(4L),
1456914569
GeneratedCommandList(65528L),
1457014570
AcceptedCommandList(65529L),
1457114571
EventList(65530L),
@@ -14614,8 +14614,8 @@ public static Event value(long id) throws NoSuchFieldError {
1461414614
public enum Command {
1461514615
GetActiveDatasetRequest(0L),
1461614616
GetPendingDatasetRequest(1L),
14617-
SetActiveDatasetRequest(4L),
14618-
SetPendingDatasetRequest(5L),;
14617+
SetActiveDatasetRequest(3L),
14618+
SetPendingDatasetRequest(4L),;
1461914619
private final long id;
1462014620
Command(long id) {
1462114621
this.id = id;

src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadBorderRouterManagementCluster.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class ThreadBorderRouterManagementCluster(
185185
breadcrumb: ULong?,
186186
timedInvokeTimeout: Duration? = null,
187187
) {
188-
val commandId: UInt = 4u
188+
val commandId: UInt = 3u
189189

190190
val tlvWriter = TlvWriter()
191191
tlvWriter.startStructure(AnonymousTag)
@@ -212,7 +212,7 @@ class ThreadBorderRouterManagementCluster(
212212
pendingDataset: ByteArray,
213213
timedInvokeTimeout: Duration? = null,
214214
) {
215-
val commandId: UInt = 5u
215+
val commandId: UInt = 4u
216216

217217
val tlvWriter = TlvWriter()
218218
tlvWriter.startStructure(AnonymousTag)
@@ -561,7 +561,7 @@ class ThreadBorderRouterManagementCluster(
561561
}
562562

563563
suspend fun readActiveDatasetTimestampAttribute(): ActiveDatasetTimestampAttribute {
564-
val ATTRIBUTE_ID: UInt = 5u
564+
val ATTRIBUTE_ID: UInt = 4u
565565

566566
val attributePath =
567567
AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
@@ -601,7 +601,7 @@ class ThreadBorderRouterManagementCluster(
601601
minInterval: Int,
602602
maxInterval: Int,
603603
): Flow<ActiveDatasetTimestampAttributeSubscriptionState> {
604-
val ATTRIBUTE_ID: UInt = 5u
604+
val ATTRIBUTE_ID: UInt = 4u
605605
val attributePaths =
606606
listOf(
607607
AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)

src/controller/python/chip/clusters/CHIPClusters.py

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controller/python/chip/clusters/Objects.py

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/app-common/zap-generated/ids/Commands.h

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/chip-tool/zap-generated/cluster/Commands.h

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)