diff --git a/py-scripts/tools/ct_004_AX88U_dut.json b/py-scripts/tools/ct_004_AX88U_dut.json index 82f82a5d..6b829d1e 100644 --- a/py-scripts/tools/ct_004_AX88U_dut.json +++ b/py-scripts/tools/ct_004_AX88U_dut.json @@ -9,6 +9,7 @@ "test_dut":{ "DUT_SET_NAME": "DUT_NAME ASUSRT-AX88U", "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"}, "ssid_idx=1":{"ssid_idx":"1","SSID_USED":"asus11ax-5","SSID_PW_USED":"hello123","BSSID":"d4:5d:64:a0:7f:7c","SECURITY_USED":"wpa2"} diff --git a/py-scripts/tools/ct_us_001_rig.json b/py-scripts/tools/ct_us_001_rig.json index bab64d27..37f9ced7 100644 --- a/py-scripts/tools/ct_us_001_rig.json +++ b/py-scripts/tools/ct_us_001_rig.json @@ -1,18 +1,13 @@ { "ct_us_001":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_001", - "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 LANforge system and test run configuration" ] }, "test_rig_parameters":{ "TEST_BED": "CT-US-001", "TEST_RIG": "CT-US-001", - "DATABASE_SQLITE": "qa_001_test_db", + "DATABASE_SQLITE": "./tools/qa_001_Oct.db", "LF_MGR_IP": "192.168.100.116", "LF_MGR_PORT": "8080", "LF_MGR_USER": "lanforge", @@ -24,15 +19,8 @@ "LOAD_CUSTOM_DB": false, "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", - "HOST_IP_PRODUCTION": "192.168.95.6", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", - "HOST_IP_TEST": "192.168.95.6", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-001", "EMAIL_TXT": "Lanforge QA Testing CT-US-001 " - }, - "test_network":{ - "HTTP_TEST_IP": "192.168.50.1", - "FTP_TEST_IP": "192.168.50.1", - "TEST_IP": "192.168.50.1" } } \ No newline at end of file diff --git a/py-scripts/tools/ct_us_001_tests.json b/py-scripts/tools/ct_us_001_tests.json index e3d1c262..c48c049f 100644 --- a/py-scripts/tools/ct_us_001_tests.json +++ b/py-scripts/tools/ct_us_001_tests.json @@ -1,17 +1,12 @@ { "ct_tests_001":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_001", - "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 tests to be run by LANforge system" ] }, "test_suites":{ "suite_hc":{ - "CT-US-001_lf_help_check":{ + "lf_help_check":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_help_check.bash", @@ -49,7 +44,7 @@ } }, "suite_wc_dp_shorter":{ - "CT-US-001_create_chamberview_dut_0":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -61,19 +56,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-scenario ", + " --create_scenario mt7915e_wc", " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -88,7 +83,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_for_mt7915e_dp":{ + "create_chamberview_dut_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -100,19 +95,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_mt7915e_sta1":{ + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-mt7915e-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_dataplane_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -129,7 +124,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -141,7 +136,7 @@ } }, "suite_wc_dp":{ - "CT-US-001_lf_help_check":{ + "lf_help_check":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_help_check.bash", @@ -150,7 +145,7 @@ " " ] }, - "CT-US-001_create_chamberview_dut_for_ATH10K":{ + "create_chamberview_dut_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -162,7 +157,7 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_ATH10K(9984)_sta50":{ + "create_chamberview_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -174,7 +169,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_wifi_capacity_ATH10K(9984)":{ + "wifi_capacity_ATH10K(9984)":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -189,7 +184,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_ATH10K":{ + "create_chamberview_dut_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -201,19 +196,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_ATH10K(9984)_sta1":{ + "create_chamberview_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-ATH10K-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_dataplane_ATH10K(9984)_sta1":{ + "dataplane_ATH10K(9984)":{ "enabled":"TRUE", "load_db":"skip", "timeout":"600", @@ -231,7 +226,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_for_AX210":{ + "create_chamberview_dut_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -243,7 +238,7 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_wiphy3_AX210_sta1":{ + "create_chamberview_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -255,10 +250,11 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, - "CT-US-001_wifi_capacity_wiphy3_AX210_sta1":{ + "wifi_capacity_AX210":{ "enabled":"TRUE", - "load_db":"skip", + "timeout":"600", "iterations":"1", + "load_db":"skip", "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ @@ -269,7 +265,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_for_AX210_dp":{ + "create_chamberview_dut_AX210_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -281,19 +277,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_wiphy3_AX210_sta1_dp":{ + "create_chamberview_AX210_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-AX210-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, - "CT-US-001_dataplane_wiphy3_AX210_sta1":{ + "dataplane_AX210":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -310,7 +306,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_for_mt7915e":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -322,7 +318,7 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -334,7 +330,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -349,7 +345,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_for_mt7915e_dp":{ + "create_chamberview_dut_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -361,19 +357,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-001_create_chamberview_mt7915e_sta1":{ + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-001-mt7915e-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-001_dataplane_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -390,7 +386,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -401,7 +397,7 @@ " --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" ]}, - "CT-US-001_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -414,7 +410,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-001_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -440,7 +436,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -452,7 +448,7 @@ } }, "suite_ap":{ - "CT-US-001_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -463,20 +459,20 @@ " --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" ]}, - "CT-US-001_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ap-script ", + " --create_scenario ap-script", " --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 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-001_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -502,7 +498,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-001_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -513,10 +509,5 @@ ] } } - } -} - - - - \ No newline at end of file +} \ No newline at end of file diff --git a/py-scripts/tools/ct_us_002_rig.json b/py-scripts/tools/ct_us_002_rig.json index 707330f8..56586dcb 100644 --- a/py-scripts/tools/ct_us_002_rig.json +++ b/py-scripts/tools/ct_us_002_rig.json @@ -1,50 +1,27 @@ { "ct_us_002":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_002", - "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 LANforge system and test run configuration" ] }, "test_rig_parameters":{ "TEST_BED": "CT-US-002", "TEST_RIG": "CT-US-002", - "DATABASE_SQLITE": "qa_002_test_db", + "DATABASE_SQLITE": "./tools/qa_002_Oct.db", "LF_MGR_IP": "192.168.100.200", "LF_MGR_PORT": "8080", "LF_MGR_USER": "lanforge", "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT": "1.1.eth2", - "DUT_SET_NAME": "DUT_NAME NETGEAR59-5G", "TEST_TIMEOUT": 600, "LOAD_BLANK_DB": false, "LOAD_FACTORY_DEFAULT_DB": true, "LOAD_CUSTOM_DB": false, "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", - "HOST_IP_PRODUCTION": "192.168.100.153", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", - "HOST_IP_TEST": "192.168.100.153", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-002", "EMAIL_TXT": "Lanforge QA Testing CT-US-002" - }, - "test_network":{ - "HTTP_TEST_IP": "10.40.0.10", - "FTP_TEST_IP": "10.40.0.10", - "TEST_IP": "192.168.0.104" - }, - "radio_dict":{ - "1.1.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11an-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11an-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy2":{"KEY":"1.1.wiphy2","RADIO":"1.1.wiphy2","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11an-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy3":{"KEY":"1.1.wiphy3","RADIO":"1.1.wiphy3","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11an-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy4":{"KEY":"1.1.wiphy4","RADIO":"1.1.wiphy4","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy5":{"KEY":"1.1.wiphy5","RADIO":"1.1.wiphy5","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy6":{"KEY":"1.1.wiphy6","RADIO":"1.1.wiphy6","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy7":{"KEY":"1.1.wiphy7","RADIO":"1.1.wiphy7","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"} } } diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json index 600d5111..62f362e5 100644 --- a/py-scripts/tools/ct_us_002_tests.json +++ b/py-scripts/tools/ct_us_002_tests.json @@ -1,4 +1,9 @@ { + "ct_tests_002":{ + "Notes":[ + "This json file describes tests to be run by LANforge system" + ] + }, "test_suites":{ "suite_l3":{ "test_l3_longevity":{ @@ -12,7 +17,7 @@ " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000" ] }, - "CT-US-002_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -28,7 +33,7 @@ "test_l3_longevity":{"enabled":"TRUE","command":"test_l3_longevity.py","args":"--test_duration 15s --polling_interval 5s --upstream_port UPSTREAM_PORT --radio 'radio==wiphy1,stations==4,ssid==ct523c-vap,ssid_pw==ct523c-vap,security==wpa2' --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"} }, "auto_suite":{ - "CT-US-002_create_chamberview_dut_1":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -39,7 +44,7 @@ " --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" ]}, - "CT-US-002_create_chamberview_1":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -52,7 +57,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"6000", @@ -69,7 +74,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-002_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -81,7 +86,7 @@ } }, "suite_wc_dp":{ - "CT-US-002_create_chamberview_dut_1":{ + "create_chamberview_dut_ATH10k(9984)":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -92,20 +97,20 @@ " --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" ]}, - "CT-US-002_create_chamberview_ATH10k_sta64":{ + "create_chamberview_ATH10k(9984)":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ucentral-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_wifi_capacity_ATH10k(9984)":{ + "wifi_capacity_ATH10k(9984)":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_wifi_capacity_test.py", @@ -118,7 +123,7 @@ " --set DUT_SET_NAME " ] }, - "CT-US-002_create_chamberview_dut_ATH10K_wan1":{ + "create_chamberview_dut_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -129,19 +134,19 @@ " --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" ]}, - "CT-US-002_create_chamberview_ATH10k_wan1":{ + "create_chamberview_ATH10k(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ucentral-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_dataplane_ATH10k(9984) CT-US-002":{ + "dataplane_ATH10k(9984)":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_dataplane_test.py", @@ -156,7 +161,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-002_create_chamberview_dut_2":{ + "create_chamberview_dut_AX200_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -167,20 +172,20 @@ " --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" ]}, - "CT-US-002_create_chamberview_AX200_sta1":{ + "create_chamberview_AX200_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ucentral-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_wifi_capacity_AX200 CT-US-002":{ + "wifi_capacity_AX200":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_wifi_capacity_test.py", @@ -192,7 +197,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-002_create_chamberview_dut_AX200_wan1":{ + "create_chamberview_dut_AX200_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -203,19 +208,19 @@ " --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" ]}, - "CT-US-002_create_chamberview_AX200_wan1":{ + "create_chamberview_AX200_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ucentral-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_dataplane_AX200":{ + "dataplane_AX200":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_dataplane_test.py", @@ -230,7 +235,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-002_create_chamberview_dut_auto":{ + "create_chamberview_dut_ap":{ "enabled":"", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -241,20 +246,20 @@ " --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" ]}, - "CT-US-002_create_chamberview_auto":{ + "create_chamberview_ap":{ "enabled":"FALSE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ucentral-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "CT-US-002_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout": "25200", @@ -279,7 +284,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-002_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", diff --git a/py-scripts/tools/ct_us_003_rig.json b/py-scripts/tools/ct_us_003_rig.json index 10e5fabd..37ef1d5e 100644 --- a/py-scripts/tools/ct_us_003_rig.json +++ b/py-scripts/tools/ct_us_003_rig.json @@ -1,18 +1,13 @@ { "ct_us_003":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_003", - "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 LANforge system and test run configuration" ] }, "test_rig_parameters":{ "TEST_BED": "CT-US-003", "TEST_RIG": "CT-US-003", - "DATABASE_SQLITE": "qa_003_test_db", + "DATABASE_SQLITE": "./tools/qa_003_Oct.db", "LF_MGR_IP": "192.168.100.233", "LF_MGR_PORT": "8080", "LF_MGR_USER": "lanforge", @@ -24,24 +19,9 @@ "LOAD_CUSTOM_DB": false, "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", - "HOST_IP_PRODUCTION": "192.168.95.6", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", - "HOST_IP_TEST": "192.168.95.6", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-003", "EMAIL_TXT": "Lanforge QA Testing CT-US-003" - }, - "test_network":{ - "HTTP_TEST_IP": "192.168.50.1", - "FTP_TEST_IP": "192.168.50.1", - "TEST_IP": "192.168.50.1" - }, - "radio_dict":{ - "1.1.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"mt7915e()","CAPABILITIES":"802.11abgn-AX","MAX_STA":"19","MAX_VAP":"16","MAX_VIFS":"19"}, - "1.2.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.2.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.3.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.3.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"} } } diff --git a/py-scripts/tools/ct_us_003_tests.json b/py-scripts/tools/ct_us_003_tests.json index 94a2315f..20c6521d 100644 --- a/py-scripts/tools/ct_us_003_tests.json +++ b/py-scripts/tools/ct_us_003_tests.json @@ -1,12 +1,7 @@ { "ct_tests_003":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_003", - "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 tests to be run by LANforge system" ] }, "test_suites": { @@ -49,7 +44,7 @@ } }, "suite_wc_dp_shorter":{ - "ct-us-003_create_chamberview_dut_0":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -61,19 +56,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "ct-us-003_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-scenario ", + " --create_scenario mt7915e_wc ", " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "ct-us-003_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -88,7 +83,7 @@ " --set DUT_SET_NAME" ] }, - "ct-us-003_create_chamberview_dut_for_mt7915e_dp":{ + "create_chamberview_dut_for_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -100,7 +95,7 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "ct-us-003_create_chamberview_mt7915e_sta1":{ + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -112,7 +107,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "ct-us-003_dataplane_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -140,8 +135,8 @@ ] } }, - "suite_wc_dp":{ - "CT-US-003_create_chamberview_dut_for_ATH10K":{ + "suite_wc_dp_ap":{ + "create_chamberview_dut_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -153,19 +148,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_ATH10K(9984)_sta50":{ + "create_chamberview_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-003_wifi_capacity_ATH10K(9984)":{ + "wifi_capacity_ATH10K(9984)":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -180,7 +175,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_ATH10K":{ + "create_chamberview_dut_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -192,19 +187,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_ATH10K(9984)_sta1":{ + "create_chamberview_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-ATH10K-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-003_dataplane_ATH10K(9984)_sta1":{ + "dataplane_ATH10K(9984)":{ "enabled":"TRUE", "load_db":"skip", "timeout":"600", @@ -222,7 +217,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_for_AX210":{ + "create_chamberview_dut_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -234,19 +229,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_wiphy3_AX210_sta1":{ + "create_chamberview_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-AX210-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, - "CT-US-003_wifi_capacity_wiphy3_AX210_sta1":{ + "wifi_capacity_wiphy3_AX210":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -260,7 +255,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_for_AX210_dp":{ + "create_chamberview_dut_AX210_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -272,19 +267,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_wiphy3_AX210_sta1_dp":{ + "create_chamberview_AX210_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-AX210-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, - "CT-US-003_dataplane_wiphy3_AX210_sta1":{ + "dataplane_AX210":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -301,7 +296,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_for_mt7915e":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -313,19 +308,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-mt7915e-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-003_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -340,7 +335,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_for_mt7915e_dp":{ + "create_chamberview_dut_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -352,19 +347,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-003_create_chamberview_mt7915e_sta1":{ + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-003-mt7915e-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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-003_dataplane_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -381,7 +376,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"FALSE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -392,7 +387,7 @@ " --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" ]}, - "CT-US-003_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"FALSE", "load_db":"skip", "command":"create_chamberview.py", @@ -405,7 +400,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-003_lf_ap_auto_test": { + "ap_auto": { "enabled": "FALSE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -431,7 +426,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -443,7 +438,7 @@ } }, "suite_ap":{ - "CT-US-003_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -454,20 +449,20 @@ " --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" ]}, - "CT-US-003_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ap-script ", + " --create_scenario ap-script", " --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 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-003_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -493,7 +488,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-003_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -511,4 +506,4 @@ - \ No newline at end of file + diff --git a/py-scripts/tools/ct_us_004_rig.json b/py-scripts/tools/ct_us_004_rig.json index 488e396c..e91d3eff 100644 --- a/py-scripts/tools/ct_us_004_rig.json +++ b/py-scripts/tools/ct_us_004_rig.json @@ -1,54 +1,27 @@ { "ct_us_004":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_004", - "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 LANforge system and test run configuration" ] }, "test_rig_parameters":{ "TEST_BED": "CT-US-004", "TEST_RIG": "CT-US-004", - "DATABASE_SQLITE": "qa_004_test_db", + "DATABASE_SQLITE": "./tools/qa_004_Oct.db", "LF_MGR_IP": "192.168.100.194", "LF_MGR_PORT": "8080", "LF_MGR_USER": "lanforge", "LF_MGR_PASS": "lanforge", "UPSTREAM_PORT": "1.1.eth2", - "DUT_SET_NAME": "DUT_NAME Asus-RT-AX88U", - "DUT_NAME": "Asus-RT-AX88U", - "DUT_BSSID_2G": "d4:5d:64:a0:7f:78", - "DUT_BSSID_5G": "d4:5d:64:a0:7f:7c", - "DUT_SW": "3.0.0.4.386_44266", "TEST_TIMEOUT": 300, "LOAD_BLANK_DB": false, "LOAD_FACTORY_DEFAULT_DB": true, "LOAD_CUSTOM_DB": false, "CUSTOM_DB": "DFLT_ETH1_GEN", "EMAIL_LIST_PRODUCTION": "konikofi@candelatech.com,greearb@candelatech.com,,jreynolds@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com", - "HOST_IP_PRODUCTION": "192.168.100.201", "EMAIL_LIST_TEST": "chuck.rekiere@candelatech.com", - "HOST_IP_TEST": "192.168.100.201", "EMAIL_TITLE_TXT": "Lanforge QA Testing CT-US-004", "EMAIL_TXT": "Lanforge QA Testing CT-US-004 " - }, - "test_network":{ - "HTTP_TEST_IP": "10.40.0.10", - "FTP_TEST_IP": "10.40.0.10", - "TEST_IP": "192.168.0.104" - }, - "radio_dict":{ - "1.1.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11bgn-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11an-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy2":{"KEY":"1.1.wiphy2","RADIO":"1.1.wiphy2","DRIVER":"ath9k()","CAPABILITIES":"802.11abgn","MAX_STA":"2048","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy3":{"KEY":"1.1.wiphy3","RADIO":"1.1.wiphy3","DRIVER":"ath10k(998x)","CAPABILITIES":"802.11abgn-AC","MAX_STA":"127","MAX_VAP":"24","MAX_VIFS":"64"}, - "1.1.wiphy4":{"KEY":"1.1.wiphy4","RADIO":"1.1.wiphy4","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy5":{"KEY":"1.1.wiphy5","RADIO":"1.1.wiphy5","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy6":{"KEY":"1.1.wiphy6","RADIO":"1.1.wiphy6","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, - "1.1.wiphy7":{"KEY":"1.1.wiphy7","RADIO":"1.1.wiphy7","DRIVER":"mt7915e()","CAPABILITIES":"802.11abgn-AX","MAX_STA":"19","MAX_VAP":"16","MAX_VIFS":"19"} } } diff --git a/py-scripts/tools/ct_us_004_tests.json b/py-scripts/tools/ct_us_004_tests.json index f5a2bd69..af7ed350 100644 --- a/py-scripts/tools/ct_us_004_tests.json +++ b/py-scripts/tools/ct_us_004_tests.json @@ -1,15 +1,21 @@ { "ct_tests_004":{ "Notes":[ - "The json is used to orchastrate the tests to be run on testbed ct_us_004", - "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 tests to be run by LANforge system" ] }, "test_suites":{ + "suite_hc":{ + "lf_help_check":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"lf_help_check.bash", + "args":"", + "args_list":[ + " " + ] + } + }, "suite_l3":{ "test_l3_longevity":{ "enabled":"TRUE", @@ -18,7 +24,7 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --test_duration 15s --polling_interval 5s --upstream_port eth2 ", - " --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ", + " use_ssid_idx=1 --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ", " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000" ] } @@ -31,14 +37,14 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --test_duration 15s --polling_interval 5s --upstream_port eth2 ", - " --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ", + " use_ssid_idx=1 --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ", " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000", " --ap_read --ap_test_mode" ] } }, - "suite_wc_dp_mt":{ - "CT-US-004_create_chamberview_dut_0":{ + "suite_wc_dp_shorter":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -50,240 +56,75 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-004_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", + " --create_scenario mt7915e_wc", " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", + "iterations":"1", "load_db":"skip", "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name wc_m57915e", + " --upstream UPSTREAM_PORT --batch_size 1,10,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_mt7915e_sta1":{ + "create_chamberview_dut_mt7915e_dp":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"create_chamberview_dut.py", + "args":"", + "args_list":[ + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" + ] + }, + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_dataplane_ATH10K_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", + "iterations":"1", "command":"lf_dataplane_test.py", "args":"", "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-dpt", " --config_name test_con --upstream 1.1.eth2 --dut asus_5g --duration 30s --station 1.1.wlan7", - " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", + " --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: AUTO'", " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e' ", - " --test_rig TEST_RIG --set 'DUT_NAME" - ] - }, - "CT-US-004_QA":{ - "enabled":"TRUE", - "timeout":"600", - "load_db":"skip", - "command":"./tools/lf_qa.py", - "args":"", - "args_list":[ - " --path REPORT_PATH --store --png --database DATABASE_SQLITE" - ] - } - - }, - "suite_wc_dp_shorter":{ - "CT-US-004_create_chamberview_dut_for_ATH10K":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview_dut.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" - ] - }, - "CT-US-004_create_chamberview_ATH10K(9984)_sta50":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 50 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-004_wifi_capacity_ATH10K(9984)":{ - "enabled":"FALSE", - "timeout":"600", - "iterations":"1", - "load_db":"skip", - "command":"lf_wifi_capacity_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", - " --test_rig TEST_RIG ", - " --set DUT_SET_NAME" - ] - }, - "CT-US-004_create_chamberview_dut_0":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview_dut.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" - ] - }, - "CT-US-004_create_chamberview_mt7915e_sta19":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-004_wifi_capacity_mt7915e":{ - "enabled":"TRUE", - "timeout":"600", - "iterations":"1", - "load_db":"skip", - "command":"lf_wifi_capacity_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ] }, - "CT-US-004_QA":{ - "enabled":"TRUE", - "timeout":"600", - "load_db":"skip", - "command":"./tools/lf_qa.py", - "args":"", - "args_list":[ - " --path REPORT_PATH --store --png --database DATABASE_SQLITE" - ] - } - }, - "suite_wc_dp_short":{ - "CT-US-004_create_chamberview_dut_for_ATH10K":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview_dut.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" - ] - }, - "CT-US-004_create_chamberview_ATH10K(9984)_sta50":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 50 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-004_wifi_capacity_ATH10K(9984)":{ - "enabled":"TRUE", - "timeout":"600", - "iterations":"1", - "load_db":"skip", - "command":"lf_wifi_capacity_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", - " --test_rig TEST_RIG ", - " --set DUT_SET_NAME" - ] - }, - "CT-US-004_create_chamberview_dut_0":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview_dut.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" - ] - }, - "CT-US-004_create_chamberview_mt7915e_sta19":{ - "enabled":"TRUE", - "load_db":"skip", - "command":"create_chamberview.py", - "args":"", - "args_list":[ - " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" - ] - }, - "CT-US-004_wifi_capacity_mt7915e":{ - "enabled":"TRUE", - "timeout":"600", - "iterations":"1", - "load_db":"skip", - "command":"lf_wifi_capacity_test.py", - "args":"", - "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,10,15,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", - " --test_rig TEST_RIG", - " --set DUT_SET_NAME" - ] - }, - "CT-US-004_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -295,7 +136,7 @@ } }, "suite_wc_dp":{ - "CT-US-004_lf_help_check":{ + "lf_help_check":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_help_check.bash", @@ -304,7 +145,7 @@ " " ] }, - "CT-US-004_create_chamberview_dut_for_ATH10K":{ + "create_chamberview_dut_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -316,19 +157,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-004_create_chamberview_ATH10K(9984)_sta50":{ + "create_chamberview_ATH10K(9984)_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-ATH10K-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 50 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", + " --create_scenario ct-us-001-scenario ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_wifi_capacity_ATH10K(9984)":{ + "wifi_capacity_ATH10K(9984)":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -336,28 +177,41 @@ "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name wc_ATH10K", + " --upstream 1.1.eth2 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", " --test_rig TEST_RIG ", " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_ATH10K(9984)_sta1":{ + "create_chamberview_dut_ATH10K(9984)_dp":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"create_chamberview_dut.py", + "args":"", + "args_list":[ + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" + ] + }, + "create_chamberview_ATH10K(9984)_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-ATH10K_dp_scenario ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_dataplane_ATH10K(9984)_sta1":{ + "dataplane_ATH10K(9984)":{ "enabled":"TRUE", "load_db":"skip", + "timeout":"600", "iterations":"1", "command":"lf_dataplane_test.py", "args":"", @@ -369,10 +223,10 @@ " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_dut_for_AX210":{ + "create_chamberview_dut_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -384,33 +238,58 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-004_create_chamberview_wiphy3_AX210_sta1":{ + "create_chamberview_AX210_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-AX210-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy3,AUTO -1 NA\" ", + " --create_scenario ct-us-001-AX210-scenario ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " ] }, - "CT-US-004_wifi_capacity_wiphy3_AX210_sta1":{ + "wifi_capacity_AX210":{ "enabled":"TRUE", - "load_db":"skip", + "timeout":"600", "iterations":"1", + "load_db":"skip", "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", - " --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", + " --upstream 1.1.eth2 --batch_size 1 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan3 --test_tag 'AX210'", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ] }, - "CT-US-004_dataplane_wiphy3_AX210_sta1":{ + "create_chamberview_dut_AX210_dp":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"create_chamberview_dut.py", + "args":"", + "args_list":[ + "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" + ] + }, + "create_chamberview_AX210_dp":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"create_chamberview.py", + "args":"", + "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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\" " + ] + }, + "dataplane_AX210":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -427,7 +306,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_dut_for_mt7915e":{ + "create_chamberview_dut_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -439,19 +318,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "CT-US-004_create_chamberview_mt7915e_sta19":{ + "create_chamberview_mt7915e_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-mt7915e-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", + " --create_scenario ct-us-001-mt7915e-scenario ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_wifi_capacity_mt7915e":{ + "wifi_capacity_mt7915e":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -463,22 +342,34 @@ " --upstream 1.1.eth2 --batch_size 1,5,10,15,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'", " --test_rig TEST_RIG", - " --set DUT_SET_NAME" + " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_mt7915e_sta1":{ + "create_chamberview_dut_mt7915e_dp":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"create_chamberview_dut.py", + "args":"", + "args_list":[ + " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name 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" + ] + }, + "create_chamberview_mt7915e_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ct-us-004-mt7915e-scenario ", - " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy7,AUTO -1 NA\" ", + " --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 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "CT-US-004_dataplane_ATH10K_mt7915e_sta1":{ + "dataplane_mt7915e":{ "enabled":"TRUE", "load_db":"skip", "iterations":"1", @@ -495,7 +386,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-004_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -506,7 +397,7 @@ " --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" ]}, - "CT-US-004_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -519,7 +410,7 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-004_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -528,7 +419,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", " --instance_name ap-auto-instance --config_name test_con --upstream eth2", - " --dut5_0 'DUT_NAME lanforge BSSID (2)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", + " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 '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", @@ -545,7 +436,7 @@ " --set DUT_SET_NAME" ] }, - "CT-US-004_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -555,34 +446,33 @@ " --path REPORT_PATH --store --png --database DATABASE_SQLITE" ] } - }, "suite_ap":{ - "CT-US-004_create_chamberview_dut_2":{ + "create_chamberview_dut_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=DUT_BSSID_2G'", + " --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" ]}, - "CT-US-004_create_chamberview_ap":{ + "create_chamberview_ap":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ap-004 ", - " --raw_line \"profile_link 1.1 STA-abgn-AC 4 'DUT: DUT_NAME Radio-0' NA wiphy1,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 STA-AC 2 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA\" ", - " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " + " --create_scenario ap-script", + " --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 upstream-dhcp 1 NA NA eth2,AUTO -1 NA \" " ] }, - "CT-US-004_lf_ap_auto_test": { + "ap_auto": { "enabled": "TRUE", "command": "lf_ap_auto_test.py", "timeout":"25200", @@ -590,18 +480,25 @@ "args": "", "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge", - " --instance_name ap-auto-instance --config_name test_con --upstream UPSTREAM_PORT", - " --dut5_0 'DUT_NAME lanforge BSSID (1)' --dut2_0 'DUT_NAME lanforge DUT_BSSID_2G (1)'", - " --max_stations_2 4 --max_stations_5 2 --max_stations_dual 100 --radio2 1.1.wiphy0", - " --radio5 1.1.wiphy1 --set 'Basic Client Connectivity' 1", - " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", - " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", + " --instance_name ap-auto-instance --config_name test_con --upstream eth2", + " --dut5_0 'DUT_NAME lanforge DUT_BSSID_5G (2)' --dut2_0 '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", + " --set 'Basic Client Connectivity' 1", + " --set 'Multi Band Performance' 1", + " --set 'Stability' 0", + " --set 'Multi-Station Throughput vs Pkt Size' 0,", + " --set 'Throughput vs Pkt Size' 0", + " --set 'Capacity' 0", + " --set 'Band-Steering' 0", + " --set 'Skip 2.4 Ghz Tests' 1", + " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AP_AUTO'", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ] }, - "CT-US-004_QA":{ + "lf_qa":{ "enabled":"TRUE", "timeout":"600", "load_db":"skip", @@ -613,8 +510,4 @@ } } } -} - - - - \ No newline at end of file +} \ No newline at end of file diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 13539bfe..f987a420 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -141,7 +141,6 @@ class lf_check(): self.production_run = _production self.report_path = _report_path self.log_path = _log_path - self.radio_dict = {} self.test_dict = {} path_parent = os.path.dirname(os.getcwd()) os.chdir(path_parent) @@ -192,8 +191,6 @@ 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) - - # dut configuration self.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" @@ -214,9 +211,7 @@ class lf_check(): self.use_factory_default_db = "FALSE" self.use_custom_db = "FALSE" self.email_list_production = "" - self.host_ip_production = None self.email_list_test = "" - self.host_ip_test = None self.email_title_txt = "" self.email_txt = "" @@ -379,7 +374,7 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) mail_subject = "Regression Test [{hostname}] {date}".format(hostname=hostname, date=datetime.datetime.now()) try: if self.production_run == True: - msg = message_txt.format(ip=self.host_ip_production) + msg = message_txt.format(ip=ip) # for postfix from command line echo "My message" | mail -s subject user@candelatech.com command = "echo \"{message}\" | mail -s \"{subject}\" {address}".format( message=msg, @@ -456,23 +451,6 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) self.logger.info("EXITING ERROR test_rig_parameters not in rig json") exit(1) - if "test_network" in self.json_rig: - self.logger.info("json: read test_network") - # self.logger.info("test_network {}".format(self.json_rig["test_network"])) - self.read_test_network() - else: - self.logger.info("EXITING test_network not in json {}".format(self.json_rig)) - self.logger.info("EXITING ERROR test_network not in rig json") - exit(1) - - if "radio_dict" in self.json_rig: - self.logger.info("json: read radio_dict") - # self.logger.info("radio_dict {}".format(self.json_rig["radio_dict"])) - self.radio_dict = self.json_rig["radio_dict"] - self.logger.info("self.radio_dict {}".format(self.radio_dict)) - else: - self.logger.info("radio_dict not in json {}".format(self.json_rig)) - # read dut configuration def read_json_dut(self): if "test_dut" in self.json_dut: @@ -561,22 +539,12 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) else: self.logger.info("EMAIL_LIST_PRODUCTION not in test_rig_parameters json") exit(1) - if "HOST_IP_PRODUCTION" in self.json_rig["test_rig_parameters"]: - self.host_ip_production = self.json_rig["test_rig_parameters"]["HOST_IP_PRODUCTION"] - else: - self.logger.info("HOST_IP_PRODUCTION not in test_rig_parameters json") - exit(1) if "EMAIL_LIST_TEST" in self.json_rig["test_rig_parameters"]: self.email_list_test = self.json_rig["test_rig_parameters"]["EMAIL_LIST_TEST"] print(self.email_list_test) else: self.logger.info("EMAIL_LIST_TEST not in test_rig_parameters json") exit(1) - if "HOST_IP_TEST" in self.json_rig["test_rig_parameters"]: - self.host_ip_test = self.json_rig["test_rig_parameters"]["HOST_IP_TEST"] - else: - self.logger.info("HOST_IP_TEST not in test_rig_parameters json") - exit(1) if "EMAIL_TITLE_TXT" in self.json_rig["test_rig_parameters"]: self.email_title_txt = self.json_rig["test_rig_parameters"]["EMAIL_TITLE_TXT"] else: @@ -626,23 +594,6 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) self.logger.info("wireless_network_dict not in test_dut json") exit(1) - def read_test_network(self): - if "HTTP_TEST_IP" in self.json_rig["test_network"]: - self.http_test_ip = self.json_rig["test_network"]["HTTP_TEST_IP"] - else: - self.logger.info("HTTP_TEST_IP not in test_network json") - exit(1) - if "FTP_TEST_IP" in self.json_rig["test_network"]: - self.ftp_test_ip = self.json_rig["test_network"]["FTP_TEST_IP"] - else: - self.logger.info("FTP_TEST_IP not in test_network json") - exit(1) - if "TEST_IP" in self.json_rig["test_network"]: - self.ftp_test_ip = self.json_rig["test_network"]["TEST_IP"] - else: - self.logger.info("TEST_IP not in test_network json") - exit(1) - def load_FACTORY_DFLT_database(self): # self.logger.info("file_wd {}".format(self.scripts_wd)) try: @@ -695,16 +646,6 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url) def run_script_test(self): self.start_html_results() self.start_csv_results() - #print(self.test_dict) - - # loop through radios (For future functionality based on radio) - if self.radio_dict: - for radio in self.radio_dict: - # This has been changed to reflect the Radio configuriaton of LANforge, for now print - print("rig json config: RADIO: {radio} DRIVER: {driver} CAPABILITIES {cap} MAX_STA {max_sta} MAX_VAP {max_vap} MAX_VIFS {max_vif}".format( - radio=self.radio_dict[radio]['RADIO'],driver=self.radio_dict[radio]['DRIVER'],cap=self.radio_dict[radio]['CAPABILITIES'], - max_sta=self.radio_dict[radio]['MAX_STA'],max_vap=self.radio_dict[radio]['MAX_VAP'],max_vif=self.radio_dict[radio]['MAX_VIFS'])) - # Configure Tests for test in self.test_dict: if self.test_dict[test]['enabled'] == "FALSE":