Fix YAML script issues Aug 11 (#28656)

Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · Aug 16, 2023 · 76848fe · 76848fe
1 parent 4f8cb58
commit 76848fe
Show file tree

Hide file tree

Showing 77 changed files with 11,502 additions and 4,296 deletions.
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml
@@ -143,7 +143,51 @@ tests:
               type: list
               contains: [5]
 
-    - label: "Step 5: TH reads EventList attribute from DUT"
+    #List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
+    - label:
+          "Step 4f: TH reads AttributeList attribute from DUT. 1.The list SHALL
+          NOT contain any additional values in the standard or scoped range:
+          (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 - 0x0000_FFFE). 2.The
+          list MAY contain values in the Manufacturer Extensible Identifier
+          (MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where XXXX is the allowed
+          MEI range (0x0001 - 0xFFF1), these values SHALL be ignored. 3.The list
+          SHALL NOT contain any values in the Test Vendor or invalid range:
+          (0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF), (0xXXXX_5000 -
+          0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where XXXX is the
+          allowed MEI range (0x0001 - 0xFFF1)"
+      verification: |
+          ./chip-tool activatedcarbonfiltermonitoring read attribute-list 1 1
+
+          Via the TH (chip-tool), verify that the AttributeList attribute contains
+          - Mandatory entries:0x0002, 0xfff8, 0xfff9, 0xfffa, 0xfffb, 0xfffc & 0xfffd
+          - Optional entries:- 0x0003
+          - Based on feature support:- 0x0000, 0x0001
+
+          [1685958590.636044][11442:11444] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0072 Attribute 0x0000_FFFB DataVersion: 403478864
+          [1690179748.767756][7924:7926] CHIP:TOO:   AttributeList: 12 entries
+          [1690179748.767825][7924:7926] CHIP:TOO:     [1]: 0
+          [1690179748.767885][7924:7926] CHIP:TOO:     [2]: 1
+          [1690179748.767943][7924:7926] CHIP:TOO:     [3]: 2
+          [1690179748.767999][7924:7926] CHIP:TOO:     [4]: 3
+          [1690179748.768056][7924:7926] CHIP:TOO:     [5]: 4
+          [1690179748.768112][7924:7926] CHIP:TOO:     [6]: 5
+          [1690179748.768170][7924:7926] CHIP:TOO:     [7]: 65528
+          [1690179748.768227][7924:7926] CHIP:TOO:     [8]: 65529
+          [1690179748.768283][7924:7926] CHIP:TOO:     [9]: 65530
+          [1690179748.768340][7924:7926] CHIP:TOO:     [10]: 65531
+          [1690179748.768397][7924:7926] CHIP:TOO:     [11]: 65532
+          [1690179748.768454][7924:7926] CHIP:TOO:     [12]: 65533
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Step 5a: TH reads EventList attribute from DUT"
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "EventList"
@@ -152,16 +196,46 @@ tests:
           constraints:
               type: list
 
+    #List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
+    - label:
+          "Step 5b: TH reads from the DUT the EventList attribute. 1.The list
+          SHALL NOT contain any additional values in the standard or scoped
+          range: (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 - 0x0000_FFFE) 2.
+          The list MAY contain values in the Manufacturer Extensible Identifier
+          (MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where XXXX is the allowed
+          MEI range (0x0001 - 0xFFF1), these values SHALL be ignored. 3. The
+          list SHALL NOT contain any values in the Test Vendor or invalid range:
+          (0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF), (0xXXXX_5000 -
+          0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where XXXX is the
+          allowed MEI range (0x0001 - 0xFFF1)"
+      verification: |
+          ./chip-tool activatedcarbonfiltermonitoring read event-list 1 1
+
+          Via the TH (chip-tool), verify that the EventList attribute. Below mentioned log is based on the RPI implementation, Value may vary on real DUT
+
+          [1685958846.723249][11454:11456] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0072 Attribute 0x0000_FFFA DataVersion: 403478864
+          [1685958846.723431][11454:11456] CHIP:TOO:   EventList: 0 entries
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
     - label: "Step 6a: Read the global attribute: AcceptedCommandList"
+      PICS: "!ACFREMON.S.C00.Rsp"
       command: "readAttribute"
       attribute: "AcceptedCommandList"
       response:
+          value: []
           constraints:
               type: list
-              contains: []
 
     - label:
-          "Step 6b: Read the optional command (ResetCondition) in
+          "Step 6a: Read the optional command (ResetCondition) in
           AcceptedCommandList"
       PICS: ACFREMON.S.C00.Rsp
       command: "readAttribute"
@@ -171,10 +245,69 @@ tests:
               type: list
               contains: [0]
 
-    - label: "Step 7: Read the global attribute: GeneratedCommandList"
+    #List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
+    - label:
+          "Step 6b: TH reads from the DUT the AcceptedCommandList attribute.
+          1.The list SHALL NOT contain any additional values in the standard or
+          scoped range: (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 -
+          0x0000_FFFE). 2.The list MAY contain values in the Manufacturer
+          Extensible Identifier (MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where
+          XXXX is the allowed MEI range (0x0001 - 0xFFF1), these values SHALL be
+          ignored. 3.The list SHALL NOT contain any values in the Test Vendor or
+          invalid range: (0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF),
+          (0xXXXX_5000 - 0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where
+          XXXX is the allowed MEI range (0x0001 - 0xFFF1)"
+      verification: |
+          ./chip-tool activatedcarbonfiltermonitoring read accepted-command-list 1 1
+
+          Via the TH (chip-tool), verify that the AcceptedCommandList attribute. Below mentioned log is based on the RPI implementation, Value may vary on real DUT
+
+          [1685959114.395290][11468:11470] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0072 Attribute 0x0000_FFF9 DataVersion: 403478864
+          [1685959114.395414][11468:11470] CHIP:TOO:   AcceptedCommandList: 0 entries
+          [1690183785.805331][8169:8171] CHIP:TOO:     [1]: 0
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
+
+    - label: "Step 7a: Read the global attribute: GeneratedCommandList"
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response:
           value: []
           constraints:
               type: list
+
+    #List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
+    - label:
+          "Step 7b: TH reads from the DUT the GeneratedCommandList attribute.
+          1.The list SHALL NOT contain any additional values in the standard or
+          scoped range: (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 -
+          0x0000_FFFE). 2.The list MAY contain values in the Manufacturer
+          Extensible Identifier (MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where
+          XXXX is the allowed MEI range (0x0001 - 0xFFF1), these values SHALL be
+          ignored. 3.The list SHALL NOT contain any values in the Test Vendor or
+          invalid range: (0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF),
+          (0xXXXX_5000 - 0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where
+          XXXX is the allowed MEI range (0x0001 - 0xFFF1)"
+      verification: |
+          ./chip-tool activatedcarbonfiltermonitoring read generated-command-list 1 1
+
+          Via the TH (chip-tool), verify that the GeneratedCommandList attribute. Below mentioned log is based on the RPI implementation, Value may vary on real DUT
+
+          [1685959192.277991][11472:11474] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0072 Attribute 0x0000_FFF8 DataVersion: 403478864
+          [1685959192.278115][11472:11474] CHIP:TOO:   GeneratedCommandList: 0 entries
+      cluster: "LogCommands"
+      command: "UserPrompt"
+      PICS: PICS_USER_PROMPT
+      arguments:
+          values:
+              - name: "message"
+                value: "Please enter 'y' for success"
+              - name: "expectedValue"
+                value: "y"
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
@@ -32,7 +32,6 @@ tests:
                 value: nodeId
 
     - label: "Step 2: TH reads ClusterRevision attribute from DUT"
-      PICS: ACL.S.Afffd
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
@@ -41,7 +40,6 @@ tests:
               type: int16u
 
     - label: "Step 3: TH reads FeatureMap attribute from DUT"
-      PICS: ACL.S.Afffc
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -50,7 +48,7 @@ tests:
               type: bitmap32
 
     - label: "Step 4a: TH reads AttributeList attribute from DUT"
-      PICS: PICS_EVENT_LIST_ENABLED && ACL.S.Afffb
+      PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "AttributeList"
       response:
@@ -59,7 +57,7 @@ tests:
               contains: [0, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533]
 
     - label: "Step 4a: TH reads AttributeList attribute from DUT"
-      PICS: "!PICS_EVENT_LIST_ENABLED && ACL.S.Afffb"
+      PICS: "!PICS_EVENT_LIST_ENABLED"
       command: "readAttribute"
       attribute: "AttributeList"
       response:
@@ -68,7 +66,7 @@ tests:
               contains: [0, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
 
     - label: "Step 4b: TH reads optional attribute (Extension) in AttributeList"
-      PICS: ACL.S.A0001 && ACL.S.Afffb
+      PICS: ACL.S.A0001
       command: "readAttribute"
       attribute: "AttributeList"
       response:
@@ -108,7 +106,7 @@ tests:
           [1676270267.634334][20397:20399] CHIP:TOO:     [11]: 65533
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && ACL.S.Afffb
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
@@ -117,7 +115,7 @@ tests:
                 value: "y"
 
     - label: "Step 5a: TH reads EventList attribute from DUT"
-      PICS: PICS_EVENT_LIST_ENABLED && ACL.S.Afffa
+      PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "EventList"
       response:
@@ -138,8 +136,9 @@ tests:
       verification: |
           ./chip-tool accesscontrol read event-list 1 0
 
-          Verify " EventList attribute " consists the list of supported events,  which for this cluster should containing the following elements:
-          all mandatory events: AccessControlEntryChanged (0), AccessControlExtensionChanged (1) on the TH(Chip-tool) Log:
+          Via the TH (chip-tool), verify:
+          -that EventList attribute contains list of supported events.
+          -that list has two entries as value of 0 and 1 (if SAccessControlEntryChanged and AccessControlExtensionChanged event is supported).
 
           [1676456597.556478][24006:24008] CHIP:DMG: }
           [1676456597.556640][24006:24008] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFFA DataVersion: 3448736795
@@ -150,14 +149,15 @@ tests:
           [1676456597.556778][24006:24008] CHIP:IN: (S) Sending msg 55400435 on secure session with LSID: 1376
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && ACL.S.Afffa
+      PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
       arguments:
           values:
               - name: "message"
                 value: "Please enter 'y' for success"
               - name: "expectedValue"
                 value: "y"
 
+    # List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
     - label:
           "Step 6: TH reads AcceptedCommandList attribute from DUT. 1. The list
           MAY contain values in the Manufacturer Extensible Identifier (MEI)
@@ -184,14 +184,15 @@ tests:
           [1656478328.211313][2458:2463] CHIP:IN: Prepared secure message 0xffff8a2e3958 to 0x0000000000000001 (1)  of type 0x10 and protocolId (0, 0) on exchange 15270i with MessageCounter:229380798.
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && ACL.S.Afff9
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"
                 value: "Please enter 'y' for success"
               - name: "expectedValue"
                 value: "y"
 
+    # List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
     - label:
           "Step 7: TH reads GeneratedCommandList attribute from DUT. 1.The list
           MAY contain values in the Manufacturer Extensible Identifier (MEI)
@@ -219,7 +220,7 @@ tests:
           [1656478396.324967][2467:2472] CHIP:IN: Sending encrypted msg 0xffffab7ed958 with MessageCounter:243106706
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && ACL.S.Afff8
+      PICS: PICS_USER_PROMPT
       arguments:
           values:
               - name: "message"

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
@@ -74,19 +74,20 @@ tests:
               type: list
               contains: [2]
 
-    #EventList failure https://github.com/project-chip/connectedhomeip/issues/26571
     - label: "Step 5: TH reads EventList attribute from DUT"
       verification: |
           ./chip-tool actions read event-list 1 1
 
-          On TH(chip-tool), verify that DUT responds with list of supported events as 1 entry.
+          Via the TH (chip-tool), verify:
+          -that EventList attribute contains list of supported events.
+          -that list has 1 entry(0) for this cluster.
 
           [1676460741.103254][37023:37025] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFFA DataVersion: 928273128
           [1676460741.103303][37023:37025] CHIP:TOO:   EventList: 1 entries
           [1676460741.103320][37023:37025] CHIP:TOO:     [1]: 0
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
       arguments:
           values:
               - name: "message"