Skip to content

Commit 6ccb9d2

Browse files
manjunath-grlrestyled-commits
manjunath-grl
and
restyled-commits
authored
Fixes YAML script issues Nov 20 (#30575)
* Fixes issue: 53,55,56,57,58,60,61 Modified tests: TC_ACT_2_2 TC_ACT_3_2 TC_BIND_2_2 TC_BIND_2_3 TC_BOOL_1_1 TC_BOOL_2_2 TC_DGGEN_2_1 TC_DRLK_3_2 TC_I_1_1 TC_SWTCH_2_2 TC_SWTCH_3_2 * Restyled by whitespace * Restyled by prettier-yaml * Fix issue 64 TC-G-2.2 * Fixes issue: 65, 62 Modified tests: TC-G-2.2 TC-G-2.3 TC-G-2.4 TC-SC-5.3 * Restyled by whitespace * Fixes issue: 63 --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 540dddb commit 6ccb9d2

19 files changed

+253
-206
lines changed

‎src/app/tests/suites/certification/PICS.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ PICS:
891891
- label:
892892
"Can the StateValue attribute be changed by manual operation at the
893893
DUT?"
894-
id: BOOL.M.ManuallyControlled
894+
id: BOOL.S.M.ManuallyControlled
895895

896896
#
897897
# client / manually
@@ -6066,10 +6066,10 @@ PICS:
60666066
#
60676067
- label:
60686068
"Does the DUT support reading attribute to get switch state (polling)?"
6069-
id: SWTCH.C.M.RA
6069+
id: SWTCH.C.M.SwitchStatePolling
60706070

60716071
- label: "Does the DUT support eventing to get switch state changes?"
6072-
id: SWTCH.C.M.EV
6072+
id: SWTCH.C.M.SwitchStateEventing
60736073

60746074
- label: "Write all supported optional attributes"
60756075
id: SWTCH.C.AO-WRITE

‎src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml

+37-12
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,11 @@ tests:
500500

501501
- label: "Step 4c: subscribe to StateChanged and ActionFailed events"
502502
verification: |
503-
To subscribe StateChanged event follow below steps
503+
To subscribe StateChanged and ActionFailed event follow below steps
504504
505505
1) ./chip-tool interactive start
506-
2) actions subscribe-event action-failed 2 30 1 0
506+
507+
2) actions subscribe-event action-failed 2 30 1 1
507508
508509
Via the TH (chip-tool), Verify ActionFailed event subscription.
509510
@@ -530,14 +531,28 @@ tests:
530531
[1659962630.456551][25381:25386] CHIP:DMG: }
531532
[1659962630.456563][25381:25386] CHIP:DMG: Subscription established with SubscriptionID = 0x78f0a04c MinInterval = 0s MaxInterval = 100s Peer = 01:0000000000000001
532533
533-
3) actions instant-action 0x1001 1 1
534-
535-
Via the TH (chip-tool), Verify the SUCCESS response for instant-action.
536-
537-
[1659955888.114483][23216:23221] CHIP:DMG: StatusIB =
538-
[1659955888.114499][23216:23221] CHIP:DMG: {
539-
[1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS),
540-
[1659955888.114529][23216:23221] CHIP:DMG: },
534+
3) actions subscribe-event state-changed 2 30 1 1
535+
536+
Via the TH (chip-tool), Verify StateChanged event subscription.
537+
538+
[1696947597.397495][20187:20190] CHIP:DMG: ReportDataMessage =
539+
[1696947597.397508][20187:20190] CHIP:DMG: {
540+
[1696947597.397517][20187:20190] CHIP:DMG: SubscriptionId = 0x78906430,
541+
[1696947597.397529][20187:20190] CHIP:DMG: InteractionModelRevision = 11
542+
[1696947597.397539][20187:20190] CHIP:DMG: }
543+
[1696947597.397561][20187:20190] CHIP:DMG: MoveToState ReadClient[0x7fe364020f30]: Moving to [AwaitingSu]
544+
[1696947597.397646][20187:20190] CHIP:EM: <<< [E:22246i S:684 M:21569658 (Ack:244821317)] (S) Msg TX to 1:0000000000000001 [7884] [UDP:[fe80::ee12:c4a5:f800:bf4f%wlp0s20f3]:5540] --- Type 0001:01 (IM:StatusResponse)
545+
[1696947597.398261][20187:20190] CHIP:EM: >>> [E:22246i S:684 M:244821318 (Ack:21569658)] (S) Msg RX from 1:0000000000000001 [7884] --- Type 0001:04 (IM:SubscribeResponse)
546+
[1696947597.398292][20187:20190] CHIP:EM: Found matching exchange: 22246i, Delegate: 0x7fe364020f40
547+
[1696947597.398314][20187:20190] CHIP:EM: Rxd Ack; Removing MessageCounter:21569658 from Retrans Table on exchange 22246i
548+
[1696947597.398334][20187:20190] CHIP:DMG: SubscribeResponse is received
549+
[1696947597.398356][20187:20190] CHIP:DMG: SubscribeResponseMessage =
550+
[1696947597.398369][20187:20190] CHIP:DMG: {
551+
[1696947597.398382][20187:20190] CHIP:DMG: SubscriptionId = 0x78906430,
552+
[1696947597.398394][20187:20190] CHIP:DMG: MaxInterval = 0x1e,
553+
[1696947597.398407][20187:20190] CHIP:DMG: InteractionModelRevision = 11
554+
[1696947597.398417][20187:20190] CHIP:DMG: }
555+
[1696947597.398431][20187:20190] CHIP:DMG: Subscription established with SubscriptionID = 0x78906430 MinInterval = 2s MaxInterval = 30s Peer = 01:0000000000000001
541556
disabled: true
542557

543558
- label:
@@ -546,7 +561,7 @@ tests:
546561
SupportedCommands in this ActionStruct) by sending the command with
547562
this particular ActionID and a random value for InvokeID"
548563
verification: |
549-
Only InstantActions command is supported
564+
Only InstantAction command is supported in bridge-app. When testing with a real DUT, test for all the actions supported by the DUT (list from step 4b):
550565
551566
./chip-tool actions instant-action 0x1001 1 1
552567
@@ -556,11 +571,21 @@ tests:
556571
[1659955888.114499][23216:23221] CHIP:DMG: {
557572
[1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS),
558573
[1659955888.114529][23216:23221] CHIP:DMG: },
574+
575+
576+
./chip-tool actions instant-action 0x1003 1 1
577+
578+
Via the TH (chip-tool), Verify the SUCCESS response for instant-action.
579+
580+
[1659955888.114483][23216:23221] CHIP:DMG: StatusIB =
581+
[1659955888.114499][23216:23221] CHIP:DMG: {
582+
[1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS),
583+
[1659955888.114529][23216:23221] CHIP:DMG: },
559584
disabled: true
560585

561586
- label:
562587
"Step 4e: repeat 4d for the other SupportedCommands of each
563588
ActionStruct"
564589
verification: |
565-
Only InstantActions command is supported
590+
Only InstantAction command is supported in bridge-app. When testing with a real DUT, test for all the actions supported by the DUT (list from step 4b)
566591
disabled: true

‎src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ tests:
132132
- label: "Step 2: DUT issues an StartAction command to TH"
133133
PICS: ACT.C.C02.Tx
134134
verification: |
135-
./chip-tool actions start-action 0 1 1
136-
137-
Note: Message log similar as in step 1
135+
The reference app doesn't have implementation for this command
138136
disabled: true
139137

140138
- label: "Step 3: DUT issues an StopAction command to TH"

‎src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ name:
1919

2020
PICS:
2121
- BIND.C
22+
- GRPKEY.C
2223

2324
config:
2425
nodeId: 0x12344321

‎src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ name:
1919

2020
PICS:
2121
- BIND.C
22+
- GRPKEY.C
2223

2324
config:
2425
nodeId: 0x12344321

‎src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml

+12-12
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,35 @@ tests:
6565
type: list
6666
contains: [0, 65528, 65529, 65531, 65532, 65533]
6767

68-
- label: "Step 5: Read the global attribute: AcceptedCommandList"
68+
- label: "Step 5: Read the global attribute: EventList"
69+
PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED
6970
command: "readAttribute"
70-
attribute: "AcceptedCommandList"
71+
attribute: "EventList"
7172
response:
72-
value: []
73+
value: [0]
7374
constraints:
7475
type: list
7576

76-
- label: "Step 6: Read the global attribute: GeneratedCommandList"
77+
- label: "Step 5: Read the global attribute: EventList"
78+
PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED "
7779
command: "readAttribute"
78-
attribute: "GeneratedCommandList"
80+
attribute: "EventList"
7981
response:
8082
value: []
8183
constraints:
8284
type: list
8385

84-
- label: "Step 7: Read the global attribute: EventList"
85-
PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED
86+
- label: "Step 6: Read the global attribute: AcceptedCommandList"
8687
command: "readAttribute"
87-
attribute: "EventList"
88+
attribute: "AcceptedCommandList"
8889
response:
89-
value: [0]
90+
value: []
9091
constraints:
9192
type: list
9293

93-
- label: "Step 7: Read the global attribute: EventList"
94-
PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED "
94+
- label: "Step 7: Read the global attribute: GeneratedCommandList"
9595
command: "readAttribute"
96-
attribute: "EventList"
96+
attribute: "GeneratedCommandList"
9797
response:
9898
value: []
9999
constraints:

‎src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ tests:
3737
disabled: true
3838

3939
- label: "Step 2a: Bring the DUT into a state so StateValue is FALSE."
40-
PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
40+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
4141
verification: |
4242
Manual operation
4343
disabled: true
4444

4545
- label: "Step 2b: TH reads the StateValue attribute from the DUT."
46-
PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
46+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
4747
verification: |
4848
./chip-tool booleanstate read state-value 1 1
4949
@@ -54,13 +54,13 @@ tests:
5454
disabled: true
5555

5656
- label: "Step 3a: Bring the DUT into a state so StateValue is TRUE."
57-
PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
57+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
5858
verification: |
5959
Manual operation
6060
disabled: true
6161

6262
- label: "Step 3b: TH reads the StateValue attribute from the DUT."
63-
PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
63+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
6464
verification: |
6565
./chip-tool booleanstate read state-value 1 1
6666
@@ -71,7 +71,7 @@ tests:
7171
disabled: true
7272

7373
- label: "Step 4a: Set up subscription to StateChange event."
74-
PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
74+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
7575
verification: |
7676
This event is not supported in all clusters app, so there are no reference logs.
7777
@@ -84,13 +84,13 @@ tests:
8484
disabled: true
8585

8686
- label: "Step 4b: Bring the DUT into a state so StateValue is FALSE."
87-
PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
87+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
8888
verification: |
8989
Verify the StateValue value is FALSE On TH(chip-tool), if the state-change event is generated
9090
disabled: true
9191

9292
- label: "Step 4c: TH reads the StateValue attribute from the DUT."
93-
PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
93+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
9494
verification: |
9595
This event is not supported in all clusters app, so there are no reference logs.
9696
@@ -100,13 +100,13 @@ tests:
100100
disabled: true
101101

102102
- label: "Step 4d: Bring the DUT into a state so StateValue is TRUE."
103-
PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
103+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
104104
verification: |
105105
Verify the StateValue value is TRUE On TH(chip-tool), if the state-change event is generated
106106
disabled: true
107107

108108
- label: "Step 4e: TH reads the StateValue attribute from the DUT."
109-
PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
109+
PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
110110
verification: |
111111
booleanstate read state-value 1 1
112112

‎src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,16 @@ tests:
147147
verification: |
148148
On TH_CR2 send the below command
149149
150-
Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
150+
Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
151151
152152
./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
153153
154154
verify you got the following message in the TH_CR2(CHIP-TOOL) log
155155
156-
CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
157-
CHIP:TOO: Secure Pairing Failed
158-
CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
156+
[1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
157+
[1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
158+
[1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
159+
[1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
159160
disabled: true
160161

161162
- label:
@@ -268,13 +269,14 @@ tests:
268269
verification: |
269270
On TH_CR3 send the below command
270271
271-
Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
272+
Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
272273
273274
./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma
274275
275-
verify you got the following message in the TH_CR3(Chip-tool) log
276+
Verify you got the following message in the TH_CR3(Chip-tool) log
276277
277-
CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
278-
CHIP:TOO: Secure Pairing Failed
279-
CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
278+
[1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
279+
[1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
280+
[1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
281+
[1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
280282
disabled: true

‎src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml

+25-8
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,11 @@ config:
2929
TEST_EVENT_TRIGGER_KEY:
3030
type: int64u
3131
defaultValue: "0x0000000000000003"
32+
payload:
33+
type: char_string
34+
defaultValue: "MT:-24J0AFN00KA0648G00"
3235

3336
tests:
34-
- label: "Wait for the commissioned device to be retrieved"
35-
cluster: "DelayCommands"
36-
command: "WaitForCommissionee"
37-
arguments:
38-
values:
39-
- name: "nodeId"
40-
value: nodeId
41-
4237
- label: "Step 1a: Reset Devices to factory defaults"
4338
PICS: PICS_SDK_CI_ONLY
4439
cluster: "SystemCommands"
@@ -57,6 +52,16 @@ tests:
5752
- name: "expectedValue"
5853
value: "y"
5954

55+
- label: "Step 1a: TH starts a commissioning process with DUT"
56+
cluster: "CommissionerCommands"
57+
command: "PairWithCode"
58+
arguments:
59+
values:
60+
- name: "nodeId"
61+
value: nodeId
62+
- name: "payload"
63+
value: payload
64+
6065
- label: "Step 1b: Wait for the commissioned device to be retrieved"
6166
cluster: "DelayCommands"
6267
command: "WaitForCommissionee"
@@ -393,6 +398,7 @@ tests:
393398
minValue: 0x0
394399
maxValue: 0xFFFFFFFE
395400

401+
#Issue: https://github.com/project-chip/connectedhomeip/issues/29580
396402
- label: "Wait for 2 hours and 5 minutes."
397403
PICS: DGGEN.S.A0003
398404
cluster: "DelayCommands"
@@ -432,6 +438,16 @@ tests:
432438
- name: "expectedValue"
433439
value: "y"
434440

441+
- label: "Step 10b: TH starts a commissioning process with DUT"
442+
cluster: "CommissionerCommands"
443+
command: "PairWithCode"
444+
arguments:
445+
values:
446+
- name: "nodeId"
447+
value: nodeId
448+
- name: "payload"
449+
value: payload
450+
435451
- label: "Wait for the commissioned device to be retrieved"
436452
cluster: "DelayCommands"
437453
command: "WaitForCommissionee"
@@ -451,6 +467,7 @@ tests:
451467
constraints:
452468
type: int32u
453469

470+
#Issue: https://github.com/project-chip/connectedhomeip/issues/29580
454471
- label: "Wait for 1 hour 5 minutes."
455472
PICS: DGGEN.S.A0003
456473
cluster: "DelayCommands"

0 commit comments

Comments
 (0)