YAML Updates 3/18/24 (project-chip#32625) (project-chip#32953)

* Updates Test_TC_S_2_4.yaml * Updates Test_TC_S_2_5.yaml, Test_TC_S_2_6.yaml * Updates Test_TC_CONTENTLAUNCHER_10_4.yaml * Updates Test_TC_DEMM_1_1.yaml * Updates Test_TC_WAKEONLAN_1_5.yaml * Updates Test_TC_ALOGIN_12_1.yaml * Updates Test_TC_S_2_3.yaml * Updates Test_TC_DESC_2_1.yaml * Updates Test_TC_EEVSEM_1_1.yaml * Updates Test_TC_S_2_5.yaml, Test_TC_S_2_6.yaml, Test_TC_S_3_1.yaml * Updates Test_TC_ICDM_3_1.yaml * Updates Test_TC_G_3_2.yaml * Updates Test_TC_SU_2_3.yaml, Test_TC_SU_2_5.yaml, Test_TC_SU_3_3.yaml Removes Test_TC_SU_4_2.yaml Adds Test_TC_SU_5_1.yaml * Updates Test_TC_LWM_2_1.yaml * ts Test_TC_WAKEONLAN_1_5.yaml * Restores Test_TC_WAKEONLAN_1_5.yaml * Updates Test_TC_S_2_5.yaml * Updates Test_TC_S_2_6.yaml * Updates Test_TC_S_2_4.yaml * Removes Test_TC_SU_5_1.yaml * Fix restyle * Trigger CI * Trigger CI * Fix restyle * Fix restyle Co-authored-by: Raul Marquez <[email protected]> Co-authored-by: C Freeman <[email protected]>
cecille · Apr 15, 2024 · 28b2a03 · 28b2a03
1 parent 7b04029
commit 28b2a03
Show file tree

Hide file tree

Showing 17 changed files with 212 additions and 383 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
@@ -59,7 +59,6 @@ tests:
               - name: "Status"
                 value: 0
 
-    #Issue: https://github.com/project-chip/connectedhomeip/issues/28992
     - label:
           "Step 1: TH sends a GetSetupPIN command to the DUT with test values
           provided by the product maker."

diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_4.yaml
@@ -36,10 +36,10 @@ tests:
       verification: |
           Product maker needs to provide instructions for how to trigger the command on the DUT. For comparison, the DUT behavior for this test step can be simulated using chip-tool (when DUT is a commissioner) or tv-casting-app (when DUT is a commissionee):
 
-          ./chip-tool contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}' 1 1
+          ./chip-tool contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 1 1 --Data '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}'
 
 
-          ./chip-tv-casting-app contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}' 1 1
+          ./chip-tv-casting-app contentlauncher launch-content '{"parameterList": [ { "type": 0, "value": "exampleString", "externalIDList": [ { "name": "exampleName", "value": "exampleValue"} ] } ] }' 0 1 1 --Data '{"playbackPosition": 0, "textTrack": {"languageCode": "", "audioOutputIndex": 0}}'
 
 
           On TH (tv-app), Verify the launch content command is received successfully.

diff --git a/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DEMM_1_1.yaml
@@ -48,9 +48,9 @@ tests:
 
           On the TH(Chip-tool) Log, Verify featureMap value is 0 and below is the sample log provided for the raspi platform:
 
-          [1705923720.577354][23553:23555] CHIP:DMG: }
-          [1705923720.577393][23553:23555] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009F Attribute 0x0000_FFFC DataVersion: 2217281174
-          [1705923720.577412][23553:23555] CHIP:TOO:   FeatureMap: 1
+          [1707803263.396282][12695:12697] CHIP:DMG: }
+          [1707803263.396447][12695:12697] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009F Attribute 0x0000_FFFC DataVersion: 3404644350
+          [1707803263.396492][12695:12697] CHIP:TOO:   FeatureMap: 0
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP

diff --git a/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_2_1.yaml
@@ -136,82 +136,87 @@ tests:
       verification: |
           For all the Endpoint id’s listed in step 1a run the following steps. For all the server list entries listed in the output - Convert them to Hex values. For example 29 is 0x001D. Verify that these are also present in the device_type.json. Every server cluster listed in the JSON should correspond to a number here in the output.
 
+          The cluster ID's listed in the below log is from the All-Cluster-app. Please run the below command in all the Reference apps (bridge-app, tv-app, microwave-oven-app, Lock-app, Energy-Management-app and Thermostat-app).
+
           ./chip-tool descriptor read server-list 1 1
 
-          Verify ServerList entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ServerList entries are 70.
-
-          [1693218196.392903][13451:13453] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 3853201227
-          [1693218196.393030][13451:13453] CHIP:TOO:   ServerList: 70 entries
-          [1693218196.393047][13451:13453] CHIP:TOO:     [1]: 3
-          [1693218196.393059][13451:13453] CHIP:TOO:     [2]: 4
-          [1693218196.393071][13451:13453] CHIP:TOO:     [3]: 5
-          [1693218196.393081][13451:13453] CHIP:TOO:     [4]: 6
-          [1693218196.393092][13451:13453] CHIP:TOO:     [5]: 7
-          [1693218196.393103][13451:13453] CHIP:TOO:     [6]: 8
-          [1693218196.393114][13451:13453] CHIP:TOO:     [7]: 15
-          [1693218196.393125][13451:13453] CHIP:TOO:     [8]: 29
-          [1693218196.393136][13451:13453] CHIP:TOO:     [9]: 30
-          [1693218196.393147][13451:13453] CHIP:TOO:     [10]: 37
-          [1693218196.393159][13451:13453] CHIP:TOO:     [11]: 47
-          [1693218196.393169][13451:13453] CHIP:TOO:     [12]: 59
-          [1693218196.393180][13451:13453] CHIP:TOO:     [13]: 64
-          [1693218196.393191][13451:13453] CHIP:TOO:     [14]: 65
-          [1693218196.393201][13451:13453] CHIP:TOO:     [15]: 69
-          [1693218196.393212][13451:13453] CHIP:TOO:     [16]: 80
-          [1693218196.393222][13451:13453] CHIP:TOO:     [17]: 81
-          [1693218196.393233][13451:13453] CHIP:TOO:     [18]: 82
-          [1693218196.393244][13451:13453] CHIP:TOO:     [19]: 83
-          [1693218196.393254][13451:13453] CHIP:TOO:     [20]: 84
-          [1693218196.393265][13451:13453] CHIP:TOO:     [21]: 85
-          [1693218196.393276][13451:13453] CHIP:TOO:     [22]: 86
-          [1693218196.393286][13451:13453] CHIP:TOO:     [23]: 87
-          [1693218196.393297][13451:13453] CHIP:TOO:     [24]: 89
-          [1693218196.393308][13451:13453] CHIP:TOO:     [25]: 91
-          [1693218196.393318][13451:13453] CHIP:TOO:     [26]: 92
-          [1693218196.393329][13451:13453] CHIP:TOO:     [27]: 93
-          [1693218196.393340][13451:13453] CHIP:TOO:     [28]: 96
-          [1693218196.393350][13451:13453] CHIP:TOO:     [29]: 97
-          [1693218196.393362][13451:13453] CHIP:TOO:     [30]: 113
-          [1693218196.393373][13451:13453] CHIP:TOO:     [31]: 114
-          [1693218196.393384][13451:13453] CHIP:TOO:     [32]: 257
-          [1693218196.393394][13451:13453] CHIP:TOO:     [33]: 258
-          [1693218196.393405][13451:13453] CHIP:TOO:     [34]: 259
-          [1693218196.393416][13451:13453] CHIP:TOO:     [35]: 512
-          [1693218196.393427][13451:13453] CHIP:TOO:     [36]: 513
-          [1693218196.393437][13451:13453] CHIP:TOO:     [37]: 514
-          [1693218196.393448][13451:13453] CHIP:TOO:     [38]: 516
-          [1693218196.393459][13451:13453] CHIP:TOO:     [39]: 768
-          [1693218196.393470][13451:13453] CHIP:TOO:     [40]: 769
-          [1693218196.393481][13451:13453] CHIP:TOO:     [41]: 1024
-          [1693218196.393492][13451:13453] CHIP:TOO:     [42]: 1026
-          [1693218196.393503][13451:13453] CHIP:TOO:     [43]: 1027
-          [1693218196.393514][13451:13453] CHIP:TOO:     [44]: 1028
-          [1693218196.393525][13451:13453] CHIP:TOO:     [45]: 1029
-          [1693218196.393536][13451:13453] CHIP:TOO:     [46]: 1030
-          [1693218196.393546][13451:13453] CHIP:TOO:     [47]: 1036
-          [1693218196.393557][13451:13453] CHIP:TOO:     [48]: 1037
-          [1693218196.393568][13451:13453] CHIP:TOO:     [49]: 1043
-          [1693218196.393579][13451:13453] CHIP:TOO:     [50]: 1045
-          [1693218196.393590][13451:13453] CHIP:TOO:     [51]: 1066
-          [1693218196.393601][13451:13453] CHIP:TOO:     [52]: 1067
-          [1693218196.393611][13451:13453] CHIP:TOO:     [53]: 1068
-          [1693218196.393622][13451:13453] CHIP:TOO:     [54]: 1069
-          [1693218196.393633][13451:13453] CHIP:TOO:     [55]: 1070
-          [1693218196.393643][13451:13453] CHIP:TOO:     [56]: 1071
-          [1693218196.393654][13451:13453] CHIP:TOO:     [57]: 1283
-          [1693218196.393664][13451:13453] CHIP:TOO:     [58]: 1284
-          [1693218196.393675][13451:13453] CHIP:TOO:     [59]: 1285
-          [1693218196.393686][13451:13453] CHIP:TOO:     [60]: 1286
-          [1693218196.393697][13451:13453] CHIP:TOO:     [61]: 1287
-          [1693218196.393708][13451:13453] CHIP:TOO:     [62]: 1288
-          [1693218196.393718][13451:13453] CHIP:TOO:     [63]: 1289
-          [1693218196.393729][13451:13453] CHIP:TOO:     [64]: 1290
-          [1693218196.393740][13451:13453] CHIP:TOO:     [65]: 1291
-          [1693218196.393750][13451:13453] CHIP:TOO:     [66]: 1292
-          [1693218196.393761][13451:13453] CHIP:TOO:     [67]: 1293
-          [1693218196.393772][13451:13453] CHIP:TOO:     [68]: 1294
-          [1693218196.393783][13451:13453] CHIP:TOO:     [69]: 2820
-          [1693218196.393794][13451:13453] CHIP:TOO:     [70]: 4294048773
+          Verify ServerList entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform,
+
+          [1707996554.409850][20755:20757] CHIP:DMG: }
+          [1707996554.410814][20755:20757] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_001D Attribute 0x0000_0001 DataVersion: 3583190746
+          [1707996554.410955][20755:20757] CHIP:TOO:   ServerList: 71 entries
+          [1707996554.410990][20755:20757] CHIP:TOO:     [1]: 3
+          [1707996554.411002][20755:20757] CHIP:TOO:     [2]: 4
+          [1707996554.411013][20755:20757] CHIP:TOO:     [3]: 6
+          [1707996554.411024][20755:20757] CHIP:TOO:     [4]: 7
+          [1707996554.411034][20755:20757] CHIP:TOO:     [5]: 8
+          [1707996554.411045][20755:20757] CHIP:TOO:     [6]: 15
+          [1707996554.411056][20755:20757] CHIP:TOO:     [7]: 29
+          [1707996554.411067][20755:20757] CHIP:TOO:     [8]: 30
+          [1707996554.411078][20755:20757] CHIP:TOO:     [9]: 37
+          [1707996554.411092][20755:20757] CHIP:TOO:     [10]: 47
+          [1707996554.411103][20755:20757] CHIP:TOO:     [11]: 59
+          [1707996554.411113][20755:20757] CHIP:TOO:     [12]: 64
+          [1707996554.411124][20755:20757] CHIP:TOO:     [13]: 65
+          [1707996554.411135][20755:20757] CHIP:TOO:     [14]: 69
+          [1707996554.411146][20755:20757] CHIP:TOO:     [15]: 72
+          [1707996554.411156][20755:20757] CHIP:TOO:     [16]: 73
+          [1707996554.411167][20755:20757] CHIP:TOO:     [17]: 74
+          [1707996554.411177][20755:20757] CHIP:TOO:     [18]: 80
+          [1707996554.411188][20755:20757] CHIP:TOO:     [19]: 81
+          [1707996554.411199][20755:20757] CHIP:TOO:     [20]: 82
+          [1707996554.411209][20755:20757] CHIP:TOO:     [21]: 83
+          [1707996554.411220][20755:20757] CHIP:TOO:     [22]: 84
+          [1707996554.411231][20755:20757] CHIP:TOO:     [23]: 85
+          [1707996554.411240][20755:20757] CHIP:TOO:     [24]: 86
+          [1707996554.411251][20755:20757] CHIP:TOO:     [25]: 87
+          [1707996554.411261][20755:20757] CHIP:TOO:     [26]: 89
+          [1707996554.411271][20755:20757] CHIP:TOO:     [27]: 91
+          [1707996554.411282][20755:20757] CHIP:TOO:     [28]: 92
+          [1707996554.411293][20755:20757] CHIP:TOO:     [29]: 93
+          [1707996554.411303][20755:20757] CHIP:TOO:     [30]: 94
+          [1707996554.411313][20755:20757] CHIP:TOO:     [31]: 96
+          [1707996554.411323][20755:20757] CHIP:TOO:     [32]: 97
+          [1707996554.411334][20755:20757] CHIP:TOO:     [33]: 98
+          [1707996554.411345][20755:20757] CHIP:TOO:     [34]: 113
+          [1707996554.411355][20755:20757] CHIP:TOO:     [35]: 114
+          [1707996554.411367][20755:20757] CHIP:TOO:     [36]: 128
+          [1707996554.411376][20755:20757] CHIP:TOO:     [37]: 129
+          [1707996554.411387][20755:20757] CHIP:TOO:     [38]: 144
+          [1707996554.411396][20755:20757] CHIP:TOO:     [39]: 145
+          [1707996554.411406][20755:20757] CHIP:TOO:     [40]: 152
+          [1707996554.411417][20755:20757] CHIP:TOO:     [41]: 153
+          [1707996554.411427][20755:20757] CHIP:TOO:     [42]: 157
+          [1707996554.411437][20755:20757] CHIP:TOO:     [43]: 159
+          [1707996554.411449][20755:20757] CHIP:TOO:     [44]: 258
+          [1707996554.411459][20755:20757] CHIP:TOO:     [45]: 259
+          [1707996554.411469][20755:20757] CHIP:TOO:     [46]: 512
+          [1707996554.411480][20755:20757] CHIP:TOO:     [47]: 513
+          [1707996554.411490][20755:20757] CHIP:TOO:     [48]: 514
+          [1707996554.411500][20755:20757] CHIP:TOO:     [49]: 516
+          [1707996554.411511][20755:20757] CHIP:TOO:     [50]: 768
+          [1707996554.411521][20755:20757] CHIP:TOO:     [51]: 769
+          [1707996554.411532][20755:20757] CHIP:TOO:     [52]: 1024
+          [1707996554.411559][20755:20757] CHIP:TOO:     [53]: 1026
+          [1707996554.411562][20755:20757] CHIP:TOO:     [54]: 1027
+          [1707996554.411565][20755:20757] CHIP:TOO:     [55]: 1028
+          [1707996554.411568][20755:20757] CHIP:TOO:     [56]: 1029
+          [1707996554.411571][20755:20757] CHIP:TOO:     [57]: 1030
+          [1707996554.411575][20755:20757] CHIP:TOO:     [58]: 1036
+          [1707996554.411578][20755:20757] CHIP:TOO:     [59]: 1037
+          [1707996554.411581][20755:20757] CHIP:TOO:     [60]: 1043
+          [1707996554.411584][20755:20757] CHIP:TOO:     [61]: 1045
+          [1707996554.411587][20755:20757] CHIP:TOO:     [62]: 1066
+          [1707996554.411589][20755:20757] CHIP:TOO:     [63]: 1067
+          [1707996554.411592][20755:20757] CHIP:TOO:     [64]: 1068
+          [1707996554.411595][20755:20757] CHIP:TOO:     [65]: 1069
+          [1707996554.411598][20755:20757] CHIP:TOO:     [66]: 1070
+          [1707996554.411601][20755:20757] CHIP:TOO:     [67]: 1071
+          [1707996554.411604][20755:20757] CHIP:TOO:     [68]: 1283
+          [1707996554.411607][20755:20757] CHIP:TOO:     [69]: 1288
+          [1707996554.411610][20755:20757] CHIP:TOO:     [70]: 2820
+          [1707996554.411613][20755:20757] CHIP:TOO:     [71]: 4294048773
+
 
           ./chip-tool descriptor read server-list 1 2
 
@@ -233,6 +238,8 @@ tests:
       verification: |
           For all the Endpoint id’s listed in step 1a run the following steps. For all the client list entries listed in the output - Convert them to Hex values. For example 29 is 0x001D. Verify that these are also present in the device_type.json. Every server cluster listed in the JSON should correspond to a number here in the output.
 
+          The cluster ID's listed in the below log is from the All-Cluster-app. Please run the below command in all the Reference apps (bridge-app, tv-app, microwave-oven-app, Lock-app, Energy-Management-app and Thermostat-app).
+
           ./chip-tool descriptor read client-list 1 1
 
           Verify client list entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ClientList entries are 1.
@@ -242,7 +249,6 @@ tests:
           [1676367470.160282][9805:9807] CHIP:TOO:   ClientList: 1 entries
           [1676367470.160289][9805:9807] CHIP:TOO:     [1]: 6
 
-
           ./chip-tool descriptor read client-list 1 2
 
           Verify client list entries on the TH (Chip-tool) and below is the sample log provided for the raspi platform, Here ClientList entries are 0.

diff --git a/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_EEVSEM_1_1.yaml
@@ -48,9 +48,9 @@ tests:
 
           On the TH(Chip-tool) Log, Verify featureMap value is 0 and below is the sample log provided for the raspi platform:
 
-          [1705995388.110138][7525:7527] CHIP:DMG: }
-          [1705995388.110173][7525:7527] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009D Attribute 0x0000_FFFC DataVersion: 1324786556
-          [1705995388.110192][7525:7527] CHIP:TOO:   FeatureMap: 1
+          [1707803286.349129][12699:12701] CHIP:DMG: }
+          [1707803286.349183][12699:12701] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_009D Attribute 0x0000_FFFC DataVersion: 811903427
+          [1707803286.349202][12699:12701] CHIP:TOO:   FeatureMap: 0
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP

diff --git a/src/app/tests/suites/certification/Test_TC_G_3_2.yaml b/src/app/tests/suites/certification/Test_TC_G_3_2.yaml
@@ -17,6 +17,7 @@ name: 125.3.2. [TC-G-3.2] Groups Cluster Commands [DUT-Client]
 
 PICS:
     - G.C
+    - GRPKEY.C
 
 config:
     nodeId: 0x12344321

diff --git a/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml b/src/app/tests/suites/certification/Test_TC_ICDM_3_1.yaml
@@ -35,6 +35,47 @@ tests:
           2c.TH reads from the DUT the RegisteredClients attribute. Verify that the DUT response contains empty list of registered clients.
       disabled: true
 
+    - label:
+          "Step 0a: Preconfition 1: Read 'register-clients' by sending the
+          command below and note the check-in nodeID for the entries"
+      verification: |
+          ./chip-tool icdmanagement read registered-clients 1 0
+
+          [1704888897.027204][71644:71646] CHIP:DMG: }
+          [1704888897.027313][71644:71646] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0046 Attribute 0x0000_0003 DataVersion: 852105378
+          [1704888897.027351][71644:71646] CHIP:TOO:   RegisteredClients: 1 entries
+          [1704888897.027394][71644:71646] CHIP:TOO:     [1]: {
+          [1704888897.027412][71644:71646] CHIP:TOO:       CheckInNodeID: 112233
+          [1704888897.027421][71644:71646] CHIP:TOO:       MonitoredSubject: 112233
+          [1704888897.027431][71644:71646] CHIP:TOO:       FabricIndex: 1
+          [1704888897.027440][71644:71646] CHIP:TOO:      }
+          [1704888897.027521][71644:71646] CHIP:EM: <<< [E:49337i S:30873 M:176023643 (Ack:200282364)] (S) Msg TX to 1:0000000000000001 [5BF5] [UDP:[fe80::a70c:61dc:df51:6945%enxd03745ce8f62]:5540] --- Type 0000:10 (SecureChannel:StandaloneAck)
+      disabled: true
+
+    - label:
+          "Step 0b: Preconfition 2: Please send the 'unregister client' command
+          using the check-in nodeID received from the previous read"
+      verification: |
+          ./chip-tool icdmanagement unregister-client 112233 1 0
+
+          [1704888949.629057][71657:71659] CHIP:DMG:
+          [1704888949.629066][71657:71659] CHIP:DMG:         InteractionModelRevision = 11
+          [1704888949.629074][71657:71659] CHIP:DMG: },
+          [1704888949.629125][71657:71659] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0046 Command=0x0000_0002 Status=0x0
+          [1704888949.629153][71657:71659] CHIP:DMG: ICR moving to [AwaitingDe]
+      disabled: true
+
+    - label:
+          "Step 0c: Preconfition 3: Verify that all entries have been
+          successfully unregistered by reading 'register-clients'"
+      verification: |
+          ./chip-tool icdmanagement read registered-clients 1 0
+          [1704889092.945869][71700:71702] CHIP:DMG: }
+          [1704889092.945955][71700:71702] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0046 Attribute 0x0000_0003 DataVersion: 852105378
+          [1704889092.945989][71700:71702] CHIP:TOO:   RegisteredClients: 0 entries
+          [1704889092.946079][71700:71702] CHIP:EM: <<< [E:63454i S:39669 M:600516 (Ack:156383188)] (S)
+      disabled: true
+
     - label:
           "Step 1: TH sends RegisterClient command. - CheckInNodeID: registering
           clients node ID - MonitoredSubject: monitored subject ID - Key: shared

diff --git a/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_2_1.yaml
@@ -101,7 +101,6 @@ tests:
       command: "readAttribute"
       attribute: "CurrentMode"
       response:
-          saveAs: Step6_current_mode_dut
           constraints:
               type: int8u
               minValue: 0

diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_3.yaml
@@ -119,11 +119,3 @@ tests:
       verification: |
           Out of scope
       disabled: true
-
-    - label:
-          "Step 6: Perform the OTA Update on DUT using vendor specific
-          mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to initiate OTA Update and verify that the software image is transferred to the DUT
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml b/src/app/tests/suites/certification/Test_TC_SU_2_5.yaml
@@ -157,11 +157,3 @@ tests:
           [1653636406.637617][11116:11121] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0028 Attribute 0x0000_000A DataVersion: 1527020963
           [1653636406.637708][11116:11121] CHIP:TOO:   SoftwareVersion: 1
       disabled: true
-
-    - label:
-          "Step 6: Apply the OTA Update on DUT using vendor specific mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to apply OTA Update and verify that the DUT starts updating its software.
-          Once the update is finished verify the software version on the DUT to match the version downloaded for the software update.
-      disabled: true
diff --git a/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml b/src/app/tests/suites/certification/Test_TC_SU_3_3.yaml
@@ -121,11 +121,3 @@ tests:
       verification: |
           Out of scope
       disabled: true
-
-    - label:
-          "Step 6: Perform the OTA Update from DUT using vendor specific
-          mechanism."
-      PICS: MCORE.OTA.VendorSpecific
-      verification: |
-          Use vendor specific steps to initiate OTA Update and verify that the software image is transferred from the DUT
-      disabled: true
-Original file line number
+Diff line change
@@ Expand Up @@
     PICS:
         - G.C
+        - GRPKEY.C
     config:
         nodeId: 0x12344321
@@ Expand Down @@