From b1050b74042e4e1a54bbe1452510a8b0c6585621 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Wed, 6 Oct 2021 10:36:07 -0600 Subject: [PATCH] .. dut.json files updated for wireless network dict Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/ct_001_AX88U_dut.json | 7 ++----- py-scripts/tools/ct_002_AX12_dut.json | 8 +++----- py-scripts/tools/ct_003_AX88U_dut.json | 7 ++----- py-scripts/tools/ct_003_LANforge_dut.json | 20 ++++++-------------- py-scripts/tools/ct_004_AX88U_dut.json | 3 ++- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/py-scripts/tools/ct_001_AX88U_dut.json b/py-scripts/tools/ct_001_AX88U_dut.json index 77bd1a56..5ed1d62c 100644 --- a/py-scripts/tools/ct_001_AX88U_dut.json +++ b/py-scripts/tools/ct_001_AX88U_dut.json @@ -1,11 +1,8 @@ { "ct_AX88U_dut":{ "Notes":[ - "This json file is used as an input to the ./lf_check.py file", - "The variables that are all capitalized below are replaced with configuration", - "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", - "The replacement is loosely coupled so the upper and lower case convention is used", - "to identify replaced strings in the lf_check.py code.", + "This json file describes the device undertest as input to ./lf_check.py", + "The variables that are capitalize are used for configuration", "The dut related configuration is contained in this file" ] }, diff --git a/py-scripts/tools/ct_002_AX12_dut.json b/py-scripts/tools/ct_002_AX12_dut.json index aff16371..20ce0f5f 100644 --- a/py-scripts/tools/ct_002_AX12_dut.json +++ b/py-scripts/tools/ct_002_AX12_dut.json @@ -1,11 +1,9 @@ { "ct_AX12_dut":{ "Notes":[ - "This json file is used as an input to the ./lf_check.py file", - "The variables that are all capitalized below are replaced with configuration", - "The dut related configuration is contained in this file", - "NOTE: create_chamberview_dut starts ssid-idx at 0 ", - "NOTE: create_chamberview starts counting at Radio-1 which is dut ssid-idx 0" + "This json file describes the device undertest as input to ./lf_check.py", + "The variables that are capitalize are used for configuration", + "The dut related configuration is contained in this file" ] }, "test_dut":{ diff --git a/py-scripts/tools/ct_003_AX88U_dut.json b/py-scripts/tools/ct_003_AX88U_dut.json index 262ffc41..955117e3 100644 --- a/py-scripts/tools/ct_003_AX88U_dut.json +++ b/py-scripts/tools/ct_003_AX88U_dut.json @@ -1,11 +1,8 @@ { "ct_AX88U_dut":{ "Notes":[ - "This json file is used as an input to the ./lf_check.py file", - "The variables that are all capitalized below are replaced with configuration", - "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", - "The replacement is loosely coupled so the upper and lower case convention is used", - "to identify replaced strings in the lf_check.py code.", + "This json file describes the device undertest as input to ./lf_check.py", + "The variables that are capitalize are used for configuration", "The dut related configuration is contained in this file" ] }, diff --git a/py-scripts/tools/ct_003_LANforge_dut.json b/py-scripts/tools/ct_003_LANforge_dut.json index f3c9f201..eef520ef 100644 --- a/py-scripts/tools/ct_003_LANforge_dut.json +++ b/py-scripts/tools/ct_003_LANforge_dut.json @@ -1,26 +1,18 @@ { "ct_lanforge_dut":{ "Notes":[ - "This json file is used as an input to the ./lf_check.py file", - "The variables that are all capitalized below are replaced with configuration", - "from the json file. so LF_MGR_IP in the test below is replaced by the json lf_mgr_ip", - "The replacement is loosely coupled so the upper and lower case convention is used", - "to identify replaced strings in the lf_check.py code.", + "This json file describes the device undertest as input to ./lf_check.py", + "The variables that are capitalize are used for configuration", "The dut related configuration is contained in this file" ] }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME lanforge-dut", "DUT_NAME": "lanforge", - "DUT_BSSID_2G": "94:a6:7e:54:d4:31", - "DUT_BSSID_5G": "94:a6:7e:54:d4:33", - "DUT_SW": "lanforge_GUI", - "SSID_5G_USED": "ct-us-003-r3-5g", - "SSID_5G_PW_USED": "ct-us-003-r3-5g", - "SECURITY_5G_USED": "wpa2", - "SSID_2G_USED": "ct-us-003-r3-2g", - "SSID_2G_PW_USED": "ct-us-003-r3-2g", - "SECURITY_2G_USED": "wpa2" + "wireless_network_dict":{ + "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"lf11ax-2","SSID_PW_USED":"hello123","BSSID":"0c:9d:92:02:42:e0","SECURITY_USED":"wpa2"}, + "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"lf11ax-5","SSID_PW_USED":"hello123","BSSID":"0c:9d:92:02:42:e4","SECURITY_USED":"wpa2"} + } } } \ No newline at end of file diff --git a/py-scripts/tools/ct_004_AX88U_dut.json b/py-scripts/tools/ct_004_AX88U_dut.json index 08e1c4ac..82f82a5d 100644 --- a/py-scripts/tools/ct_004_AX88U_dut.json +++ b/py-scripts/tools/ct_004_AX88U_dut.json @@ -1,7 +1,8 @@ { "ct_AX88U_dut":{ "Notes":[ - "This json file is used as an input to the ./lf_check.py file", + "This json file describes the device undertest used as input to ./lf_check.py", + "The variables that are capitalize are used for configuration", "The dut related configuration is contained in this file" ] },