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 <[email protected]>
project-chip · Dec 5, 2023 · 6ccb9d2 · 6ccb9d2
1 parent 540dddb
commit 6ccb9d2
Show file tree

Hide file tree

Showing 19 changed files with 253 additions and 206 deletions.
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -891,7 +891,7 @@ PICS:
     - label:
           "Can the StateValue attribute be changed by manual operation at the
           DUT?"
-      id: BOOL.M.ManuallyControlled
+      id: BOOL.S.M.ManuallyControlled
 
     #
     # client / manually
@@ -6066,10 +6066,10 @@ PICS:
     #
     - label:
           "Does the DUT support reading attribute to get switch state (polling)?"
-      id: SWTCH.C.M.RA
+      id: SWTCH.C.M.SwitchStatePolling
 
     - label: "Does the DUT support eventing to get switch state changes?"
-      id: SWTCH.C.M.EV
+      id: SWTCH.C.M.SwitchStateEventing
 
     - label: "Write all supported optional attributes"
       id: SWTCH.C.AO-WRITE

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml
@@ -500,10 +500,11 @@ tests:
 
     - label: "Step 4c: subscribe to StateChanged and ActionFailed events"
       verification: |
-          To subscribe StateChanged event follow below steps
+          To subscribe StateChanged and ActionFailed event follow below steps
 
           1) ./chip-tool interactive start
-          2) actions subscribe-event action-failed 2 30 1 0
+
+          2) actions subscribe-event action-failed 2 30 1 1
 
           Via the TH (chip-tool), Verify ActionFailed event subscription.
 
@@ -530,14 +531,28 @@ tests:
           [1659962630.456551][25381:25386] CHIP:DMG: }
           [1659962630.456563][25381:25386] CHIP:DMG: Subscription established with SubscriptionID = 0x78f0a04c MinInterval = 0s MaxInterval = 100s Peer = 01:0000000000000001
 
-          3) actions  instant-action  0x1001 1 1
-
-          Via the TH (chip-tool), Verify the SUCCESS response for instant-action.
-
-          [1659955888.114483][23216:23221] CHIP:DMG:                                 StatusIB =
-          [1659955888.114499][23216:23221] CHIP:DMG:                                 {
-          [1659955888.114515][23216:23221] CHIP:DMG:                                         status = 0x00 (SUCCESS),
-          [1659955888.114529][23216:23221] CHIP:DMG:                                 },
+          3) actions subscribe-event state-changed 2 30 1 1
+
+          Via the TH (chip-tool), Verify StateChanged event subscription.
+
+          [1696947597.397495][20187:20190] CHIP:DMG: ReportDataMessage =
+          [1696947597.397508][20187:20190] CHIP:DMG: {
+          [1696947597.397517][20187:20190] CHIP:DMG:         SubscriptionId = 0x78906430,
+          [1696947597.397529][20187:20190] CHIP:DMG:         InteractionModelRevision = 11
+          [1696947597.397539][20187:20190] CHIP:DMG: }
+          [1696947597.397561][20187:20190] CHIP:DMG: MoveToState ReadClient[0x7fe364020f30]: Moving to [AwaitingSu]
+          [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)
+          [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)
+          [1696947597.398292][20187:20190] CHIP:EM: Found matching exchange: 22246i, Delegate: 0x7fe364020f40
+          [1696947597.398314][20187:20190] CHIP:EM: Rxd Ack; Removing MessageCounter:21569658 from Retrans Table on exchange 22246i
+          [1696947597.398334][20187:20190] CHIP:DMG: SubscribeResponse is received
+          [1696947597.398356][20187:20190] CHIP:DMG: SubscribeResponseMessage =
+          [1696947597.398369][20187:20190] CHIP:DMG: {
+          [1696947597.398382][20187:20190] CHIP:DMG:         SubscriptionId = 0x78906430,
+          [1696947597.398394][20187:20190] CHIP:DMG:         MaxInterval = 0x1e,
+          [1696947597.398407][20187:20190] CHIP:DMG:         InteractionModelRevision = 11
+          [1696947597.398417][20187:20190] CHIP:DMG: }
+          [1696947597.398431][20187:20190] CHIP:DMG: Subscription established with SubscriptionID = 0x78906430 MinInterval = 2s MaxInterval = 30s Peer = 01:0000000000000001
       disabled: true
 
     - label:
@@ -546,7 +561,7 @@ tests:
           SupportedCommands in this ActionStruct) by sending the command with
           this particular ActionID and a random value for InvokeID"
       verification: |
-          Only InstantActions  command is supported
+          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):
 
           ./chip-tool actions  instant-action  0x1001 1 1
 
@@ -556,11 +571,21 @@ tests:
           [1659955888.114499][23216:23221] CHIP:DMG:                                 {
           [1659955888.114515][23216:23221] CHIP:DMG:                                         status = 0x00 (SUCCESS),
           [1659955888.114529][23216:23221] CHIP:DMG:                                 },
+
+
+          ./chip-tool actions  instant-action  0x1003 1 1
+
+          Via the TH (chip-tool), Verify the SUCCESS response for instant-action.
+
+          [1659955888.114483][23216:23221] CHIP:DMG:                                 StatusIB =
+          [1659955888.114499][23216:23221] CHIP:DMG:                                 {
+          [1659955888.114515][23216:23221] CHIP:DMG:                                         status = 0x00 (SUCCESS),
+          [1659955888.114529][23216:23221] CHIP:DMG:                                 },
       disabled: true
 
     - label:
           "Step 4e: repeat 4d for the other SupportedCommands of each
           ActionStruct"
       verification: |
-          Only InstantActions command is supported
+          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)
       disabled: true
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
@@ -132,9 +132,7 @@ tests:
     - label: "Step 2: DUT issues an StartAction command to TH"
       PICS: ACT.C.C02.Tx
       verification: |
-          ./chip-tool actions start-action 0 1 1
-
-          Note: Message log similar as in step 1
+          The reference app doesn't have implementation for this command
       disabled: true
 
     - label: "Step 3: DUT issues an StopAction command to TH"

diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml
@@ -19,6 +19,7 @@ name:
 
 PICS:
     - BIND.C
+    - GRPKEY.C
 
 config:
     nodeId: 0x12344321

diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
@@ -19,6 +19,7 @@ name:
 
 PICS:
     - BIND.C
+    - GRPKEY.C
 
 config:
     nodeId: 0x12344321

diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml
@@ -65,35 +65,35 @@ tests:
               type: list
               contains: [0, 65528, 65529, 65531, 65532, 65533]
 
-    - label: "Step 5: Read the global attribute: AcceptedCommandList"
+    - label: "Step 5: Read the global attribute: EventList"
+      PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
-      attribute: "AcceptedCommandList"
+      attribute: "EventList"
       response:
-          value: []
+          value: [0]
           constraints:
               type: list
 
-    - label: "Step 6: Read the global attribute: GeneratedCommandList"
+    - label: "Step 5: Read the global attribute: EventList"
+      PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED "
       command: "readAttribute"
-      attribute: "GeneratedCommandList"
+      attribute: "EventList"
       response:
           value: []
           constraints:
               type: list
 
-    - label: "Step 7: Read the global attribute: EventList"
-      PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED
+    - label: "Step 6: Read the global attribute: AcceptedCommandList"
       command: "readAttribute"
-      attribute: "EventList"
+      attribute: "AcceptedCommandList"
       response:
-          value: [0]
+          value: []
           constraints:
               type: list
 
-    - label: "Step 7: Read the global attribute: EventList"
-      PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED "
+    - label: "Step 7: Read the global attribute: GeneratedCommandList"
       command: "readAttribute"
-      attribute: "EventList"
+      attribute: "GeneratedCommandList"
       response:
           value: []
           constraints:

diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
@@ -37,13 +37,13 @@ tests:
       disabled: true
 
     - label: "Step 2a: Bring the DUT into a state so StateValue is FALSE."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           Manual operation
       disabled: true
 
     - label: "Step 2b: TH reads the StateValue attribute from the DUT."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
@@ -54,13 +54,13 @@ tests:
       disabled: true
 
     - label: "Step 3a: Bring the DUT into a state so StateValue is TRUE."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           Manual operation
       disabled: true
 
     - label: "Step 3b: TH reads the StateValue attribute from the DUT."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000
       verification: |
           ./chip-tool booleanstate read state-value 1 1
 
@@ -71,7 +71,7 @@ tests:
       disabled: true
 
     - label: "Step 4a: Set up subscription to StateChange event."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           This event is not supported in all clusters app, so there are no reference logs.
 
@@ -84,13 +84,13 @@ tests:
       disabled: true
 
     - label: "Step 4b: Bring the DUT into a state so StateValue is FALSE."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           Verify the StateValue value is FALSE On TH(chip-tool), if the state-change event is generated
       disabled: true
 
     - label: "Step 4c: TH reads the StateValue attribute from the DUT."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           This event is not supported in all clusters app, so there are no reference logs.
 
@@ -100,13 +100,13 @@ tests:
       disabled: true
 
     - label: "Step 4d: Bring the DUT into a state so StateValue is TRUE."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           Verify the StateValue value is TRUE On TH(chip-tool),  if the state-change event is generated
       disabled: true
 
     - label: "Step 4e: TH reads the StateValue attribute from the DUT."
-      PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
+      PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000
       verification: |
           booleanstate read state-value 1 1
 

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml
@@ -147,15 +147,16 @@ tests:
       verification: |
           On TH_CR2 send the below command
 
-            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
+          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
 
           ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta
 
           verify you got the following message in the TH_CR2(CHIP-TOOL) log
 
-          CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33
-          CHIP:TOO: Secure Pairing Failed
-          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+          [1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
+          [1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
+          [1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
+          [1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
       disabled: true
 
     - label:
@@ -268,13 +269,14 @@ tests:
       verification: |
           On TH_CR3 send the below command
 
-            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
+          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
 
           ./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma
 
-          verify you got the following message in the TH_CR3(Chip-tool) log
+          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
-          CHIP:TOO: Secure Pairing Failed
-          CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout
+          [1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
+          [1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
+          [1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
+          [1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
       disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -29,16 +29,11 @@ config:
     TEST_EVENT_TRIGGER_KEY:
         type: int64u
         defaultValue: "0x0000000000000003"
+    payload:
+        type: char_string
+        defaultValue: "MT:-24J0AFN00KA0648G00"
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
-      cluster: "DelayCommands"
-      command: "WaitForCommissionee"
-      arguments:
-          values:
-              - name: "nodeId"
-                value: nodeId
-
     - label: "Step 1a: Reset Devices to factory defaults"
       PICS: PICS_SDK_CI_ONLY
       cluster: "SystemCommands"
@@ -57,6 +52,16 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
+    - label: "Step 1a: TH starts a commissioning process with DUT"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
     - label: "Step 1b: Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
@@ -393,6 +398,7 @@ tests:
               minValue: 0x0
               maxValue: 0xFFFFFFFE
 
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/29580
     - label: "Wait for 2 hours and 5 minutes."
       PICS: DGGEN.S.A0003
       cluster: "DelayCommands"
@@ -432,6 +438,16 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
+    - label: "Step 10b: TH starts a commissioning process with DUT"
+      cluster: "CommissionerCommands"
+      command: "PairWithCode"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+              - name: "payload"
+                value: payload
+
     - label: "Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
@@ -451,6 +467,7 @@ tests:
           constraints:
               type: int32u
 
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/29580
     - label: "Wait for 1 hour 5 minutes."
       PICS: DGGEN.S.A0003
       cluster: "DelayCommands"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ name: @@
     PICS:
         - BIND.C
+        - GRPKEY.C
     config:
         nodeId: 0x12344321
@@ Expand Down @@