Modified scripts:

TC_CNET_4_1
TC_CNET_4_10
TC_CNET_4_11
TC_CNET_4_12
TC_CNET_4_13
TC_CNET_4_14
TC_CNET_4_15
TC_CNET_4_16
TC_CNET_4_2
TC_CNET_4_20
TC_CNET_4_21
TC_CNET_4_22
TC_CNET_4_3
TC_CNET_4_4
TC_CNET_4_5
TC_CNET_4_6
TC_CNET_4_9
TC_DA_1_4
TC_OPSTATE_2_2
TC_WNCV_5_1_Simulated
TC_WNCV_6_1_Simulated
TC_WNCV_7_1_Simulated

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

@@ -7584,36 +7584,6 @@ PICS:
           attribute implemented on the server ?"
       id: WNCV.C.A001a
 
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFF8)
-          GeneratedCommandList attribute implemented on the server ?"
-      id: WNCV.C.Afff8
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFF9)
-          AcceptedCommandList attribute implemented on the server ?"
-      id: WNCV.C.Afff9
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFA)
-          EventList attribute implemented on the server ?"
-      id: WNCV.C.Afffa
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFB)
-          AttributeList attribute implemented on the server ?"
-      id: WNCV.C.Afffb
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFC)
-          FeatureMap attribute implemented on the server ?"
-      id: WNCV.C.Afffc
-
-    - label:
-          "Does the DUT(client) have access privileges for the (0xFFFD)
-          ClusterRevision attribute implemented on the server ?"
-      id: WNCV.C.Afffd
-
     #
     # client / commandsGenerated
     #

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

@@ -25,6 +25,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+      disabled: true
+
     - label: "Precondition"
       verification: |
           Commission TH and DUT on Thread setup

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can connect to two valid Wi-Fi access points: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+      disabled: true
+
     - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
           All the below commands are to check the Pre-Condition note mentioned in D column.

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

@@ -26,6 +26,15 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. TH has can communicate to two valid thread PANs: PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET and PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET
+          4. TH can connect to two valid Wi-Fi access points: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID and PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID
+          5. XPANID of PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET is saved as th_xpan and the XPANID of PIXIT.CNET.THREAD_2ND_OPERATIONALDATASET is saved as th_xpan1
+      disabled: true
+
     - label: "Commission TH and DUT on Thread setup"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. Commission TH and DUT over BLE to setup the Wi-Fi on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          2. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
+          3. The FeatureMap attribute value is 1
+          4. MaxNetworks attribute value is at least 2 which is saved as 'MaxNetworksValue' for future use
+      disabled: true
+
     - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. Commission TH and DUT on Thread setup on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          2. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
+          3. The FeatureMap attribute value is 2
+          4. MaxNetworks attribute value is at least 2 which is saved as 'MaxNetworksValue' for future use
+      disabled: true
+
     - label: "Preconditions"
       verification: |
           Commission TH and DUT on Thread setup

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

@@ -28,11 +28,11 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          1. Factory Reset the DUT
-          2. Commission TH and DUT to setup the Thread
-          3. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
-          4. The FeatureMap attribute value is 1
-          5. MaxNetworks attribute value is at least 1 which is saved as MaxNetworksValue for future use
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is factory reset
+          4. TH can communicate with the DUT
+          5. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
       disabled: true
 
     - label:

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

@@ -28,11 +28,12 @@ config:
 tests:
     - label: "Preconditions"
       verification: |
-          1. Factory Reset the DUT
-          2. Commission TH and DUT to setup the Thread
-          3. The cluster Identifier 49 (0x0031) is present in the ServerList attribute
-          4. The FeatureMap attribute value is 2
-          5. MaxNetworks attribute value is at least 1 which is saved as MaxNetworksValue for future use
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is factory reset
+          4. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          5. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          6. DUT MaxNetworks attribute value is at least 1 and is saved as 'MaxNetworksValue' for future use
       disabled: true
 
     - label:

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 

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

@@ -25,6 +25,12 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.C.F00(WI)
+          2. TH has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+      disabled: true
+
     - label: "Note"
       verification: |
           Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.

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

@@ -26,6 +26,12 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.C.F01(TH)
+          2. TH has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+      disabled: true
+
     - label: "Note"
       verification: |
           Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.

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

@@ -32,7 +32,6 @@ tests:
           2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
           3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
           4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
-
       disabled: true
 
     - label:

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

@@ -25,6 +25,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F02(ET)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_ETHERNET with FeatureMap attribute of 4
+          3. DUT has a valid Ethernet connection
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Step 1: Factory reset the DUT"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Preconditions"
       verification: |
           1.Commission TH and DUT over BLE to setup the Wi-Fi

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F01(TH)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_THREAD with FeatureMap attribute of 2
+          3. DUT is commissioned on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+          4. TH can communicate with the DUT on PIXIT.CNET.THREAD_1ST_OPERATIONALDATASET
+      disabled: true
+
     - label: "Commission TH and DUT on Thread setup"
       verification: |
 

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

@@ -26,6 +26,14 @@ config:
     endpoint: 0
 
 tests:
+    - label: "Preconditions"
+      verification: |
+          1. DUT supports CNET.S.F00(WI)
+          2. DUT has a Network Commissioning cluster on endpoint PIXIT.CNET.ENDPOINT_WIFI with FeatureMap attribute of 1
+          3. DUT is commissioned on PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID
+          4. TH can communicate with the DUT
+      disabled: true
+
     - label: "Commission TH and DUT over BLE to setup the Wi-Fi"
       verification: |