Skip to content

Commit 61c12ba

Browse files
chirag-silabschirag-silabs
committed
[SL-ONLY] Update silabs examples zap generation
1 parent 3c1ec4b commit 61c12ba

File tree

12 files changed

+180
-736
lines changed

12 files changed

+180
-736
lines changed

‎examples/fan-control-app/silabs/data_model/fan-control-thread-app.matter

+18-18
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@ cluster AdministratorCommissioning = 60 {
14961496

14971497
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
14981498
cluster OperationalCredentials = 62 {
1499-
revision 1; // NOTE: Default/not specifically set
1499+
revision 2;
15001500

15011501
enum CertificateChainTypeEnum : enum8 {
15021502
kDACCertificate = 1;
@@ -1522,14 +1522,14 @@ cluster OperationalCredentials = 62 {
15221522
fabric_id fabricID = 3;
15231523
node_id nodeID = 4;
15241524
char_string<32> label = 5;
1525-
optional octet_string<85> vidVerificationStatement = 6;
1525+
optional octet_string<85> VIDVerificationStatement = 6;
15261526
fabric_idx fabricIndex = 254;
15271527
}
15281528

15291529
fabric_scoped struct NOCStruct {
1530-
octet_string noc = 1;
1531-
nullable octet_string icac = 2;
1532-
optional octet_string vvsc = 3;
1530+
octet_string<400> noc = 1;
1531+
nullable octet_string<400> icac = 2;
1532+
optional octet_string<400> vvsc = 3;
15331533
fabric_idx fabricIndex = 254;
15341534
}
15351535

@@ -1551,7 +1551,7 @@ cluster OperationalCredentials = 62 {
15511551
}
15521552

15531553
response struct AttestationResponse = 1 {
1554-
octet_string<900> attestationElements = 0;
1554+
octet_string attestationElements = 0;
15551555
octet_string<64> attestationSignature = 1;
15561556
}
15571557

@@ -1570,7 +1570,7 @@ cluster OperationalCredentials = 62 {
15701570

15711571
response struct CSRResponse = 5 {
15721572
octet_string NOCSRElements = 0;
1573-
octet_string attestationSignature = 1;
1573+
octet_string<64> attestationSignature = 1;
15741574
}
15751575

15761576
request struct AddNOCRequest {
@@ -1582,8 +1582,8 @@ cluster OperationalCredentials = 62 {
15821582
}
15831583

15841584
request struct UpdateNOCRequest {
1585-
octet_string NOCValue = 0;
1586-
optional octet_string ICACValue = 1;
1585+
octet_string<400> NOCValue = 0;
1586+
optional octet_string<400> ICACValue = 1;
15871587
}
15881588

15891589
response struct NOCResponse = 8 {
@@ -1601,21 +1601,21 @@ cluster OperationalCredentials = 62 {
16011601
}
16021602

16031603
request struct AddTrustedRootCertificateRequest {
1604-
octet_string rootCACertificate = 0;
1604+
octet_string<400> rootCACertificate = 0;
16051605
}
16061606

1607-
request struct SetVidVerificationStatementRequest {
1607+
request struct SetVIDVerificationStatementRequest {
16081608
optional vendor_id vendorID = 0;
1609-
optional octet_string vidVerificationStatement = 1;
1610-
optional octet_string vvsc = 2;
1609+
optional octet_string<85> VIDVerificationStatement = 1;
1610+
optional octet_string<400> vvsc = 2;
16111611
}
16121612

1613-
request struct SignVidVerificationRequestRequest {
1613+
request struct SignVIDVerificationRequestRequest {
16141614
fabric_idx fabricIndex = 0;
16151615
octet_string<32> clientChallenge = 1;
16161616
}
16171617

1618-
response struct SignVidVerificationResponse = 14 {
1618+
response struct SignVIDVerificationResponse = 14 {
16191619
fabric_idx fabricIndex = 0;
16201620
int8u fabricBindingVersion = 1;
16211621
octet_string signature = 2;
@@ -1629,7 +1629,7 @@ cluster OperationalCredentials = 62 {
16291629
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
16301630
/** Sender is requesting to add the new node operational certificates. */
16311631
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1632-
/** Sender is requesting to update the node operational certificates. */
1632+
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
16331633
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
16341634
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
16351635
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
@@ -1638,9 +1638,9 @@ cluster OperationalCredentials = 62 {
16381638
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
16391639
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
16401640
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1641-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1641+
fabric command access(invoke: administer) SetVIDVerificationStatement(SetVIDVerificationStatementRequest): DefaultSuccess = 12;
16421642
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1643-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
1643+
command access(invoke: administer) SignVIDVerificationRequest(SignVIDVerificationRequestRequest): SignVIDVerificationResponse = 13;
16441644
}
16451645

16461646
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

‎examples/fan-control-app/silabs/data_model/fan-control-thread-app.zap

+20-20
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@
18271827
"storageOption": "External",
18281828
"singleton": 0,
18291829
"bounded": 0,
1830-
"defaultValue": "",
1830+
"defaultValue": null,
18311831
"reportable": 1,
18321832
"minInterval": 1,
18331833
"maxInterval": 65534,
@@ -1843,7 +1843,7 @@
18431843
"storageOption": "External",
18441844
"singleton": 0,
18451845
"bounded": 0,
1846-
"defaultValue": "",
1846+
"defaultValue": null,
18471847
"reportable": 1,
18481848
"minInterval": 1,
18491849
"maxInterval": 65534,
@@ -1859,7 +1859,7 @@
18591859
"storageOption": "External",
18601860
"singleton": 0,
18611861
"bounded": 0,
1862-
"defaultValue": "",
1862+
"defaultValue": null,
18631863
"reportable": 1,
18641864
"minInterval": 1,
18651865
"maxInterval": 65534,
@@ -1875,7 +1875,7 @@
18751875
"storageOption": "External",
18761876
"singleton": 0,
18771877
"bounded": 0,
1878-
"defaultValue": "",
1878+
"defaultValue": null,
18791879
"reportable": 1,
18801880
"minInterval": 1,
18811881
"maxInterval": 65534,
@@ -1891,7 +1891,7 @@
18911891
"storageOption": "External",
18921892
"singleton": 0,
18931893
"bounded": 0,
1894-
"defaultValue": "",
1894+
"defaultValue": null,
18951895
"reportable": 1,
18961896
"minInterval": 1,
18971897
"maxInterval": 65534,
@@ -1907,7 +1907,7 @@
19071907
"storageOption": "External",
19081908
"singleton": 0,
19091909
"bounded": 0,
1910-
"defaultValue": "",
1910+
"defaultValue": null,
19111911
"reportable": 1,
19121912
"minInterval": 1,
19131913
"maxInterval": 65534,
@@ -1923,7 +1923,7 @@
19231923
"storageOption": "External",
19241924
"singleton": 0,
19251925
"bounded": 0,
1926-
"defaultValue": "",
1926+
"defaultValue": null,
19271927
"reportable": 1,
19281928
"minInterval": 1,
19291929
"maxInterval": 65534,
@@ -1939,7 +1939,7 @@
19391939
"storageOption": "External",
19401940
"singleton": 0,
19411941
"bounded": 0,
1942-
"defaultValue": "",
1942+
"defaultValue": null,
19431943
"reportable": 1,
19441944
"minInterval": 1,
19451945
"maxInterval": 65534,
@@ -1955,7 +1955,7 @@
19551955
"storageOption": "External",
19561956
"singleton": 0,
19571957
"bounded": 0,
1958-
"defaultValue": "",
1958+
"defaultValue": null,
19591959
"reportable": 1,
19601960
"minInterval": 1,
19611961
"maxInterval": 65534,
@@ -1971,7 +1971,7 @@
19711971
"storageOption": "External",
19721972
"singleton": 0,
19731973
"bounded": 0,
1974-
"defaultValue": "",
1974+
"defaultValue": null,
19751975
"reportable": 1,
19761976
"minInterval": 1,
19771977
"maxInterval": 65534,
@@ -1987,7 +1987,7 @@
19871987
"storageOption": "External",
19881988
"singleton": 0,
19891989
"bounded": 0,
1990-
"defaultValue": "",
1990+
"defaultValue": null,
19911991
"reportable": 1,
19921992
"minInterval": 1,
19931993
"maxInterval": 65534,
@@ -2003,7 +2003,7 @@
20032003
"storageOption": "External",
20042004
"singleton": 0,
20052005
"bounded": 0,
2006-
"defaultValue": "",
2006+
"defaultValue": null,
20072007
"reportable": 1,
20082008
"minInterval": 1,
20092009
"maxInterval": 65534,
@@ -2019,7 +2019,7 @@
20192019
"storageOption": "External",
20202020
"singleton": 0,
20212021
"bounded": 0,
2022-
"defaultValue": "",
2022+
"defaultValue": null,
20232023
"reportable": 1,
20242024
"minInterval": 1,
20252025
"maxInterval": 65534,
@@ -2035,7 +2035,7 @@
20352035
"storageOption": "External",
20362036
"singleton": 0,
20372037
"bounded": 0,
2038-
"defaultValue": "",
2038+
"defaultValue": null,
20392039
"reportable": 1,
20402040
"minInterval": 1,
20412041
"maxInterval": 65534,
@@ -2051,7 +2051,7 @@
20512051
"storageOption": "External",
20522052
"singleton": 0,
20532053
"bounded": 0,
2054-
"defaultValue": "",
2054+
"defaultValue": null,
20552055
"reportable": 1,
20562056
"minInterval": 1,
20572057
"maxInterval": 65534,
@@ -2067,7 +2067,7 @@
20672067
"storageOption": "External",
20682068
"singleton": 0,
20692069
"bounded": 0,
2070-
"defaultValue": "",
2070+
"defaultValue": null,
20712071
"reportable": 1,
20722072
"minInterval": 1,
20732073
"maxInterval": 65534,
@@ -2083,7 +2083,7 @@
20832083
"storageOption": "External",
20842084
"singleton": 0,
20852085
"bounded": 0,
2086-
"defaultValue": "",
2086+
"defaultValue": null,
20872087
"reportable": 1,
20882088
"minInterval": 1,
20892089
"maxInterval": 65534,
@@ -2099,7 +2099,7 @@
20992099
"storageOption": "External",
21002100
"singleton": 0,
21012101
"bounded": 0,
2102-
"defaultValue": "",
2102+
"defaultValue": null,
21032103
"reportable": 1,
21042104
"minInterval": 1,
21052105
"maxInterval": 65534,
@@ -2115,7 +2115,7 @@
21152115
"storageOption": "External",
21162116
"singleton": 0,
21172117
"bounded": 0,
2118-
"defaultValue": "",
2118+
"defaultValue": null,
21192119
"reportable": 1,
21202120
"minInterval": 1,
21212121
"maxInterval": 65534,
@@ -2131,7 +2131,7 @@
21312131
"storageOption": "External",
21322132
"singleton": 0,
21332133
"bounded": 0,
2134-
"defaultValue": "",
2134+
"defaultValue": null,
21352135
"reportable": 1,
21362136
"minInterval": 1,
21372137
"maxInterval": 65534,

‎examples/fan-control-app/silabs/data_model/fan-control-wifi-app.matter

+18-18
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ cluster AdministratorCommissioning = 60 {
14071407

14081408
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
14091409
cluster OperationalCredentials = 62 {
1410-
revision 1; // NOTE: Default/not specifically set
1410+
revision 2;
14111411

14121412
enum CertificateChainTypeEnum : enum8 {
14131413
kDACCertificate = 1;
@@ -1433,14 +1433,14 @@ cluster OperationalCredentials = 62 {
14331433
fabric_id fabricID = 3;
14341434
node_id nodeID = 4;
14351435
char_string<32> label = 5;
1436-
optional octet_string<85> vidVerificationStatement = 6;
1436+
optional octet_string<85> VIDVerificationStatement = 6;
14371437
fabric_idx fabricIndex = 254;
14381438
}
14391439

14401440
fabric_scoped struct NOCStruct {
1441-
octet_string noc = 1;
1442-
nullable octet_string icac = 2;
1443-
optional octet_string vvsc = 3;
1441+
octet_string<400> noc = 1;
1442+
nullable octet_string<400> icac = 2;
1443+
optional octet_string<400> vvsc = 3;
14441444
fabric_idx fabricIndex = 254;
14451445
}
14461446

@@ -1462,7 +1462,7 @@ cluster OperationalCredentials = 62 {
14621462
}
14631463

14641464
response struct AttestationResponse = 1 {
1465-
octet_string<900> attestationElements = 0;
1465+
octet_string attestationElements = 0;
14661466
octet_string<64> attestationSignature = 1;
14671467
}
14681468

@@ -1481,7 +1481,7 @@ cluster OperationalCredentials = 62 {
14811481

14821482
response struct CSRResponse = 5 {
14831483
octet_string NOCSRElements = 0;
1484-
octet_string attestationSignature = 1;
1484+
octet_string<64> attestationSignature = 1;
14851485
}
14861486

14871487
request struct AddNOCRequest {
@@ -1493,8 +1493,8 @@ cluster OperationalCredentials = 62 {
14931493
}
14941494

14951495
request struct UpdateNOCRequest {
1496-
octet_string NOCValue = 0;
1497-
optional octet_string ICACValue = 1;
1496+
octet_string<400> NOCValue = 0;
1497+
optional octet_string<400> ICACValue = 1;
14981498
}
14991499

15001500
response struct NOCResponse = 8 {
@@ -1512,21 +1512,21 @@ cluster OperationalCredentials = 62 {
15121512
}
15131513

15141514
request struct AddTrustedRootCertificateRequest {
1515-
octet_string rootCACertificate = 0;
1515+
octet_string<400> rootCACertificate = 0;
15161516
}
15171517

1518-
request struct SetVidVerificationStatementRequest {
1518+
request struct SetVIDVerificationStatementRequest {
15191519
optional vendor_id vendorID = 0;
1520-
optional octet_string vidVerificationStatement = 1;
1521-
optional octet_string vvsc = 2;
1520+
optional octet_string<85> VIDVerificationStatement = 1;
1521+
optional octet_string<400> vvsc = 2;
15221522
}
15231523

1524-
request struct SignVidVerificationRequestRequest {
1524+
request struct SignVIDVerificationRequestRequest {
15251525
fabric_idx fabricIndex = 0;
15261526
octet_string<32> clientChallenge = 1;
15271527
}
15281528

1529-
response struct SignVidVerificationResponse = 14 {
1529+
response struct SignVIDVerificationResponse = 14 {
15301530
fabric_idx fabricIndex = 0;
15311531
int8u fabricBindingVersion = 1;
15321532
octet_string signature = 2;
@@ -1540,7 +1540,7 @@ cluster OperationalCredentials = 62 {
15401540
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
15411541
/** Sender is requesting to add the new node operational certificates. */
15421542
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1543-
/** Sender is requesting to update the node operational certificates. */
1543+
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
15441544
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
15451545
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
15461546
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
@@ -1549,9 +1549,9 @@ cluster OperationalCredentials = 62 {
15491549
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
15501550
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
15511551
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1552-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1552+
fabric command access(invoke: administer) SetVIDVerificationStatement(SetVIDVerificationStatementRequest): DefaultSuccess = 12;
15531553
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1554-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
1554+
command access(invoke: administer) SignVIDVerificationRequest(SignVIDVerificationRequestRequest): SignVIDVerificationResponse = 13;
15551555
}
15561556

15571557
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

0 commit comments

Comments
 (0)