From 68d38b2c32c127f3db377c02f0e4db302ea13260 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <yufengwang@google.com>
Date: Thu, 19 Dec 2024 11:40:26 -0800
Subject: [PATCH] Address review comment

---
 scripts/tests/local.py                |  2 ++
 src/python_testing/TC_DGSW_2_2.py     |  7 +++---
 src/python_testing/admin_storage.json | 33 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 src/python_testing/admin_storage.json

diff --git a/scripts/tests/local.py b/scripts/tests/local.py
index 7321c1b1bead4c..1e514352922a0f 100755
--- a/scripts/tests/local.py
+++ b/scripts/tests/local.py
@@ -171,6 +171,7 @@ def _do_build_apps():
         f"{target_prefix}-fabric-admin-no-ble-no-wifi-rpc-ipv6only-clang-boringssl",
         f"{target_prefix}-fabric-bridge-no-ble-no-wifi-rpc-ipv6only-clang-boringssl",
         f"{target_prefix}-fabric-sync-no-ble-no-wifi-ipv6only-clang-boringssl",
+        f"{target_prefix}-light-ipv6only-no-ble-no-wifi-clang",
         f"{target_prefix}-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang",
         f"{target_prefix}-lit-icd-no-ble-clang-boringssl",
         f"{target_prefix}-lock-no-ble-clang-boringssl",
@@ -386,6 +387,7 @@ def as_runner(path):
                 as_runner(f'out/{target_prefix}-fabric-bridge-no-ble-no-wifi-rpc-ipv6only-clang-boringssl/fabric-bridge-app')}
             FABRIC_SYNC_APP: {
                 as_runner(f'out/{target_prefix}-fabric-sync-no-ble-no-wifi-ipv6only-clang-boringssl/fabric-sync')}
+            LIGHTING_APP: {as_runner(f'out/{target_prefix}-light-ipv6only-no-ble-no-wifi-clang/chip-lighting-app')}                
             LIGHTING_APP_NO_UNIQUE_ID: {as_runner(f'out/{target_prefix}-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app')}
             TRACE_APP: out/trace_data/app-{{SCRIPT_BASE_NAME}}
             TRACE_TEST_JSON: out/trace_data/test-{{SCRIPT_BASE_NAME}}
diff --git a/src/python_testing/TC_DGSW_2_2.py b/src/python_testing/TC_DGSW_2_2.py
index a554218f15a32e..f7759faf373206 100644
--- a/src/python_testing/TC_DGSW_2_2.py
+++ b/src/python_testing/TC_DGSW_2_2.py
@@ -21,7 +21,7 @@
 # === BEGIN CI TEST ARGUMENTS ===
 # test-runner-runs:
 #   run1:
-#     app: ${ALL_CLUSTERS_APP}
+#     app: ${LIGHTING_APP}
 #     app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json
 #     script-args: >
 #       --storage-path admin_storage.json
@@ -35,9 +35,10 @@
 # === END CI TEST ARGUMENTS ===
 #
 
+import asyncio
 import logging
 import subprocess
-from time import sleep
+import time
 
 import chip.clusters as Clusters
 import psutil
@@ -123,7 +124,7 @@ async def test_TC_DGSW_2_2(self):
         await self.send_software_fault_event(endpoint, app_pid)
 
         # Allow some time for the event to be processed
-        sleep(1)
+        await asyncio.sleep(1)
 
         # Read the SoftwareFault events
         software_fault_events = await self.read_software_fault_events(endpoint)
diff --git a/src/python_testing/admin_storage.json b/src/python_testing/admin_storage.json
new file mode 100644
index 00000000000000..c8a02a1fb9cc5b
--- /dev/null
+++ b/src/python_testing/admin_storage.json
@@ -0,0 +1,33 @@
+{
+    "sdk-config": {
+        "g/lkgt": "FSYAgKi8LBg=",
+        "g/gcc": "Jq3JDw==",
+        "g/gdc": "T80OBQ==",
+        "ExampleOpCredsCAKey1": "BAtZTLiDVAGxUd9i/pxI2sYNuxJmW4C+PvCdT8Xd6MK8CCRM8J1zRoES9K6CUv4kP9YqCiri2iOvs/JE2RFqyAlAOQdacEhxio+6jxd3tOtTHfNjsbwBftSyTtaoB330aQ==",
+        "ExampleOpCredsICAKey1": "BErbOfro2/rii7Nj4hn9MBvZHRuccB7qTkvIIF91U2qduOAWFwN2oH6aOCOkcRQ00mtpcdXJ1tAJrQUA0jkGIZ9dOKIZgGKhq73oejEvsss0VkCp9NwGNMor1c6R9cL1/w==",
+        "ExampleCARootCert1": "MIICQDCCAeagAwIBAgIBATAKBggqhkjOPQQDAjAiMSAwHgYKKwYBBAGConwBBAwQMDAwMDAwMDAwMDAwMDAwMTAeFw0yMTAxMDEwMDAwMDBaFw0zMDEyMzAwMDAwMDBaMCIxIDAeBgorBgEEAYKifAEEDBAwMDAwMDAwMDAwMDAwMDAxMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEC1lMuINUAbFR32L+nEjaxg27EmZbgL4+8J1Pxd3owrwIJEzwnXNGgRL0roJS/iQ/1ioKKuLaI6+z8kTZEWrICaOCAQswggEHMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrObB9oFaDjT2QxkAhug2li99hBjAfBgNVHSMEGDAWgBTrObB9oFaDjT2QxkAhug2li99hBjCBowYDVR0RBIGbBIGYQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUEwCgYIKoZIzj0EAwIDSAAwRQIhAOiLN3kUGKZ5cEM/015UTNdQi6bvmEZyvpa5F7OL6oS+AiAAmLkAJIQDuh7mR0k/CVhjtbKDgU66y+0RJ9W0ckKTew==",
+        "ExampleCAIntermediateCert1": "MIICQTCCAeagAwIBAgIBATAKBggqhkjOPQQDAjAiMSAwHgYKKwYBBAGConwBBAwQMDAwMDAwMDAwMDAwMDAwMTAeFw0yMTAxMDEwMDAwMDBaFw0zMDEyMzAwMDAwMDBaMCIxIDAeBgorBgEEAYKifAEDDBAwMDAwMDAwMDAwMDAwMDAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESts5+ujb+uKLs2PiGf0wG9kdG5xwHupOS8ggX3VTap244BYXA3agfpo4I6RxFDTSa2lx1cnW0AmtBQDSOQYhn6OCAQswggEHMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBT3Fld/+YiXiA+IJbckKQtEdHWzuDAfBgNVHSMEGDAWgBTrObB9oFaDjT2QxkAhug2li99hBjCBowYDVR0RBIGbBIGYQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUEwCgYIKoZIzj0EAwIDSQAwRgIhAJrQDDLq5FHExU2KTDIWHxpbMrTcSXP7PJ4D7xHOpTBSAiEAzxkhTs2KLTBAbkhjI/MJ5TblUGUu1wa7zfy2Cp+2+QY=",
+        "f/1/m": "FSUA8f8sAQAY",
+        "f/1/n": "FTABAQEkAgE3AyQTAhgmBIAigScmBYAlTTo3BiQVASYRabYBACYWAQABABgkBwEkCAEwCUEEfnUeiykmsVCQZE5JreIpVDDAmlml0CLzKaBplJQ0DrV0J2wFiaaB5bKq8VemiHUrSWlX9uKQPMpBI+eVIQJnGzcKNQEoARgkAgE2AwQCBAEYMAQUSuNY4zYO+bPCB9teWE6+gaZF5TIwBRT3Fld/+YiXiA+IJbckKQtEdHWzuBgwC0BRV/zjfRy/wwyot7Q85NvS5MWQV0PQwZyvCeC5LMuivamqjVPMv+q9AEmJP3NCRT6VCzhDMiLg8wbZ3txVvPeYGA==",
+        "f/1/i": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQTAhgkBwEkCAEwCUEESts5+ujb+uKLs2PiGf0wG9kdG5xwHupOS8ggX3VTap244BYXA3agfpo4I6RxFDTSa2lx1cnW0AmtBQDSOQYhnzcKNQEpARgkAmAwBBT3Fld/+YiXiA+IJbckKQtEdHWzuDAFFOs5sH2gVoONPZDGQCG6DaWL32EGMAamMIGjBgNVHREEgZsEgZhBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQRgwC0Ca0Awy6uRRxMVNikwyFh8aWzK03Elz+zyeA+8RzqUwUs8ZIU7Nii0wQG5IYyPzCeU25VBlLtcGu838tgqftvkGGA==",
+        "f/1/r": "FTABAQEkAgE3AyQUARgmBIAigScmBYAlTTo3BiQUARgkBwEkCAEwCUEEC1lMuINUAbFR32L+nEjaxg27EmZbgL4+8J1Pxd3owrwIJEzwnXNGgRL0roJS/iQ/1ioKKuLaI6+z8kTZEWrICTcKNQEpARgkAmAwBBTrObB9oFaDjT2QxkAhug2li99hBjAFFOs5sH2gVoONPZDGQCG6DaWL32EGMAamMIGjBgNVHREEgZsEgZhBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQRgwC0CB4HG2klqlJX0adYvqCdaZAiqY9x5q30lokU/7NGY4fQbVJ19UmjCohEo7mFrcKjW4+rTP8/FGpVCPlbZWRRZHGA==",
+        "g/fidx": "FSQAAjYBBAEYGA==",
+        "f/1/k/0": "FSQBACQCATYDFSQEACUFB3QwBhCwMPlHyUEJHZ5nkMhuIILRGBUkBAAkBQAwBhAAAAAAAAAAAAAAAAAAAAAAGBUkBAAkBQAwBhAAAAAAAAAAAAAAAAAAAAAAGBglB///GA==",
+        "g/gfl": "FSQBASQCARg=",
+        "f/1/g": "FSQBACQCACQDACQEACQFACQGASQHABg=",
+        "g/icdfl": "FgQBGA==",
+        "g/sri": "FhUkAQEmAiFDNBIYGA==",
+        "f/1/s/0000000012344321": "FTADEKo3KZC6nBNiPBpvP3AoxH8wBCDpKa+VwgRnTF+EHeIu9W4GLMVrtxPnWgW18NQdW/JJkzAFDAAAAAAAAAAAAAAAABg=",
+        "g/s/qjcpkLqcE2I8Gm8/cCjEfw==": "FSQBASYCIUM0Ehg="
+    },
+    "repl-config": {
+        "caList": {
+            "1": [
+                {
+                    "fabricId": 1,
+                    "vendorId": 65521
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file