Modified tests Feb 07 (#24898)

* Modifed scripts: TC-ACL-2.4 TC-ACL-2.7 TC-ACL-2.8 TC-ACL-2.9 TC-ACL-2.10 TC-BRBINFO-2.3 TC-CADMIN-1.15 TC-CADMIN-1.16 TC-G-2.2 TC-G-2.3 TC-TSTAT-2.2 TC-RH-3.1_Simulated Removed tests: TC-ACT-2.2 TC-CGEN-2.4 * Auto generated files * Restyled by whitespace * Modified ACT-2.2 * Modified ACL test TC-ACL-2.8 TC-ACL-2.10 * Fixes issue #681 ACL-2.9 --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Sep 13, 2023 · 2070162 · 2070162
1 parent 85e0eb1
commit 2070162
Show file tree

Hide file tree

Showing 17 changed files with 999 additions and 568 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
@@ -25,12 +25,6 @@ config:
     nodeId2:
         type: node_id
         defaultValue: 0xCAFE
-    TH1CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
-    TH2CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
     discriminator:
         type: int16u
         defaultValue: 3840
@@ -53,6 +47,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the TH1 commissioner node ID"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH1CommissionerNodeId
+
     - label:
           "Step 2:TH1 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"
@@ -93,6 +95,15 @@ tests:
               - name: "nodeId"
                 value: nodeId2
 
+    - label: "Read the TH2 commissioner node ID"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH2CommissionerNodeId
+
     - label:
           "Step 4:TH2 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
@@ -22,9 +22,6 @@ config:
     nodeId: 0x12344321
     cluster: "Access Control"
     endpoint: 0
-    CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
     CAT1:
         type: int64u
         defaultValue: 65520
@@ -47,6 +44,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the commissioner node ID"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: CommissionerNodeId
+
     - label:
           "Step 2:TH1 reads DUT Endpoint 0 OperationalCredentials cluster
           CurrentFabricIndex attribute"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
@@ -25,12 +25,6 @@ config:
     nodeId2:
         type: node_id
         defaultValue: 0xCAFE
-    TH1CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
-    TH2CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00"
@@ -50,6 +44,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the TH1 commissioner node ID"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH1CommissionerNodeId
+
     - label:
           "Step 2:TH1 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"
@@ -90,6 +92,15 @@ tests:
               - name: "nodeId"
                 value: nodeId2
 
+    - label: "Read the TH2 commissioner node ID"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH2CommissionerNodeId
+
     - label:
           "Step 5:TH2 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml
@@ -24,12 +24,6 @@ config:
     nodeId2:
         type: node_id
         defaultValue: 0xCAFE
-    TH1CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
-    TH2CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00"
@@ -43,6 +37,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the TH1 commissioner node ID"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH1CommissionerNodeId
+
     - label:
           "TH1 reads OperationalCredentials cluster CurrentFabricIndex attribute"
       command: "readAttribute"
@@ -82,6 +84,15 @@ tests:
               - name: "nodeId"
                 value: nodeId2
 
+    - label: "Read the TH2 commissioner node ID"
+      identity: "beta"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: TH2CommissionerNodeId
+
     - label:
           "TH2 reads OperationalCredentials cluster CurrentFabricIndex attribute"
       identity: "beta"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml
@@ -25,9 +25,6 @@ config:
     nodeId2:
         type: node_id
         defaultValue: 0xCAFE
-    CommissionerNodeId:
-        type: node_id
-        defaultValue: 112233
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically
@@ -41,6 +38,14 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the commissioner node ID"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: CommissionerNodeId
+
     - label:
           "TH1 reads OperationalCredentials cluster CurrentFabricIndex attribute"
       command: "readAttribute"
@@ -116,7 +121,7 @@ tests:
     - label:
           "Step 7:TH1 reads DUT Endpoint 0 AccessControl cluster
           SubjectsPerAccessControlEntry attribute"
-      PICS: ACL.S.A0001
+      PICS: ACL.S.A0002
       command: "readAttribute"
       attribute: "SubjectsPerAccessControlEntry"
       response:
@@ -126,7 +131,7 @@ tests:
     - label:
           "Step 8:TH1 reads DUT Endpoint 0 AccessControl cluster
           TargetsPerAccessControlEntry attribute"
-      PICS: ACL.S.A0001
+      PICS: ACL.S.A0003
       command: "readAttribute"
       attribute: "TargetsPerAccessControlEntry"
       response:
@@ -136,7 +141,7 @@ tests:
     - label:
           "Step 9:TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlEntriesPerFabric attribute"
-      PICS: ACL.S.A0001
+      PICS: ACL.S.A0004
       command: "readAttribute"
       attribute: "AccessControlEntriesPerFabric"
       response:

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
@@ -26,12 +26,7 @@ config:
 tests:
     - label: "Commission DUT to TH (can be skipped if done in a preceding test)"
       verification: |
-          On DUT side:
-          sudo ./chip-bridge-app
 
-
-          On TH side:
-          ./chip-tool pairing ethernet 1 20202021 3840 fe80::e65f:1ff:fe0f:2753  5540
       disabled: true
 
     - label:

diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_3.yaml
@@ -213,18 +213,6 @@ tests:
           [1663583922.989709][155023:155023] CHIP:DMG: << from UDP:[fe80::e2a:f0a6:5d44:15b1%wlp3s0]:35251 | 43255988 | [Secure Channel  (0) / Standalone Ack (0x10) / Session = 0 / Exchange = 14682]
       disabled: true
 
-    - label: "DUT reads Location from the TH"
-      PICS: BRBINFO.C.A0006
-      verification: |
-          ./chip-tool bridgeddevicebasic read location 1 3
-
-          Optional Attribute - If it is supported, then in TH(bridge-app) log it will results in displaying the ReportDataMessage , else it will display UNSUPPORTED_ATTRIBUTE
-
-
-
-          chip-tool needs to be implemented
-      disabled: true
-
     - label: "DUT reads HardwareVersion from the TH"
       PICS: BRBINFO.C.A0007
       verification: |

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -198,7 +198,9 @@ tests:
       verification: |
           Using TH_CR2 read attribute
 
-          ./chip-tool basic read node-label 2 0  --commissioner-name beta
+          Verify read command fail as expected since the DUT_CE is no longer on the network on TH_CR2 (chip-tool) side
+
+          ./chip-tool  basicinformation read node-label 2 0  --commissioner-name beta
 
           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
           [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -180,7 +180,9 @@ tests:
       verification: |
           Using TH_CR2 read attribute
 
-          ./chip-tool basic read node-label 2 0  --commissioner-name beta
+          Verify read command fail as expected since the DUT_CE is no longer on the network on TH_CR2 (chip-tool) log
+
+          ./chip-tool  basicinformation read node-label 2 0  --commissioner-name beta
 
           Received error (protocol code 2) during pairing process. ../../third_party/connectedhomeip/src/protocols/secure_channel/CASESession.cpp:1551: CHIP Error 0x00000054: Invalid CASE parameter
           [1651819620.929567][4359:4364] CHIP:CTL: OperationalDeviceProxy[B8070CD13C99D367:0000000000000002]: State change 3 --> 2

diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_4.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
@@ -44,7 +44,8 @@ tests:
           [1674543469.444257][19260:19262] CHIP:TOO:   MaxGroupsPerFabric: 4
       disabled: true
 
-    - label: "Precondition: If maxgroups>1, proceed with the following steps
+    - label: |
+          Precondition: If maxgroups>1, proceed with the following steps,
 
           TH generates fabric-unique GroupID, GroupName, random key, EpochKey0
           and GroupKeySetID.
@@ -66,7 +67,7 @@ tests:
 
           TH binds GroupId(0x0001 to (maxgroups+1)) with GroupKeySetID in the
           GroupKeyMap attribute list on GroupKeyManagement cluster with the
-          values provided in the above steps"
+          values provided in the above steps
       verification: |
           Execute the following command in TH to generate the pre-condition to execute this test case: