Skip to content

Commit 1219374

Browse files
manjunath-grlrestyled-commits
authored and
pull[bot]
committed
Manual script issue fix oct 30 (#30120)
* Fixes issue: 34, 46, 47, 48, 49, 50 Modified tests: TC_ACE_1_5 TC_BRBINFO_2_2 TC_CADMIN_1_5 TC_CNET_4_10 TC_CNET_4_11 TC_CNET_4_20 TC_CNET_4_5 TC_CNET_4_9 TC_DGWIFI_3_2_Simulated TC_DRLK_2_10 TC_G_2_2 TC_SWTCH_2_2 * Modified tests: TC_ACT_3_2 TC_DRLK_3_2 * Restyled by whitespace --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 31c0c4e commit 1219374

19 files changed

+1437
-1288
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7311,7 +7311,7 @@ PICS:
73117311
"Reset the following attributes to 0; BeaconLostCount, BeaconRxCount,
73127312
PacketMulticastRxCount, PacketMulticastTxCount, PacketUnicastRxCount,
73137313
PacketUnicastTxCount"
7314-
id: DGWIFI.S.C00.Tx
7314+
id: DGWIFI.C.C00.Tx
73157315

73167316
# Window Covering Cluster Test Plan
73177317
- label:

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

+9-3
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ tests:
254254
cluster: "Descriptor"
255255
attribute: "DeviceTypeList"
256256

257-
- label: "Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"
257+
- label:
258+
"Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID
259+
attribute - expect UNSUPPORTED_ACCESS"
258260
command: "readAttribute"
259261
cluster: "Basic Information"
260262
attribute: "VendorID"
@@ -291,15 +293,19 @@ tests:
291293
- name: "expectedValue"
292294
value: "y"
293295

294-
- label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
296+
- label:
297+
"Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
298+
attribute - expect SUCCESS"
295299
identity: "beta"
296300
PICS: PICS_SDK_CI_ONLY
297301
command: "readAttribute"
298302
cluster: "Basic Information"
299303
attribute: "VendorID"
300304

301305
#Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
302-
- label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
306+
- label:
307+
"Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
308+
attribute - expect SUCCESS"
303309
verification: |
304310
./chip-tool basicinformation read vendor-id 2 0 --commissioner-name beta
305311

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

+74-83
Original file line numberDiff line numberDiff line change
@@ -45,97 +45,88 @@ tests:
4545
4646
1. First read action-list by following command
4747
48-
./chip-tool actions read action-list 1 1 --trace_decode 1
49-
50-
Via the TH (bridge-app), verify the ActionList attribute that contains ActionListStructs.
51-
52-
[1686033574.850552][39104:39106] CHIP:DMG: ReportDataMessage =
53-
[1686033574.850639][39104:39106] CHIP:DMG: {
54-
[1686033574.850689][39104:39106] CHIP:DMG: AttributeReportIBs =
55-
[1686033574.850802][39104:39106] CHIP:DMG: [
56-
[1686033574.850861][39104:39106] CHIP:DMG: AttributeReportIB =
57-
[1686033574.850976][39104:39106] CHIP:DMG: {
58-
[1686033574.851039][39104:39106] CHIP:DMG: AttributeDataIB =
59-
[1686033574.851133][39104:39106] CHIP:DMG: {
60-
[1686033574.851206][39104:39106] CHIP:DMG: DataVersion = 0x17ed8ce2,
61-
[1686033574.851299][39104:39106] CHIP:DMG: AttributePathIB =
62-
[1686033574.851375][39104:39106] CHIP:DMG: {
63-
[1686033574.851450][39104:39106] CHIP:DMG: Endpoint = 0x1,
64-
[1686033574.851557][39104:39106] CHIP:DMG: Cluster = 0x25,
65-
[1686033574.851658][39104:39106] CHIP:DMG: Attribute = 0x0000_0000,
66-
[1686033574.851736][39104:39106] CHIP:DMG: }
67-
[1686033574.851838][39104:39106] CHIP:DMG:
68-
[1686033574.851914][39104:39106] CHIP:DMG: Data = [
69-
[1686033574.852009][39104:39106] CHIP:DMG:
70-
[1686033574.852090][39104:39106] CHIP:DMG: {
71-
[1686033574.852194][39104:39106] CHIP:DMG: 0x0 = 4097,
72-
[1686033574.852287][39104:39106] CHIP:DMG: 0x1 = "Room 1 On" (9 chars),
73-
[1686033574.852393][39104:39106] CHIP:DMG: 0x2 = 3,
74-
[1686033574.852482][39104:39106] CHIP:DMG: 0x3 = 57345,
75-
[1686033574.852588][39104:39106] CHIP:DMG: 0x4 = 1,
76-
[1686033574.852692][39104:39106] CHIP:DMG: 0x5 = 0,
77-
[1686033574.852780][39104:39106] CHIP:DMG: },
78-
[1686033574.852880][39104:39106] CHIP:DMG: {
79-
[1686033574.852963][39104:39106] CHIP:DMG: 0x0 = 4098,
80-
[1686033574.853070][39104:39106] CHIP:DMG: 0x1 = "Turn On Room 2" (14 chars),
81-
[1686033574.853158][39104:39106] CHIP:DMG: 0x2 = 3,
82-
[1686033574.853311][39104:39106] CHIP:DMG: 0x3 = 57346,
83-
[1686033574.853428][39104:39106] CHIP:DMG: 0x4 = 1,
84-
[1686033574.853516][39104:39106] CHIP:DMG: 0x5 = 0,
85-
[1686033574.853621][39104:39106] CHIP:DMG: },
86-
[1686033574.853703][39104:39106] CHIP:DMG: ],
87-
[1686033574.853792][39104:39106] CHIP:DMG: },
88-
[1686033574.853887][39104:39106] CHIP:DMG:
89-
[1686033574.853969][39104:39106] CHIP:DMG: },
90-
[1686033574.854059][39104:39106] CHIP:DMG:
91-
[1686033574.854137][39104:39106] CHIP:DMG: ],
92-
[1686033574.854225][39104:39106] CHIP:DMG:
93-
[1686033574.854283][39104:39106] CHIP:DMG: SuppressResponse = true,
94-
[1686033574.854342][39104:39106] CHIP:DMG: InteractionModelRevision = 1
95-
[1686033574.854395][39104:39106] CHIP:DMG: }
96-
48+
./chip-tool actions read action-list 1 1
49+
50+
Via the TH (bridge-app), verify the ActionList attribute response.
51+
52+
[1698725144.232190][1963:1963] CHIP:IM: Received Read request
53+
[1698725144.232296][1963:1963] CHIP:DMG: ReadRequestMessage =
54+
[1698725144.232352][1963:1963] CHIP:DMG: {
55+
[1698725144.232410][1963:1963] CHIP:DMG: AttributePathIBs =
56+
[1698725144.232484][1963:1963] CHIP:DMG: [
57+
[1698725144.232544][1963:1963] CHIP:DMG: AttributePathIB =
58+
[1698725144.232608][1963:1963] CHIP:DMG: {
59+
[1698725144.232688][1963:1963] CHIP:DMG: Endpoint = 0x1,
60+
[1698725144.232758][1963:1963] CHIP:DMG: Cluster = 0x25,
61+
[1698725144.232828][1963:1963] CHIP:DMG: Attribute = 0x0000_0000,
62+
[1698725144.232893][1963:1963] CHIP:DMG: }
63+
[1698725144.232959][1963:1963] CHIP:DMG:
64+
[1698725144.233018][1963:1963] CHIP:DMG: ],
65+
[1698725144.233083][1963:1963] CHIP:DMG:
66+
[1698725144.233142][1963:1963] CHIP:DMG: isFabricFiltered = true,
67+
[1698725144.233199][1963:1963] CHIP:DMG: InteractionModelRevision = 11
68+
[1698725144.233252][1963:1963] CHIP:DMG: },
69+
70+
71+
./chip-tool actions read endpoint-lists 1 1
72+
73+
Via the TH (chip-tool), verify the EndpointLists attribute that contains EndpointListStructs.
74+
75+
[1698729275.160463][1963:1963] CHIP:IM: Received Read request
76+
[1698729275.160560][1963:1963] CHIP:DMG: ReadRequestMessage =
77+
[1698729275.160618][1963:1963] CHIP:DMG: {
78+
[1698729275.160668][1963:1963] CHIP:DMG: AttributePathIBs =
79+
[1698729275.160729][1963:1963] CHIP:DMG: [
80+
[1698729275.160785][1963:1963] CHIP:DMG: AttributePathIB =
81+
[1698729275.160848][1963:1963] CHIP:DMG: {
82+
[1698729275.160912][1963:1963] CHIP:DMG: Endpoint = 0x1,
83+
[1698729275.160992][1963:1963] CHIP:DMG: Cluster = 0x25,
84+
[1698729275.161070][1963:1963] CHIP:DMG: Attribute = 0x0000_0001,
85+
[1698729275.161143][1963:1963] CHIP:DMG: }
86+
[1698729275.161211][1963:1963] CHIP:DMG:
87+
[1698729275.161270][1963:1963] CHIP:DMG: ],
88+
[1698729275.161335][1963:1963] CHIP:DMG:
89+
[1698729275.161395][1963:1963] CHIP:DMG: isFabricFiltered = true,
90+
[1698729275.161452][1963:1963] CHIP:DMG: InteractionModelRevision = 11
91+
[1698729275.161505][1963:1963] CHIP:DMG: },
9792
9893
9994
2. Use the above obtained ActionID to verify the following commands
100-
./chip-tool actions instant-action 4097 1 1 --trace_decode 1
95+
./chip-tool actions instant-action 4097 1 1
10196
disabled: true
10297

10398
- label: "Step 1: DUT issues an InstantAction command to TH"
10499
PICS: ACT.C.C00.Tx
105100
verification: |
106-
./chip-tool actions instant-action 4097 1 1 --trace_decode 1
107-
108-
Via the TH (bridge-app), verify the SUCCESS response for InstantAction.
109-
110-
[1686033693.327962][39117:39119] CHIP:DMG: InvokeResponseMessage =
111-
[1686033693.328040][39117:39119] CHIP:DMG: {
112-
[1686033693.328094][39117:39119] CHIP:DMG: suppressResponse = false,
113-
[1686033693.328151][39117:39119] CHIP:DMG: InvokeResponseIBs =
114-
[1686033693.328248][39117:39119] CHIP:DMG: [
115-
[1686033693.328307][39117:39119] CHIP:DMG: InvokeResponseIB =
116-
[1686033693.328407][39117:39119] CHIP:DMG: {
117-
[1686033693.328469][39117:39119] CHIP:DMG: CommandStatusIB =
118-
[1686033693.328561][39117:39119] CHIP:DMG: {
119-
[1686033693.328632][39117:39119] CHIP:DMG: CommandPathIB =
120-
[1686033693.328708][39117:39119] CHIP:DMG: {
121-
[1686033693.328807][39117:39119] CHIP:DMG: EndpointId = 0x1,
122-
[1686033693.328887][39117:39119] CHIP:DMG: ClusterId = 0x25,
123-
[1686033693.328987][39117:39119] CHIP:DMG: CommandId = 0x0,
124-
[1686033693.329062][39117:39119] CHIP:DMG: },
125-
[1686033693.329167][39117:39119] CHIP:DMG:
126-
[1686033693.329237][39117:39119] CHIP:DMG: StatusIB =
127-
[1686033693.329376][39117:39119] CHIP:DMG: {
128-
[1686033693.329454][39117:39119] CHIP:DMG: status = 0x00 (SUCCESS),
129-
[1686033693.329551][39117:39119] CHIP:DMG: },
130-
[1686033693.329629][39117:39119] CHIP:DMG:
131-
[1686033693.329716][39117:39119] CHIP:DMG: },
132-
[1686033693.329794][39117:39119] CHIP:DMG:
133-
[1686033693.329876][39117:39119] CHIP:DMG: },
134-
[1686033693.329950][39117:39119] CHIP:DMG:
135-
[1686033693.330005][39117:39119] CHIP:DMG: ],
136-
[1686033693.330101][39117:39119] CHIP:DMG:
137-
[1686033693.330158][39117:39119] CHIP:DMG: InteractionModelRevision = 1
138-
[1686033693.330241][39117:39119] CHIP:DMG: },
101+
./chip-tool actions instant-action 4097 1 1
102+
103+
Via the TH (bridge-app), verify the InstantAction response that contains ActionID .
104+
105+
[1698724321.817293][1963:1963] CHIP:DMG: InvokeRequestMessage =
106+
[1698724321.817361][1963:1963] CHIP:DMG: {
107+
[1698724321.817413][1963:1963] CHIP:DMG: suppressResponse = false,
108+
[1698724321.817475][1963:1963] CHIP:DMG: timedRequest = false,
109+
[1698724321.817532][1963:1963] CHIP:DMG: InvokeRequests =
110+
[1698724321.817603][1963:1963] CHIP:DMG: [
111+
[1698724321.817659][1963:1963] CHIP:DMG: CommandDataIB =
112+
[1698724321.817723][1963:1963] CHIP:DMG: {
113+
[1698724321.817782][1963:1963] CHIP:DMG: CommandPathIB =
114+
[1698724321.817974][1963:1963] CHIP:DMG: {
115+
[1698724321.818045][1963:1963] CHIP:DMG: EndpointId = 0x1,
116+
[1698724321.818141][1963:1963] CHIP:DMG: ClusterId = 0x25,
117+
[1698724321.818232][1963:1963] CHIP:DMG: CommandId = 0x0,
118+
[1698724321.818319][1963:1963] CHIP:DMG: },
119+
[1698724321.818399][1963:1963] CHIP:DMG:
120+
[1698724321.818462][1963:1963] CHIP:DMG: CommandFields =
121+
[1698724321.818537][1963:1963] CHIP:DMG: {
122+
[1698724321.818607][1963:1963] CHIP:DMG: 0x0 = 4097,
123+
[1698724321.818697][1963:1963] CHIP:DMG: },
124+
[1698724321.818767][1963:1963] CHIP:DMG: },
125+
[1698724321.818838][1963:1963] CHIP:DMG:
126+
[1698724321.818894][1963:1963] CHIP:DMG: ],
127+
[1698724321.818963][1963:1963] CHIP:DMG:
128+
[1698724321.819017][1963:1963] CHIP:DMG: InteractionModelRevision = 11
129+
[1698724321.819088][1963:1963] CHIP:DMG: },
139130
disabled: true
140131

141132
- label: "Step 2: DUT issues an StartAction command to TH"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tests:
3232
3333
3. TH reads Reachable attribute from DUT and saves for future use
3434
35-
4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Basic cluster of the DUT
35+
4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Bridged Device Basic Information cluster of the DUT
3636
3737
5. TH saves the FabricIndex during commissioning
3838
disabled: true

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ tests:
345345
On TH_CR3 send the below command
346346
347347
Below is the example when using chip tool as controller (considering 36177160937 as the manual code generated by 1st controller)
348-
./chip-tool pairing code 1 36177160937 --commissioner-name gamma
348+
./chip-tool pairing code 3 36177160937 --commissioner-name gamma
349349
350350
verify you got the following message in the TH_CR3(chip-tool) log
351351
CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ tests:
157157
"Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
158158
field set to the extended PAN ID of
159159
PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 2"
160-
PICS: CNET.S.C04.Rsp
160+
PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
161161
verification: |
162162
./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
163163

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ tests:
110110
field set to 1"
111111
PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
112112
verification: |
113-
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> 1 0
113+
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> <password> 1 0
114114
115115
Below is an example:
116116
117-
./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
117+
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:536265655F4D6F746F Sunsuraj 1 0 --Breadcrumb 1 ( second network)
118118
119119
Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
120120
@@ -286,10 +286,10 @@ tests:
286286
field set to 1"
287287
PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
288288
verification: |
289-
./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
289+
./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> <password> 1 0
290290
291291
Below is an example:
292-
./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
292+
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:536265655F4D6F746F Sunsuraj 1 0 --Breadcrumb 1 ( second network)
293293
294294
Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
295295

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ tests:
119119
- label: "Step 3: DUT sends the AddOrUpdateWiFiNetwork command to the TH"
120120
PICS: CNET.C.C02.Tx
121121
verification: |
122-
./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
122+
./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> <password> 1 0
123123
124124
Below is an example:
125125

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ tests:
4141
T_ACCESSPOINT_CRE DENTIALS 3. Breadcrumb field set to 1"
4242
PICS: CNET.S.C02.Rsp
4343
verification: |
44-
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> 1 0
44+
./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> <password> 1 0
4545
4646
Below is an example:
4747
@@ -58,9 +58,9 @@ tests:
5858
"Step 2: TH sends RemoveNetwork command to the DUT with NetworkID
5959
field set to PIXIT.CNET.WIFI_1ST_ACCE SSPOINT_SSID and Breadcrumb
6060
field set to 1"
61-
PICS: CNET.S.C02.Rsp
61+
PICS: CNET.S.C04.Rsp
6262
verification: |
63-
./chip-tool networkcommissioning remove hex:<your network id in hex> 1 0
63+
./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
6464
6565
Below is an example:
6666
@@ -79,7 +79,7 @@ tests:
7979
field set to 1"
8080
PICS: CNET.S.C06.Rsp
8181
verification: |
82-
./chip-tool networkcommissioning connect hex:<your network id in hex> 1 0
82+
./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
8383
8484
Below is an example:
8585

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ tests:
164164
"Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
165165
field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
166166
set to 2"
167-
PICS: CNET.S.C04.Rsp
167+
PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
168168
verification: |
169169
./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
170170

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ tests:
2828
# command: "WaitForCommissioning"
2929

3030
- label: "DUT sends ResetCounts command to TH"
31-
PICS: DGWIFI.S.C00.Tx
31+
PICS: DGWIFI.C.C00.Tx
3232
wait: "ResetCounts"

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,9 @@ tests:
607607

608608
- label:
609609
"Step 5e: TH sends Set Credential Command to DUT with the following
610-
fields: OperationType as 0-Add Credential as 1 1- PIN, Index
611-
CredentialData as 123456 UserIndex as 1 UserStatus as 0 UserType as 0"
610+
fields: 1.OperationType as 0 2.Credential as 1 1- PIN, Index
611+
3.CredentialData as 123456 4.UserIndex as 1 5.UserStatus as null
612+
6.UserType as null"
612613
PICS: DRLK.S.F08 && DRLK.S.C22.Rsp && DRLK.S.C23.Tx
613614
verification: |
614615
./chip-tool doorlock clear-credential '{ "credentialType" : 1 , "credentialIndex" : 2 }' 1 1 --timedInteractionTimeoutMs 1000

0 commit comments

Comments
 (0)