From e9888fd23d0cae429de7b877b86661e408ec7560 Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Wed, 13 Oct 2021 07:17:23 -0600 Subject: [PATCH] For test iterations needed to change DUT_NAME to USE_DUT_NAME since DUT_NAME is an actual input for SET_DUT_NAME Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/ct_001_AX88U_dut.json | 2 +- py-scripts/tools/ct_002_AX12_dut.json | 2 +- py-scripts/tools/ct_003_AX88U_dut.json | 2 +- py-scripts/tools/ct_003_LANforge_dut.json | 2 +- py-scripts/tools/ct_004_AX88U_dut.json | 2 +- py-scripts/tools/ct_AX88U_dut.json | 2 +- py-scripts/tools/ct_tests.json | 6 +- py-scripts/tools/ct_us_001_tests.json | 64 ++++++++++----------- py-scripts/tools/ct_us_002_tests.json | 52 ++++++++--------- py-scripts/tools/ct_us_003_tests.json | 68 +++++++++++------------ py-scripts/tools/ct_us_004_tests.json | 68 +++++++++++------------ py-scripts/tools/lf_check.py | 14 ++--- 12 files changed, 142 insertions(+), 142 deletions(-) diff --git a/py-scripts/tools/ct_001_AX88U_dut.json b/py-scripts/tools/ct_001_AX88U_dut.json index 5ed1d62c..28aff673 100644 --- a/py-scripts/tools/ct_001_AX88U_dut.json +++ b/py-scripts/tools/ct_001_AX88U_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", - "DUT_NAME": "ASUSRT-AX88U", + "USE_DUT_NAME": "ASUSRT-AX88U", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"asus11ax-2","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:60","SECURITY_USED":"wpa2"}, "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"asus11ax-5","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:64","SECURITY_USED":"wpa2"} diff --git a/py-scripts/tools/ct_002_AX12_dut.json b/py-scripts/tools/ct_002_AX12_dut.json index 20ce0f5f..3c0de000 100644 --- a/py-scripts/tools/ct_002_AX12_dut.json +++ b/py-scripts/tools/ct_002_AX12_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME Netgear-AX12", - "DUT_NAME": "Netgear-AX12", + "USE_DUT_NAME": "Netgear-AX12", "DUT_SW": "3.0.0.4.386_44266", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"NETGEAR59","SSID_PW_USED":"crispynest798","BSSID":"94:a6:7e:54:d4:31","SECURITY_USED":"wpa2"}, diff --git a/py-scripts/tools/ct_003_AX88U_dut.json b/py-scripts/tools/ct_003_AX88U_dut.json index 955117e3..e16e16a9 100644 --- a/py-scripts/tools/ct_003_AX88U_dut.json +++ b/py-scripts/tools/ct_003_AX88U_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", - "DUT_NAME": "ASUSRT-AX88U", + "USE_DUT_NAME": "ASUSRT-AX88U", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"asus11ax-2","SSID_PW_USED":"hello123","BSSID":"0c:9d:92:02:42:e0","SECURITY_USED":"wpa2"}, "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"asus11ax-5","SSID_PW_USED":"hello123","BSSID":"0c:9d:92:02:42:e4","SECURITY_USED":"wpa2"} diff --git a/py-scripts/tools/ct_003_LANforge_dut.json b/py-scripts/tools/ct_003_LANforge_dut.json index eef520ef..66bb1263 100644 --- a/py-scripts/tools/ct_003_LANforge_dut.json +++ b/py-scripts/tools/ct_003_LANforge_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME lanforge-dut", - "DUT_NAME": "lanforge", + "USE_DUT_NAME": "lanforge", "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"} diff --git a/py-scripts/tools/ct_004_AX88U_dut.json b/py-scripts/tools/ct_004_AX88U_dut.json index 6b829d1e..687ee690 100644 --- a/py-scripts/tools/ct_004_AX88U_dut.json +++ b/py-scripts/tools/ct_004_AX88U_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", - "DUT_NAME": "ASUSRT-AX88U", + "USE_DUT_NAME": "ASUSRT-AX88U", "DUT_SW": "3.0.0.4.386_44266", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"asus11ax-2","SSID_PW_USED":"hello123","BSSID":"d4:5d:64:a0:7f:78","SECURITY_USED":"wpa2"}, diff --git a/py-scripts/tools/ct_AX88U_dut.json b/py-scripts/tools/ct_AX88U_dut.json index 5ed1d62c..28aff673 100644 --- a/py-scripts/tools/ct_AX88U_dut.json +++ b/py-scripts/tools/ct_AX88U_dut.json @@ -8,7 +8,7 @@ }, "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", - "DUT_NAME": "ASUSRT-AX88U", + "USE_DUT_NAME": "ASUSRT-AX88U", "wireless_network_dict":{ "ssid_idx=0":{"ssid_idx":"0","SSID_USED":"asus11ax-2","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:60","SECURITY_USED":"wpa2"}, "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"asus11ax-5","SSID_PW_USED":"hello123","BSSID":"3c:7c:3f:55:4d:64","SECURITY_USED":"wpa2"} diff --git a/py-scripts/tools/ct_tests.json b/py-scripts/tools/ct_tests.json index 0e747ee8..8f28e92a 100644 --- a/py-scripts/tools/ct_tests.json +++ b/py-scripts/tools/ct_tests.json @@ -12,10 +12,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_wc":{ @@ -26,7 +26,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario scenario_wpa2_wc", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, diff --git a/py-scripts/tools/ct_us_001_tests.json b/py-scripts/tools/ct_us_001_tests.json index 6d82ee73..7dc241d5 100644 --- a/py-scripts/tools/ct_us_001_tests.json +++ b/py-scripts/tools/ct_us_001_tests.json @@ -50,10 +50,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -64,7 +64,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_wc", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -89,10 +89,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -103,7 +103,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -151,10 +151,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984__wc":{ @@ -165,7 +165,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984__wc ", - " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -190,10 +190,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984__dp":{ @@ -204,7 +204,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984__dp", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -232,10 +232,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_wc":{ @@ -246,7 +246,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_wc ", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -271,10 +271,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_dp":{ @@ -285,7 +285,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_dp", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -312,10 +312,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -326,7 +326,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_wc ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -351,10 +351,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -365,7 +365,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -392,10 +392,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -405,8 +405,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, @@ -419,7 +419,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", + " --dut5_0 'USE_DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'USE_DUT_NAME lanforge DUT_BSSID_2G (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", @@ -454,10 +454,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -481,7 +481,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", + " --dut5_0 'USE_DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'USE_DUT_NAME lanforge DUT_BSSID_2G (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json index ec36fbae..d1362911 100644 --- a/py-scripts/tools/ct_us_002_tests.json +++ b/py-scripts/tools/ct_us_002_tests.json @@ -39,10 +39,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -52,8 +52,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy4,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy4,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -65,7 +65,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS", " --instance_name ap_auto --config_name test_con --upstream UPSTREAM_PORT", - " --dut5_0 'DUT_NAME lanforge BSSID (1)' --dut2_0 'DUT_NAME lanforge BSSID (1)'", + " --dut5_0 'USE_DUT_NAME lanforge BSSID (1)' --dut2_0 'USE_DUT_NAME lanforge BSSID (1)'", " --max_stations_2 32 --max_stations_5 32 --max_stations_dual 100 --radio2 1.1.wiphy1", " --radio5 1.1.wiphy2 --set 'Basic Client Connectivity' 1", " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", @@ -92,10 +92,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ATH10K_9984":{ "enabled":"TRUE", @@ -105,8 +105,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984__wc", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -129,10 +129,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ATH10K_9984_dp":{ "enabled":"TRUE", @@ -142,7 +142,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984_dp", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -153,7 +153,7 @@ "args":"", "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984__dp", - " --config_name test_con --upstream UPSTREAM_PORT --dut DUT_NAME --duration 30s --station 1.1.wlan1", + " --config_name test_con --upstream UPSTREAM_PORT --dut USE_DUT_NAME --duration 30s --station 1.1.wlan1", " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ", " --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20' ", @@ -167,10 +167,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_AX200_wc":{ "enabled":"TRUE", @@ -180,8 +180,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX200_wc", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -203,10 +203,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_AX200_dp":{ "enabled":"TRUE", @@ -216,7 +216,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX200_dp", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy4,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy4,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -227,7 +227,7 @@ "args":"", "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name AX200_dp", - " --config_name test_con --upstream UPSTREAM_PORT --dut DUT_NAME --duration 30s --station 1.1.wlan4", + " --config_name test_con --upstream UPSTREAM_PORT --dut USE_DUT_NAME --duration 30s --station 1.1.wlan4", " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ", " --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'", @@ -241,10 +241,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=NETGEAR59 security=WPA2 password=crispynest798 bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"FALSE", @@ -254,8 +254,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, @@ -267,7 +267,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge BSSID (2)' --dut2_0 'DUT_NAME lanforge BSSID (1)'", + " --dut5_0 'USE_DUT_NAME lanforge BSSID (2)' --dut2_0 'USE_DUT_NAME lanforge BSSID (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy0 --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", diff --git a/py-scripts/tools/ct_us_003_tests.json b/py-scripts/tools/ct_us_003_tests.json index 1fb29ce6..662b3d1a 100644 --- a/py-scripts/tools/ct_us_003_tests.json +++ b/py-scripts/tools/ct_us_003_tests.json @@ -50,10 +50,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -64,7 +64,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_wc ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -89,10 +89,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -103,7 +103,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp ", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -142,10 +142,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984_wc":{ @@ -156,7 +156,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984_wc ", - " --raw_line \"profile_link 1.1 STA-AUTO 16 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 16 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -181,10 +181,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984_dp":{ @@ -195,7 +195,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984_dp", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -223,10 +223,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_wc":{ @@ -237,7 +237,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_wc", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -261,10 +261,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_dp":{ @@ -275,7 +275,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_dp ", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -302,10 +302,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -316,7 +316,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_wc", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -341,10 +341,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -355,7 +355,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -382,10 +382,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -395,8 +395,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, @@ -409,7 +409,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge BSSID (2)' --dut2_0 'DUT_NAME lanforge BSSID (1)'", + " --dut5_0 'USE_DUT_NAME lanforge BSSID (2)' --dut2_0 'USE_DUT_NAME lanforge BSSID (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", @@ -444,10 +444,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -457,8 +457,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, @@ -471,7 +471,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge BSSID (2)' --dut2_0 'DUT_NAME lanforge BSSID (1)'", + " --dut5_0 'USE_DUT_NAME lanforge BSSID (2)' --dut2_0 'USE_DUT_NAME lanforge BSSID (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", diff --git a/py-scripts/tools/ct_us_004_tests.json b/py-scripts/tools/ct_us_004_tests.json index 0cec55a6..88e81293 100644 --- a/py-scripts/tools/ct_us_004_tests.json +++ b/py-scripts/tools/ct_us_004_tests.json @@ -50,10 +50,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -64,7 +64,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_wc", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -89,10 +89,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -103,7 +103,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -151,10 +151,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984_wc":{ @@ -165,7 +165,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984_wc ", - " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -190,10 +190,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_ATH10K_9984_dp":{ @@ -204,7 +204,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ATH10K_9984_dp", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -232,10 +232,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_wc":{ @@ -246,7 +246,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_wc ", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -271,10 +271,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_AX210_dp":{ @@ -285,7 +285,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario AX210_dp", - " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AX 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy3,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, @@ -312,10 +312,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_wc":{ @@ -326,7 +326,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario m7915e_wc ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -351,10 +351,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ] }, "create_chamberview_mt7915e_dp":{ @@ -365,7 +365,7 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario mt7915e_dp", - " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_DUT_NAME Radio-2' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, @@ -392,10 +392,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -405,8 +405,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, @@ -419,7 +419,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", + " --dut5_0 'USE_DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'USE_DUT_NAME lanforge DUT_BSSID_2G (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", @@ -454,10 +454,10 @@ "command":"create_chamberview_dut.py", "args":"", "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME", " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", - " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" + " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME" ]}, "create_chamberview_ap":{ "enabled":"TRUE", @@ -467,8 +467,8 @@ "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", " --create_scenario ap_auto", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ", + " --raw_line \"profile_link 1.1 STA-AUTO 4 'DUT: USE_DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, @@ -481,7 +481,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap_auto --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", + " --dut5_0 'USE_DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 'USE_DUT_NAME lanforge DUT_BSSID_2G (1)'", " --max_stations_2 8 --max_stations_5 8 --max_stations_dual 1", " --radio2 1.1.wiphy0 --radio2 1.1.wiphy2 --radio2 1.1.wiphy4 --radio2 1.1.wiphy5 --radio2 1.1.wiphy6 --radio2 1.1.wiphy7", " --radio5 1.1.wiphy1 --radio5 1.1.wiphy2 --radio5 1.1.wiphy3 --radio5 1.1.wiphy4 --radio5 1.1.wiphy5 --radio5 1.1.wiphy6 --radio5 1.1.wiphy7", diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 44459623..48823a69 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -192,7 +192,7 @@ class lf_check(): # section DUT # dut selection self.dut_set_name = 'DUT_NAME ASUSRT-AX88U' # note the name will be set as --set DUT_NAME ASUSRT-AX88U, this is not dut_name (see above) - self.dut_name = "DUT_NAME_NA" # "ASUSRT-AX88U" note this is not dut_set_name + self.use_dut_name = "DUT_NAME_NA" # "ASUSRT-AX88U" note this is not dut_set_name self.dut_hw = "DUT_HW_NA" self.dut_sw = "DUT_SW_NA" self.dut_model = "DUT_MODEL_NA" @@ -558,7 +558,7 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) else: self.logger.info("EMAIL_TXT not in test_rig_parameters json") - # dut_set_name selectes the DUT to test against , it is different then dut_name + # dut_set_name selectes the DUT to test against , it is different then use_dut_name # this value gets set in the test def read_dut_parameters(self): if "DUT_SET_NAME" in self.json_dut["test_dut"]: @@ -566,10 +566,10 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) else: self.logger.info("DUT_SET_NAME not in test_dut json") # dut name will set a chamberview scenerio for a DUT which can be selected with dut_set_name - if "DUT_NAME" in self.json_dut["test_dut"]: - self.dut_name = self.json_dut["test_dut"]["DUT_NAME"] + if "USE_DUT_NAME" in self.json_dut["test_dut"]: + self.use_dut_name = self.json_dut["test_dut"]["USE_DUT_NAME"] else: - self.logger.info("DUT_NAME not in test_dut json") + self.logger.info("USE_DUT_NAME not in test_dut json") if "DUT_HW" in self.json_dut["test_dut"]: self.dut_hw = self.json_dut["test_dut"]["DUT_HW"] @@ -732,8 +732,8 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip, qa_url=qa_url) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('LF_MGR_PORT', self.lf_mgr_port) # DUT Configuration - if 'DUT_NAME' in self.test_dict[test]['args']: - self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('DUT_NAME', self.dut_name) + if 'USE_DUT_NAME' in self.test_dict[test]['args']: + self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('USE_DUT_NAME', self.use_dut_name) if 'DUT_HW' in self.test_dict[test]['args']: self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('DUT_HW', self.dut_hw) if 'DUT_SW' in self.test_dict[test]['args']: