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 <[email protected]>
project-chip · Feb 13, 2024 · 1219374 · 1219374
1 parent 31c0c4e
commit 1219374
Show file tree

Hide file tree

Showing 19 changed files with 1,437 additions and 1,288 deletions.
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -7311,7 +7311,7 @@ PICS:
           "Reset the following attributes to 0; BeaconLostCount, BeaconRxCount,
           PacketMulticastRxCount, PacketMulticastTxCount, PacketUnicastRxCount,
           PacketUnicastTxCount"
-      id: DGWIFI.S.C00.Tx
+      id: DGWIFI.C.C00.Tx
 
     # Window Covering Cluster Test Plan
     - label:

diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
@@ -254,7 +254,9 @@ tests:
       cluster: "Descriptor"
       attribute: "DeviceTypeList"
 
-    - label: "Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"
+    - label:
+          "Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect UNSUPPORTED_ACCESS"
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
@@ -291,15 +293,19 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
+    - label:
+          "Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect SUCCESS"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
+    - label:
+          "Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
+          attribute - expect SUCCESS"
       verification: |
           ./chip-tool basicinformation read vendor-id 2 0 --commissioner-name beta
 

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml
@@ -45,97 +45,88 @@ tests:
 
           1. First read action-list by following command
 
-          ./chip-tool actions read action-list 1 1 --trace_decode 1
-
-          Via the TH (bridge-app), verify the ActionList attribute that contains ActionListStructs.
-
-          [1686033574.850552][39104:39106] CHIP:DMG: ReportDataMessage =
-          [1686033574.850639][39104:39106] CHIP:DMG: {
-          [1686033574.850689][39104:39106] CHIP:DMG:         AttributeReportIBs =
-          [1686033574.850802][39104:39106] CHIP:DMG:         [
-          [1686033574.850861][39104:39106] CHIP:DMG:                 AttributeReportIB =
-          [1686033574.850976][39104:39106] CHIP:DMG:                 {
-          [1686033574.851039][39104:39106] CHIP:DMG:                         AttributeDataIB =
-          [1686033574.851133][39104:39106] CHIP:DMG:                         {
-          [1686033574.851206][39104:39106] CHIP:DMG:                                 DataVersion = 0x17ed8ce2,
-          [1686033574.851299][39104:39106] CHIP:DMG:                                 AttributePathIB =
-          [1686033574.851375][39104:39106] CHIP:DMG:                                 {
-          [1686033574.851450][39104:39106] CHIP:DMG:                                         Endpoint = 0x1,
-          [1686033574.851557][39104:39106] CHIP:DMG:                                         Cluster = 0x25,
-          [1686033574.851658][39104:39106] CHIP:DMG:                                         Attribute = 0x0000_0000,
-          [1686033574.851736][39104:39106] CHIP:DMG:                                 }
-          [1686033574.851838][39104:39106] CHIP:DMG:
-          [1686033574.851914][39104:39106] CHIP:DMG:                                 Data = [
-          [1686033574.852009][39104:39106] CHIP:DMG:
-          [1686033574.852090][39104:39106] CHIP:DMG:                                         {
-          [1686033574.852194][39104:39106] CHIP:DMG:                                                 0x0 = 4097,
-          [1686033574.852287][39104:39106] CHIP:DMG:                                                 0x1 = "Room 1 On" (9 chars),
-          [1686033574.852393][39104:39106] CHIP:DMG:                                                 0x2 = 3,
-          [1686033574.852482][39104:39106] CHIP:DMG:                                                 0x3 = 57345,
-          [1686033574.852588][39104:39106] CHIP:DMG:                                                 0x4 = 1,
-          [1686033574.852692][39104:39106] CHIP:DMG:                                                 0x5 = 0,
-          [1686033574.852780][39104:39106] CHIP:DMG:                                         },
-          [1686033574.852880][39104:39106] CHIP:DMG:                                         {
-          [1686033574.852963][39104:39106] CHIP:DMG:                                                 0x0 = 4098,
-          [1686033574.853070][39104:39106] CHIP:DMG:                                                 0x1 = "Turn On Room 2" (14 chars),
-          [1686033574.853158][39104:39106] CHIP:DMG:                                                 0x2 = 3,
-          [1686033574.853311][39104:39106] CHIP:DMG:                                                 0x3 = 57346,
-          [1686033574.853428][39104:39106] CHIP:DMG:                                                 0x4 = 1,
-          [1686033574.853516][39104:39106] CHIP:DMG:                                                 0x5 = 0,
-          [1686033574.853621][39104:39106] CHIP:DMG:                                         },
-          [1686033574.853703][39104:39106] CHIP:DMG:                                 ],
-          [1686033574.853792][39104:39106] CHIP:DMG:                         },
-          [1686033574.853887][39104:39106] CHIP:DMG:
-          [1686033574.853969][39104:39106] CHIP:DMG:                 },
-          [1686033574.854059][39104:39106] CHIP:DMG:
-          [1686033574.854137][39104:39106] CHIP:DMG:         ],
-          [1686033574.854225][39104:39106] CHIP:DMG:
-          [1686033574.854283][39104:39106] CHIP:DMG:         SuppressResponse = true,
-          [1686033574.854342][39104:39106] CHIP:DMG:         InteractionModelRevision = 1
-          [1686033574.854395][39104:39106] CHIP:DMG: }
-
+          ./chip-tool actions read action-list 1 1
+
+          Via the TH (bridge-app), verify the ActionList attribute response.
+
+          [1698725144.232190][1963:1963] CHIP:IM: Received Read request
+          [1698725144.232296][1963:1963] CHIP:DMG: ReadRequestMessage =
+          [1698725144.232352][1963:1963] CHIP:DMG: {
+          [1698725144.232410][1963:1963] CHIP:DMG:         AttributePathIBs =
+          [1698725144.232484][1963:1963] CHIP:DMG:         [
+          [1698725144.232544][1963:1963] CHIP:DMG:                 AttributePathIB =
+          [1698725144.232608][1963:1963] CHIP:DMG:                 {
+          [1698725144.232688][1963:1963] CHIP:DMG:                         Endpoint = 0x1,
+          [1698725144.232758][1963:1963] CHIP:DMG:                         Cluster = 0x25,
+          [1698725144.232828][1963:1963] CHIP:DMG:                         Attribute = 0x0000_0000,
+          [1698725144.232893][1963:1963] CHIP:DMG:                 }
+          [1698725144.232959][1963:1963] CHIP:DMG:
+          [1698725144.233018][1963:1963] CHIP:DMG:         ],
+          [1698725144.233083][1963:1963] CHIP:DMG:
+          [1698725144.233142][1963:1963] CHIP:DMG:         isFabricFiltered = true,
+          [1698725144.233199][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698725144.233252][1963:1963] CHIP:DMG: },
+
+
+          ./chip-tool actions read endpoint-lists 1 1
+
+          Via the TH (chip-tool), verify the EndpointLists attribute that contains EndpointListStructs.
+
+          [1698729275.160463][1963:1963] CHIP:IM: Received Read request
+          [1698729275.160560][1963:1963] CHIP:DMG: ReadRequestMessage =
+          [1698729275.160618][1963:1963] CHIP:DMG: {
+          [1698729275.160668][1963:1963] CHIP:DMG:         AttributePathIBs =
+          [1698729275.160729][1963:1963] CHIP:DMG:         [
+          [1698729275.160785][1963:1963] CHIP:DMG:                 AttributePathIB =
+          [1698729275.160848][1963:1963] CHIP:DMG:                 {
+          [1698729275.160912][1963:1963] CHIP:DMG:                         Endpoint = 0x1,
+          [1698729275.160992][1963:1963] CHIP:DMG:                         Cluster = 0x25,
+          [1698729275.161070][1963:1963] CHIP:DMG:                         Attribute = 0x0000_0001,
+          [1698729275.161143][1963:1963] CHIP:DMG:                 }
+          [1698729275.161211][1963:1963] CHIP:DMG:
+          [1698729275.161270][1963:1963] CHIP:DMG:         ],
+          [1698729275.161335][1963:1963] CHIP:DMG:
+          [1698729275.161395][1963:1963] CHIP:DMG:         isFabricFiltered = true,
+          [1698729275.161452][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698729275.161505][1963:1963] CHIP:DMG: },
 
 
           2. Use the above obtained ActionID to verify the following commands
-           ./chip-tool actions instant-action 4097 1 1 --trace_decode 1
+           ./chip-tool actions instant-action 4097 1 1
       disabled: true
 
     - label: "Step 1: DUT issues an InstantAction command to TH"
       PICS: ACT.C.C00.Tx
       verification: |
-          ./chip-tool actions instant-action 4097 1 1 --trace_decode 1
-
-          Via the TH (bridge-app), verify the SUCCESS response for InstantAction.
-
-          [1686033693.327962][39117:39119] CHIP:DMG: InvokeResponseMessage =
-          [1686033693.328040][39117:39119] CHIP:DMG: {
-          [1686033693.328094][39117:39119] CHIP:DMG:         suppressResponse = false,
-          [1686033693.328151][39117:39119] CHIP:DMG:         InvokeResponseIBs =
-          [1686033693.328248][39117:39119] CHIP:DMG:         [
-          [1686033693.328307][39117:39119] CHIP:DMG:                 InvokeResponseIB =
-          [1686033693.328407][39117:39119] CHIP:DMG:                 {
-          [1686033693.328469][39117:39119] CHIP:DMG:                         CommandStatusIB =
-          [1686033693.328561][39117:39119] CHIP:DMG:                         {
-          [1686033693.328632][39117:39119] CHIP:DMG:                                 CommandPathIB =
-          [1686033693.328708][39117:39119] CHIP:DMG:                                 {
-          [1686033693.328807][39117:39119] CHIP:DMG:                                         EndpointId = 0x1,
-          [1686033693.328887][39117:39119] CHIP:DMG:                                         ClusterId = 0x25,
-          [1686033693.328987][39117:39119] CHIP:DMG:                                         CommandId = 0x0,
-          [1686033693.329062][39117:39119] CHIP:DMG:                                 },
-          [1686033693.329167][39117:39119] CHIP:DMG:
-          [1686033693.329237][39117:39119] CHIP:DMG:                                 StatusIB =
-          [1686033693.329376][39117:39119] CHIP:DMG:                                 {
-          [1686033693.329454][39117:39119] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1686033693.329551][39117:39119] CHIP:DMG:                                 },
-          [1686033693.329629][39117:39119] CHIP:DMG:
-          [1686033693.329716][39117:39119] CHIP:DMG:                         },
-          [1686033693.329794][39117:39119] CHIP:DMG:
-          [1686033693.329876][39117:39119] CHIP:DMG:                 },
-          [1686033693.329950][39117:39119] CHIP:DMG:
-          [1686033693.330005][39117:39119] CHIP:DMG:         ],
-          [1686033693.330101][39117:39119] CHIP:DMG:
-          [1686033693.330158][39117:39119] CHIP:DMG:         InteractionModelRevision = 1
-          [1686033693.330241][39117:39119] CHIP:DMG: },
+          ./chip-tool actions instant-action 4097 1 1
+
+          Via the TH (bridge-app), verify the InstantAction response that contains ActionID .
+
+          [1698724321.817293][1963:1963] CHIP:DMG: InvokeRequestMessage =
+          [1698724321.817361][1963:1963] CHIP:DMG: {
+          [1698724321.817413][1963:1963] CHIP:DMG:         suppressResponse = false,
+          [1698724321.817475][1963:1963] CHIP:DMG:         timedRequest = false,
+          [1698724321.817532][1963:1963] CHIP:DMG:         InvokeRequests =
+          [1698724321.817603][1963:1963] CHIP:DMG:         [
+          [1698724321.817659][1963:1963] CHIP:DMG:                 CommandDataIB =
+          [1698724321.817723][1963:1963] CHIP:DMG:                 {
+          [1698724321.817782][1963:1963] CHIP:DMG:                         CommandPathIB =
+          [1698724321.817974][1963:1963] CHIP:DMG:                         {
+          [1698724321.818045][1963:1963] CHIP:DMG:                                 EndpointId = 0x1,
+          [1698724321.818141][1963:1963] CHIP:DMG:                                 ClusterId = 0x25,
+          [1698724321.818232][1963:1963] CHIP:DMG:                                 CommandId = 0x0,
+          [1698724321.818319][1963:1963] CHIP:DMG:                         },
+          [1698724321.818399][1963:1963] CHIP:DMG:
+          [1698724321.818462][1963:1963] CHIP:DMG:                         CommandFields =
+          [1698724321.818537][1963:1963] CHIP:DMG:                         {
+          [1698724321.818607][1963:1963] CHIP:DMG:                                 0x0 = 4097,
+          [1698724321.818697][1963:1963] CHIP:DMG:                         },
+          [1698724321.818767][1963:1963] CHIP:DMG:                 },
+          [1698724321.818838][1963:1963] CHIP:DMG:
+          [1698724321.818894][1963:1963] CHIP:DMG:         ],
+          [1698724321.818963][1963:1963] CHIP:DMG:
+          [1698724321.819017][1963:1963] CHIP:DMG:         InteractionModelRevision = 11
+          [1698724321.819088][1963:1963] CHIP:DMG: },
       disabled: true
 
     - label: "Step 2: DUT issues an StartAction command to TH"

diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_2.yaml
@@ -32,7 +32,7 @@ tests:
 
           3. TH reads Reachable attribute from DUT and saves for future use
 
-          4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Basic cluster of the DUT
+          4. TH subscribes to StartUp, ShutDown, ReachableChanged and Leave events on the Bridged Device Basic Information cluster of the DUT
 
           5. TH saves the FabricIndex during commissioning
       disabled: true

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
@@ -345,7 +345,7 @@ tests:
           On TH_CR3 send the below command
 
           Below is the example when using chip tool as controller (considering 36177160937 as the manual code generated by 1st controller)
-          ./chip-tool pairing code 1 36177160937 --commissioner-name gamma
+          ./chip-tool pairing code 3 36177160937 --commissioner-name gamma
 
           verify you got the following message in the TH_CR3(chip-tool) log
           CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_10.yaml
@@ -157,7 +157,7 @@ tests:
           "Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to the extended PAN ID of
           PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and Breadcrumb field set to 2"
-      PICS: CNET.S.C04.Rsp
+      PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
       verification: |
           ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
 

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml
@@ -110,11 +110,11 @@ tests:
           field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
       verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:<your network id in hex> <password> 1 0
 
           Below is an example:
 
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:536265655F4D6F746F Sunsuraj 1 0 --Breadcrumb 1 ( second network)
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
 
@@ -286,10 +286,10 @@ tests:
           field set to 1"
       PICS: CNET.S.C02.Rsp && CNET.S.C05.Tx
       verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> <password> 1 0
 
           Below is an example:
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network Sbee_Moto Sunsuraj 1 0 --Breadcrumb 1 ( second network)
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network hex:536265655F4D6F746F Sunsuraj 1 0 --Breadcrumb 1 ( second network)
 
           Via the TH (chip-tool), Verify the NetworkConfigResponse that contains Networking Status value as 0 (success).
 

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_20.yaml
@@ -119,7 +119,7 @@ tests:
     - label: "Step 3: DUT sends the AddOrUpdateWiFiNetwork command to the TH"
       PICS: CNET.C.C02.Tx
       verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network-network hex:<your network id in hex> <password> 1 0
 
           Below is an example:
 

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml
@@ -41,7 +41,7 @@ tests:
           T_ACCESSPOINT_CRE DENTIALS 3. Breadcrumb field set to 1"
       PICS: CNET.S.C02.Rsp
       verification: |
-          ./chip-tool networkcommissioning add-or-update-wi-fi-network  hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning add-or-update-wi-fi-network  hex:<your network id in hex> <password> 1 0
 
           Below is an example:
 
@@ -58,9 +58,9 @@ tests:
           "Step 2: TH sends RemoveNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCE SSPOINT_SSID and Breadcrumb
           field set to 1"
-      PICS: CNET.S.C02.Rsp
+      PICS: CNET.S.C04.Rsp
       verification: |
-          ./chip-tool networkcommissioning remove hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning remove-network hex:<your network id in hex> 1 0
 
           Below is an example:
 
@@ -79,7 +79,7 @@ tests:
           field set to 1"
       PICS: CNET.S.C06.Rsp
       verification: |
-          ./chip-tool networkcommissioning connect hex:<your network id in hex> 1 0
+          ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
 
           Below is an example:
 

diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_9.yaml
@@ -164,7 +164,7 @@ tests:
           "Step 9: TH sends ConnectNetwork command to the DUT with NetworkID
           field set to PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and Breadcrumb field
           set to 2"
-      PICS: CNET.S.C04.Rsp
+      PICS: CNET.S.C04.Rsp && CNET.S.C06.Rsp
       verification: |
           ./chip-tool networkcommissioning connect-network hex:<your network id in hex> 1 0
 

diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_3_2_Simulated.yaml
@@ -28,5 +28,5 @@ tests:
     #  command: "WaitForCommissioning"
 
     - label: "DUT sends ResetCounts command to TH"
-      PICS: DGWIFI.S.C00.Tx
+      PICS: DGWIFI.C.C00.Tx
       wait: "ResetCounts"
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_10.yaml
@@ -607,8 +607,9 @@ tests:
 
     - label:
           "Step 5e: TH sends Set Credential Command to DUT with the following
-          fields: OperationType as 0-Add Credential as 1 1- PIN, Index
-          CredentialData as 123456 UserIndex as 1 UserStatus as 0 UserType as 0"
+          fields: 1.OperationType as 0 2.Credential as 1 1- PIN, Index
+          3.CredentialData as 123456 4.UserIndex as 1 5.UserStatus as null
+          6.UserType as null"
       PICS: DRLK.S.F08 && DRLK.S.C22.Rsp && DRLK.S.C23.Tx
       verification: |
           ./chip-tool doorlock clear-credential  '{ "credentialType" : 1 , "credentialIndex" : 2 }'  1 1 --timedInteractionTimeoutMs 1000