Modified yaml scripts Jan 09

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

@@ -36,7 +36,7 @@ config:
         defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
 
 tests:
-    - label: "Step 1: Wait for the commissioned device to be retrieved for TH1"
+    - label: "Step 1: TH1 commissions DUT using admin node ID N1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -81,7 +81,7 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 2: Open Commissioning Window from alpha"
+    - label: "Step 2: TH1 opens the commissioning window on the DUT"
       cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
@@ -108,7 +108,7 @@ tests:
               - name: "ms"
                 value: waitAfterCommissioning
 
-    - label: "Step 3: Commission from TH2"
+    - label: "Step 3: TH2 commissions DUT using admin node ID N2"
       identity: "beta"
       cluster: "CommissionerCommands"
       command: "PairWithCode"
@@ -130,7 +130,9 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Step 4: TH2 reads the fabric index"
+    - label:
+          "Step 4: TH2 reads its fabric index from the Operational Credentials
+          cluster CurrentFabricIndex attribute"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       cluster: "Operational Credentials"
@@ -169,7 +171,14 @@ tests:
                 saveAs: commissionerNodeIdAlpha
 
     - label:
-          "Step 5: TH1 writes ACL giving view privilege for descriptor cluster"
+          "Step 5: TH1 writes DUT Endpoint 0 AccessControl cluster ACL
+          attribute,value is list of AccessControlEntryStruct containing 2
+          elements 1.Struct : a)Fabric Index: 1 b)Privilege field: Administer
+          (5) c)AuthMode field: CASE (2) d)Subjects field: [N1] e)Targets
+          field:[{Cluster: AccessControl (0x001f), Endpoint: 0}] 2.struct :
+          a)Fabric Index: 1 b)Privilege field: View (1) c)AuthMode field: CASE
+          (2) d)Subjects field: null e)Targets field: [{Cluster: Descriptor
+          (0x001d), Endpoint: 0}]"
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
@@ -202,7 +211,12 @@ tests:
               - name: "nodeId"
                 saveAs: commissionerNodeIdBeta
 
-    - label: "Step 6: TH2 writes ACL giving view privilge for basic cluster"
+    - label:
+          "Step 6: TH2 writes DUT Endpoint 0 AccessControl cluster ACL
+          attribute,value is list of AccessControlEntryStruct containing 2
+          elements 1.Struct : a)Fabric Index: th2FabricIndex b)Privilege field:
+          Administer (5) c)AuthMode field: CASE (2) d)Subjects field: [N2]
+          e)Targets field: [{Cluster: AccessControl (0x001f), Endpoint: 0}]"
       identity: beta
       PICS: PICS_SDK_CI_ONLY
       command: "writeAttribute"
@@ -249,21 +263,25 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 7: TH1 reads descriptor cluster - expect SUCCESS"
+    - label:
+          "Step 7: TH1 reads DUT Endpoint 0 Descriptor cluster DeviceTypeList
+          attribute"
       command: "readAttribute"
       cluster: "Descriptor"
       attribute: "DeviceTypeList"
 
     - label:
           "Step 8: TH1 reads DUT Endpoint 0 Basic Information cluster VendorID
-          attribute - expect UNSUPPORTED_ACCESS"
+          attribute"
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
       response:
           error: UNSUPPORTED_ACCESS
 
-    - label: "Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"
+    - label:
+          "Step 9: TH2 reads DUT Endpoint 0 Descriptor cluster DeviceTypeList
+          attribute"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
@@ -295,7 +313,7 @@ tests:
 
     - label:
           "Step 10: TH2 reads DUT Endpoint 0 Basic Information cluster VendorID
-          attribute - expect SUCCESS"
+          attribute"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
@@ -324,7 +342,12 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 11: TH1 resets ACL to default"
+    - label:
+          "Step 11: TH1 resets the ACLs to the default value bywriting DUT
+          Endpoint 0 AccessControl cluster ACL attribute,value is list of
+          AccessControlEntryStruct containing 1 elements 1.Struct : a)Fabric
+          Index: 1 b)Privilege field: Administer (5) c)AuthMode field: CASE (2)
+          d)Subjects field: [N1] e)Targets field: null"
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
@@ -338,7 +361,9 @@ tests:
                   },
               ]
 
-    - label: "Step 12: TH1 sends RemoveFabric command for TH2"
+    - label:
+          "Step 12: TH1 removes the TH2 fabric by sending the RemoveFabric
+          command to the DUT with the FabricIndex set to th2FabricIndex"
       cluster: "Operational Credentials"
       PICS: PICS_SDK_CI_ONLY
       command: "RemoveFabric"
@@ -348,7 +373,9 @@ tests:
                 value: th2FabricIndex
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "Step 12: TH1 sends RemoveFabric command for TH2"
+    - label:
+          "Step 12: TH1 removes the TH2 fabric by sending the RemoveFabric
+          commandto the DUT with the FabricIndex set to th2FabricIndex"
       verification: |
           ./chip-tool operationalcredentials remove-fabric 2 1 0
 

src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml

@@ -23,23 +23,25 @@ config:
     endpoint: 1
 
 tests:
-    - label: "Step 1: Wait for the commissioned device to be retrieved"
+    - label:
+          "Step 1: Commission DUT to TH (can be skipped if done in a preceding
+          test)."
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
           values:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Step 2: Read the global attribute: ClusterRevision"
+    - label: "Step 2: TH reads from the DUT the ClusterRevision attribute."
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
           value: 1
           constraints:
               type: int16u
 
-    - label: "Step 3a: Read the global attribute: FeatureMap"
+    - label: "Step 3a: TH reads from the DUT the FeatureMap attribute."
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: "!ACFREMON.S.F00 && !ACFREMON.S.F01 && !ACFREMON.S.F02"
@@ -81,7 +83,7 @@ tests:
               type: bitmap32
               hasMasksSet: [0x4]
 
-    - label: "Step 4a: Read the global attribute: AttributeList"
+    - label: "Step 4a: TH reads from the DUT the AttributeList attribute."
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "AttributeList"
@@ -90,7 +92,7 @@ tests:
               type: list
               contains: [2, 65528, 65529, 65530, 65531, 65532, 65533]
 
-    - label: "Step 4a: Read the global attribute: AttributeList"
+    - label: "Step 4a: TH reads from the DUT the AttributeList attribute."
       PICS: "!PICS_EVENT_LIST_ENABLED"
       command: "readAttribute"
       attribute: "AttributeList"
@@ -100,7 +102,7 @@ tests:
               contains: [2, 65528, 65529, 65531, 65532, 65533]
 
     - label:
-          "Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in
+          "Step 4b: TH reads the feature dependent(ACFREMON.S.F00) attribute in
           AttributeList"
       PICS: ACFREMON.S.F00
       command: "readAttribute"
@@ -111,7 +113,7 @@ tests:
               contains: [0, 1, 2]
 
     - label:
-          "Step 4c: Read the optional attribute InPlaceIndicator
+          "Step 4c: TH reads the optional attribute InPlaceIndicator
           (ACFREMON.S.A0003) in AttributeList"
       PICS: ACFREMON.S.A0003
       command: "readAttribute"
@@ -122,7 +124,7 @@ tests:
               contains: [3]
 
     - label:
-          "Step 4d: Read the optional attribute LastChangedTime
+          "Step 4d: TH reads the optional attribute LastChangedTime
           (ACFREMON.S.A0004) in AttributeList"
       PICS: ACFREMON.S.A0004
       command: "readAttribute"
@@ -133,7 +135,7 @@ tests:
               contains: [4]
 
     - label:
-          "Step 4e: Read the optional attribute ReplacementProductList
+          "Step 4e: TH reads the optional attribute ReplacementProductList
           (ACFREMON.S.F02) in AttributeList"
       PICS: ACFREMON.S.F02
       command: "readAttribute"
@@ -152,7 +154,7 @@ tests:
           constraints:
               type: list
 
-    - label: "Step 6: Read the global attribute: AcceptedCommandList"
+    - label: "Step 6a: TH reads from the DUT the AcceptedCommandList attribute."
       PICS: "!ACFREMON.S.C00.Rsp"
       command: "readAttribute"
       attribute: "AcceptedCommandList"
@@ -162,7 +164,7 @@ tests:
               type: list
 
     - label:
-          "Step 6: Read the optional command (ResetCondition) in
+          "Step 6b: TH reads the optional command (ResetCondition) in
           AcceptedCommandList"
       PICS: ACFREMON.S.C00.Rsp
       command: "readAttribute"
@@ -172,7 +174,7 @@ tests:
               type: list
               contains: [0]
 
-    - label: "Step 7: Read the global attribute: GeneratedCommandList"
+    - label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response:

src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml

@@ -45,7 +45,7 @@ config:
         defaultValue: "hex:17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
 
 tests:
-    - label: "Step 1:Wait for the commissioned device to be retrieved"
+    - label: "Step 1:TH1 commissions DUT using admin node ID N1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -70,7 +70,9 @@ tests:
       response:
           saveAs: TH1FabricIndex
 
-    - label: "Step 3:TH1 puts DUT into commissioning mode"
+    - label:
+          "Step 3:TH1 puts DUT into commissioning mode, TH2 commissions DUT
+          using admin node ID N2"
       PICS: PICS_SDK_CI_ONLY && CADMIN.S.C00.Rsp
       cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
@@ -193,7 +195,12 @@ tests:
                 value: "y"
 
     - label:
-          "Step 5:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
+          "Step 5:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute,
+          value is list of AccessControlEntryStruct containing 2 elements
+          1.struct : a)Privilege field: Administer (5) b)AuthMode field: CASE
+          (2) c)Subjects field: [N1, 1111] d)Targets field: null 2.Struct :
+          a)Privilege field: Operate (3) b)AuthMode field: Group (3) c)Subjects
+          field: [3333] d)Targets field: null"
       PICS: ACL.S.A0000
       command: "writeAttribute"
       attribute: "ACL"
@@ -217,7 +224,12 @@ tests:
               ]
 
     - label:
-          "Step 6:TH2 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
+          "Step 6:TH2 writes DUT Endpoint 0 AccessControl cluster ACL attribute
+          value is list of AccessControlEntryStruct containing 2 elements
+          1.Struct : a)Privilege field: Administer (5) b)AuthMode field: CASE
+          (2) c)Subjects field: [N2, 2222] d)Targets field: null  2.Struct :
+          a)Privilege field: Operate (3) b)AuthMode field: Group (3) c)Subjects
+          field:  [4444] d)Targets field: null"
       PICS: ACL.S.A0000 && PICS_SDK_CI_ONLY
       identity: "beta"
       command: "writeAttribute"

src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml

@@ -55,7 +55,10 @@ tests:
           saveAs: CurrentFabricIndexValue
 
     - label:
-          "Step 2:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
+          "Step 2:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute,
+          value is list of AccessControlEntryStruct containing 1 element
+          1.Struct :  a)Privilege field: Manage (4) b)AuthMode field: CASE (2)
+          c)Subjects field: [N1] d)Targets field: null"
       PICS: ACL.S.A0000
       command: "writeAttribute"
       attribute: "ACL"
@@ -80,7 +83,10 @@ tests:
           error: UNSUPPORTED_ACCESS
 
     - label:
-          "Step 4:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
+          "Step 4:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute,
+          value is list of AccessControlEntryStruct containing 1 element
+          1.Struct : a)Privilege field: Administer (5) b)AuthMode field: CASE
+          (2) c)Subjects field: [N1] d)argets field: null"
       PICS: ACL.S.A0000
       command: "writeAttribute"
       attribute: "ACL"
@@ -109,7 +115,7 @@ tests:
 
     - label:
           "Step 6:TH1 writes DUT Endpoint 0 AccessControl cluster Extension
-          attribute"
+          attribute, value is an empty list"
       PICS: ACL.S.A0001
       command: "writeAttribute"
       attribute: "Extension"

src/app/tests/suites/certification/Test_TC_AIRQUAL_1_1.yaml

@@ -31,15 +31,15 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Step 2: Read the global attribute: ClusterRevision"
+    - label: "Step 2: TH reads from the DUT the ClusterRevision attribute."
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
           value: 1
           constraints:
               type: int16u
 
-    - label: "Step 3a: Read the global attribute: FeatureMap"
+    - label: "Step 3a: TH reads from the DUT the FeatureMap attribute."
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS:
@@ -93,7 +93,7 @@ tests:
               type: bitmap32
               hasMasksSet: [0x8]
 
-    - label: "Step 4: Read the global attribute: AttributeList"
+    - label: "Step 4: TH reads from the DUT the AttributeList attribute."
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "AttributeList"
@@ -102,7 +102,7 @@ tests:
               type: list
               contains: [0, 65528, 65529, 65530, 65531, 65532, 65533]
 
-    - label: "Step 4: Read the global attribute: AttributeList"
+    - label: "Step 4: TH reads from the DUT the AttributeList attribute."
       PICS: "!PICS_EVENT_LIST_ENABLED"
       command: "readAttribute"
       attribute: "AttributeList"
@@ -111,7 +111,7 @@ tests:
               type: list
               contains: [0, 65528, 65529, 65531, 65532, 65533]
 
-    - label: "Step 5: TH reads EventList attribute from DUT"
+    - label: "Step 5: TH reads from the DUT the EventList attribute."
       PICS: PICS_EVENT_LIST_ENABLED
       command: "readAttribute"
       attribute: "EventList"
@@ -120,15 +120,15 @@ tests:
           constraints:
               type: list
 
-    - label: "Step 6: Read the global attribute: AcceptedCommandList"
+    - label: "Step 6: TH reads from the DUT the AcceptedCommandList attribute."
       command: "readAttribute"
       attribute: "AcceptedCommandList"
       response:
           constraints:
               type: list
               contains: []
 
-    - label: "Step 7: Read the global attribute: GeneratedCommandList"
+    - label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
       command: "readAttribute"
       attribute: "GeneratedCommandList"
       response: