Skip to content

Commit 90726e5

Browse files
tcarmelveilleuxtennessee-googlerestyled-commits
authored
Implement PayloadTestRequest command in DGGEN (#31907)
* Add DataModelTest feature to general diagnostics * Regen ZAP * Fix TC-DGGEN-1.1 * Restyled by whitespace * Restyled by clang-format * Restyled by prettier-json * Restyled by isort * Fix integration tests * Fix Java codegen * Address review comments * Fix Java codegen * Fix Java codegen * Fix Java codegen golden data * Fix TC-DGGEN-1.1 * Fix removal of Commands.h * Fix YAML test --------- Co-authored-by: tennessee.carmelveilleux@gmail.com <tennessee@google.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 62ba151 commit 90726e5

File tree

117 files changed

+3099
-844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3099
-844
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+18-2
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,10 @@ cluster GeneralDiagnostics = 51 {
759759
kEthernetFault = 6;
760760
}
761761

762+
bitmap Feature : bitmap32 {
763+
kDataModelTest = 0x1;
764+
}
765+
762766
struct NetworkInterface {
763767
char_string<32> name = 0;
764768
boolean isOperational = 1;
@@ -815,10 +819,22 @@ cluster GeneralDiagnostics = 51 {
815819
nullable posix_ms posixTimeMs = 1;
816820
}
817821

822+
request struct PayloadTestRequestRequest {
823+
octet_string<16> enableKey = 0;
824+
int8u value = 1;
825+
int16u count = 2;
826+
}
827+
828+
response struct PayloadTestResponse = 4 {
829+
octet_string payload = 0;
830+
}
831+
818832
/** Provide a means for certification tests to trigger some test-plan-specific events */
819833
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
820834
/** Take a snapshot of system time and epoch time. */
821835
command TimeSnapshot(): TimeSnapshotResponse = 1;
836+
/** Request a variable length payload response. */
837+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
822838
}
823839

824840
/** Commands to trigger a Node to allow a new Administrator to commission it. */
@@ -2390,8 +2406,8 @@ endpoint 0 {
23902406
callback attribute activeRadioFaults;
23912407
callback attribute activeNetworkFaults;
23922408
callback attribute testEventTriggersEnabled default = false;
2393-
ram attribute featureMap default = 0;
2394-
ram attribute clusterRevision default = 0x0002;
2409+
callback attribute featureMap;
2410+
callback attribute clusterRevision;
23952411

23962412
handle command TestEventTrigger;
23972413
handle command TimeSnapshot;

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+18-2
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,10 @@ cluster GeneralDiagnostics = 51 {
712712
kEthernetFault = 6;
713713
}
714714

715+
bitmap Feature : bitmap32 {
716+
kDataModelTest = 0x1;
717+
}
718+
715719
struct NetworkInterface {
716720
char_string<32> name = 0;
717721
boolean isOperational = 1;
@@ -768,10 +772,22 @@ cluster GeneralDiagnostics = 51 {
768772
nullable posix_ms posixTimeMs = 1;
769773
}
770774

775+
request struct PayloadTestRequestRequest {
776+
octet_string<16> enableKey = 0;
777+
int8u value = 1;
778+
int16u count = 2;
779+
}
780+
781+
response struct PayloadTestResponse = 4 {
782+
octet_string payload = 0;
783+
}
784+
771785
/** Provide a means for certification tests to trigger some test-plan-specific events */
772786
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
773787
/** Take a snapshot of system time and epoch time. */
774788
command TimeSnapshot(): TimeSnapshotResponse = 1;
789+
/** Request a variable length payload response. */
790+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
775791
}
776792

777793
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -2103,8 +2119,8 @@ endpoint 0 {
21032119
callback attribute activeRadioFaults;
21042120
callback attribute activeNetworkFaults;
21052121
callback attribute testEventTriggersEnabled default = false;
2106-
ram attribute featureMap default = 0;
2107-
ram attribute clusterRevision default = 0x0002;
2122+
callback attribute featureMap;
2123+
callback attribute clusterRevision;
21082124

21092125
handle command TestEventTrigger;
21102126
handle command TimeSnapshot;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+20-2
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,10 @@ cluster GeneralDiagnostics = 51 {
16971697
kEthernetFault = 6;
16981698
}
16991699

1700+
bitmap Feature : bitmap32 {
1701+
kDataModelTest = 0x1;
1702+
}
1703+
17001704
struct NetworkInterface {
17011705
char_string<32> name = 0;
17021706
boolean isOperational = 1;
@@ -1753,10 +1757,22 @@ cluster GeneralDiagnostics = 51 {
17531757
nullable posix_ms posixTimeMs = 1;
17541758
}
17551759

1760+
request struct PayloadTestRequestRequest {
1761+
octet_string<16> enableKey = 0;
1762+
int8u value = 1;
1763+
int16u count = 2;
1764+
}
1765+
1766+
response struct PayloadTestResponse = 4 {
1767+
octet_string payload = 0;
1768+
}
1769+
17561770
/** Provide a means for certification tests to trigger some test-plan-specific events */
17571771
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
17581772
/** Take a snapshot of system time and epoch time. */
17591773
command TimeSnapshot(): TimeSnapshotResponse = 1;
1774+
/** Request a variable length payload response. */
1775+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
17601776
}
17611777

17621778
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -7380,12 +7396,14 @@ endpoint 0 {
73807396
callback attribute acceptedCommandList;
73817397
callback attribute eventList;
73827398
callback attribute attributeList;
7383-
ram attribute featureMap default = 0;
7384-
ram attribute clusterRevision default = 0x0002;
7399+
callback attribute featureMap;
7400+
callback attribute clusterRevision;
73857401

73867402
handle command TestEventTrigger;
73877403
handle command TimeSnapshot;
73887404
handle command TimeSnapshotResponse;
7405+
handle command PayloadTestRequest;
7406+
handle command PayloadTestResponse;
73897407
}
73907408

73917409
server cluster SoftwareDiagnostics {

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+16
Original file line numberDiff line numberDiff line change
@@ -2863,6 +2863,22 @@
28632863
"source": "server",
28642864
"isIncoming": 0,
28652865
"isEnabled": 1
2866+
},
2867+
{
2868+
"name": "PayloadTestRequest",
2869+
"code": 3,
2870+
"mfgCode": null,
2871+
"source": "client",
2872+
"isIncoming": 1,
2873+
"isEnabled": 1
2874+
},
2875+
{
2876+
"name": "PayloadTestResponse",
2877+
"code": 4,
2878+
"mfgCode": null,
2879+
"source": "server",
2880+
"isIncoming": 0,
2881+
"isEnabled": 1
28662882
}
28672883
],
28682884
"attributes": [

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+20-2
Original file line numberDiff line numberDiff line change
@@ -1577,6 +1577,10 @@ cluster GeneralDiagnostics = 51 {
15771577
kEthernetFault = 6;
15781578
}
15791579

1580+
bitmap Feature : bitmap32 {
1581+
kDataModelTest = 0x1;
1582+
}
1583+
15801584
struct NetworkInterface {
15811585
char_string<32> name = 0;
15821586
boolean isOperational = 1;
@@ -1633,10 +1637,22 @@ cluster GeneralDiagnostics = 51 {
16331637
nullable posix_ms posixTimeMs = 1;
16341638
}
16351639

1640+
request struct PayloadTestRequestRequest {
1641+
octet_string<16> enableKey = 0;
1642+
int8u value = 1;
1643+
int16u count = 2;
1644+
}
1645+
1646+
response struct PayloadTestResponse = 4 {
1647+
octet_string payload = 0;
1648+
}
1649+
16361650
/** Provide a means for certification tests to trigger some test-plan-specific events */
16371651
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
16381652
/** Take a snapshot of system time and epoch time. */
16391653
command TimeSnapshot(): TimeSnapshotResponse = 1;
1654+
/** Request a variable length payload response. */
1655+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
16401656
}
16411657

16421658
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -6071,12 +6087,14 @@ endpoint 0 {
60716087
callback attribute acceptedCommandList;
60726088
callback attribute eventList;
60736089
callback attribute attributeList;
6074-
ram attribute featureMap default = 0;
6075-
ram attribute clusterRevision default = 0x0002;
6090+
callback attribute featureMap;
6091+
callback attribute clusterRevision;
60766092

60776093
handle command TestEventTrigger;
60786094
handle command TimeSnapshot;
60796095
handle command TimeSnapshotResponse;
6096+
handle command PayloadTestRequest;
6097+
handle command PayloadTestResponse;
60806098
}
60816099

60826100
server cluster SoftwareDiagnostics {

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+16
Original file line numberDiff line numberDiff line change
@@ -2464,6 +2464,22 @@
24642464
"source": "server",
24652465
"isIncoming": 0,
24662466
"isEnabled": 1
2467+
},
2468+
{
2469+
"name": "PayloadTestRequest",
2470+
"code": 3,
2471+
"mfgCode": null,
2472+
"source": "client",
2473+
"isIncoming": 1,
2474+
"isEnabled": 1
2475+
},
2476+
{
2477+
"name": "PayloadTestResponse",
2478+
"code": 4,
2479+
"mfgCode": null,
2480+
"source": "server",
2481+
"isIncoming": 0,
2482+
"isEnabled": 1
24672483
}
24682484
],
24692485
"attributes": [

‎examples/bridge-app/bridge-common/bridge-app.matter

+18-2
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,10 @@ cluster GeneralDiagnostics = 51 {
11621162
kEthernetFault = 6;
11631163
}
11641164

1165+
bitmap Feature : bitmap32 {
1166+
kDataModelTest = 0x1;
1167+
}
1168+
11651169
struct NetworkInterface {
11661170
char_string<32> name = 0;
11671171
boolean isOperational = 1;
@@ -1218,10 +1222,22 @@ cluster GeneralDiagnostics = 51 {
12181222
nullable posix_ms posixTimeMs = 1;
12191223
}
12201224

1225+
request struct PayloadTestRequestRequest {
1226+
octet_string<16> enableKey = 0;
1227+
int8u value = 1;
1228+
int16u count = 2;
1229+
}
1230+
1231+
response struct PayloadTestResponse = 4 {
1232+
octet_string payload = 0;
1233+
}
1234+
12211235
/** Provide a means for certification tests to trigger some test-plan-specific events */
12221236
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
12231237
/** Take a snapshot of system time and epoch time. */
12241238
command TimeSnapshot(): TimeSnapshotResponse = 1;
1239+
/** Request a variable length payload response. */
1240+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
12251241
}
12261242

12271243
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -2049,8 +2065,8 @@ endpoint 0 {
20492065
callback attribute generatedCommandList;
20502066
callback attribute acceptedCommandList;
20512067
callback attribute attributeList;
2052-
ram attribute featureMap default = 0;
2053-
ram attribute clusterRevision default = 0x0002;
2068+
callback attribute featureMap;
2069+
callback attribute clusterRevision;
20542070

20552071
handle command TestEventTrigger;
20562072
handle command TimeSnapshot;

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+18-2
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,10 @@ cluster GeneralDiagnostics = 51 {
935935
kEthernetFault = 6;
936936
}
937937

938+
bitmap Feature : bitmap32 {
939+
kDataModelTest = 0x1;
940+
}
941+
938942
struct NetworkInterface {
939943
char_string<32> name = 0;
940944
boolean isOperational = 1;
@@ -991,10 +995,22 @@ cluster GeneralDiagnostics = 51 {
991995
nullable posix_ms posixTimeMs = 1;
992996
}
993997

998+
request struct PayloadTestRequestRequest {
999+
octet_string<16> enableKey = 0;
1000+
int8u value = 1;
1001+
int16u count = 2;
1002+
}
1003+
1004+
response struct PayloadTestResponse = 4 {
1005+
octet_string payload = 0;
1006+
}
1007+
9941008
/** Provide a means for certification tests to trigger some test-plan-specific events */
9951009
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
9961010
/** Take a snapshot of system time and epoch time. */
9971011
command TimeSnapshot(): TimeSnapshotResponse = 1;
1012+
/** Request a variable length payload response. */
1013+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
9981014
}
9991015

10001016
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1753,8 +1769,8 @@ endpoint 0 {
17531769
callback attribute activeRadioFaults;
17541770
callback attribute activeNetworkFaults;
17551771
callback attribute testEventTriggersEnabled default = false;
1756-
ram attribute featureMap default = 0;
1757-
ram attribute clusterRevision default = 0x0002;
1772+
callback attribute featureMap;
1773+
callback attribute clusterRevision;
17581774

17591775
handle command TestEventTrigger;
17601776
handle command TimeSnapshot;

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+18-2
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,10 @@ cluster GeneralDiagnostics = 51 {
759759
kEthernetFault = 6;
760760
}
761761

762+
bitmap Feature : bitmap32 {
763+
kDataModelTest = 0x1;
764+
}
765+
762766
struct NetworkInterface {
763767
char_string<32> name = 0;
764768
boolean isOperational = 1;
@@ -815,10 +819,22 @@ cluster GeneralDiagnostics = 51 {
815819
nullable posix_ms posixTimeMs = 1;
816820
}
817821

822+
request struct PayloadTestRequestRequest {
823+
octet_string<16> enableKey = 0;
824+
int8u value = 1;
825+
int16u count = 2;
826+
}
827+
828+
response struct PayloadTestResponse = 4 {
829+
octet_string payload = 0;
830+
}
831+
818832
/** Provide a means for certification tests to trigger some test-plan-specific events */
819833
command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
820834
/** Take a snapshot of system time and epoch time. */
821835
command TimeSnapshot(): TimeSnapshotResponse = 1;
836+
/** Request a variable length payload response. */
837+
command PayloadTestRequest(PayloadTestRequestRequest): PayloadTestResponse = 3;
822838
}
823839

824840
/** The Software Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems. */
@@ -1443,8 +1459,8 @@ endpoint 0 {
14431459
callback attribute activeRadioFaults;
14441460
callback attribute activeNetworkFaults;
14451461
callback attribute testEventTriggersEnabled default = false;
1446-
ram attribute featureMap default = 0;
1447-
ram attribute clusterRevision default = 0x0002;
1462+
callback attribute featureMap;
1463+
callback attribute clusterRevision;
14481464

14491465
handle command TestEventTrigger;
14501466
handle command TimeSnapshot;

0 commit comments

Comments
 (0)