lf_check.py , ct_us_002.json, ct_us_001.json

the replace of LF_MGR needed to be more specific changed to LF_MGR_IP

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-07-10 20:15:13 -06:00
parent 062aac80ea
commit 9bc1ec8251
3 changed files with 20 additions and 20 deletions

View File

@@ -4,14 +4,14 @@
"The json is used to orchastrate the tests to be run on testbed ct_us_001", "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", "This json file is used as an input to the ./lf_check.py file",
"The variables that are all capitalized below are replaced with configuration", "The variables that are all capitalized below are replaced with configuration",
"from the json file. so LF_MGR in the test below is replaced by the json lf_mgr", "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", "The replacement is loosely coupled so the upper and lower case convention is used",
"to identify replaced strings in the lf_check.py code." "to identify replaced strings in the lf_check.py code."
] ]
}, },
"test_parameters":{ "test_parameters":{
"test_bed": "CT-US-001", "test_bed": "CT-US-001",
"lf_mgr": "192.168.100.116", "lf_mgr_ip": "192.168.100.116",
"lf_mgr_port": "8080", "lf_mgr_port": "8080",
"dut_name": "ASUSRT-AX88U", "dut_name": "ASUSRT-AX88U",
"dut_bssid": "3c:7c:3f:55:4d:64", "dut_bssid": "3c:7c:3f:55:4d:64",
@@ -78,7 +78,7 @@
"suite_wc_dp":{ "suite_wc_dp":{
"CT-US-001_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"", "CT-US-001_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
"args_list":[ "args_list":[
"--lfmgr LF_MGR --port LF_MGR_PORT --dut_name DUT_NAME", "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME",
" --ssid 'ssid_idx=0 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'", " --ssid 'ssid_idx=0 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'",
" --ssid 'ssid_idx=1 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'", " --ssid 'ssid_idx=1 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'",
" --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'" " --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'"
@@ -86,7 +86,7 @@
}, },
"CT-US-001_create_chamberview_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"", "CT-US-001_create_chamberview_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"",
"args_list":[ "args_list":[
" --lfmgr LF_MGR --port LF_MGR_PORT --delete_scenario", " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ct-us-001-scenario ", " --create_scenario ct-us-001-scenario ",
" --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-1' NA wiphy1,AUTO -1 NA' ",
" --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy3,AUTO -1 NA' ", " --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy3,AUTO -1 NA' ",
@@ -115,7 +115,7 @@
}, },
"CT-US-001_create_chamberview_dut_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"", "CT-US-001_create_chamberview_dut_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
"args_list":[ "args_list":[
"--lfmgr LF_MGR --port LF_MGR_PORT --dut_name DUT_NAME", "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME",
" --ssid 'ssid_idx=0 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'", " --ssid 'ssid_idx=0 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'",
" --ssid 'ssid_idx=1 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'", " --ssid 'ssid_idx=1 ssid=asus11ax-5 security=WPA2 password=hello123 bssid=3c:7c:3f:55:4d:64'",
" --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'" " --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'"
@@ -123,7 +123,7 @@
}, },
"CT-US-001_create_chamberview_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"", "CT-US-001_create_chamberview_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"",
"args_list":[ "args_list":[
" --lfmgr LF_MGR --port LF_MGR_PORT --delete_scenario", " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ct-us-001-scenario ", " --create_scenario ct-us-001-scenario ",
" --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-1' NA wiphy1,AUTO -1 NA' ",
" --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy3,AUTO -1 NA' ", " --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy3,AUTO -1 NA' ",

View File

@@ -4,14 +4,14 @@
"The json is used to orchastrate the tests to be run on testbed ct_us_001", "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", "This json file is used as an input to the ./lf_check.py file",
"The variables that are all capitalized below are replaced with configuration", "The variables that are all capitalized below are replaced with configuration",
"from the json file. so LF_MGR in the test below is replaced by the json lf_mgr", "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", "The replacement is loosely coupled so the upper and lower case convention is used",
"to identify replaced strings in the lf_check.py code." "to identify replaced strings in the lf_check.py code."
] ]
}, },
"test_parameters":{ "test_parameters":{
"test_bed": "CT-US-002", "test_bed": "CT-US-002",
"lf_mgr": "192.168.100.200", "lf_mgr_ip": "192.168.100.200",
"lf_mgr_port": "8080", "lf_mgr_port": "8080",
"dut_name": "Ruckus-R750", "dut_name": "Ruckus-R750",
"dut_bssid": "4c:b1:cd:18:e8:ec", "dut_bssid": "4c:b1:cd:18:e8:ec",
@@ -78,14 +78,14 @@
"suite_wc_dp":{ "suite_wc_dp":{
"CT-US-002_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"", "CT-US-002_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
"args_list":[ "args_list":[
"--lfmgr LF_MGR --port LF_MGR_PORT --dut_name DUT_NAME", "--lfmgr LF_MGR_IP--port LF_MGR_PORT --dut_name DUT_NAME",
" --ssid 'ssid_idx=0 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'", " --ssid 'ssid_idx=0 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
" --ssid 'ssid_idx=1 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'", " --ssid 'ssid_idx=1 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
" --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'" " --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'"
]}, ]},
"CT-US-002_create_chamberview_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"", "CT-US-002_create_chamberview_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"",
"args_list":[ "args_list":[
" --lfmgr LF_MGR --port LF_MGR_PORT --delete_scenario", " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ucentral-scenario ", " --create_scenario ucentral-scenario ",
" --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-1' NA wiphy1,AUTO -1 NA' ",
" --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA' ", " --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA' ",
@@ -114,14 +114,14 @@
}, },
"CT-US-002_create_chamberview_dut_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"", "CT-US-002_create_chamberview_dut_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
"args_list":[ "args_list":[
"--lfmgr LF_MGR --port LF_MGR_PORT --dut_name DUT_NAME", "--lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME",
" --ssid 'ssid_idx=0 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'", " --ssid 'ssid_idx=0 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
" --ssid 'ssid_idx=1 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'", " --ssid 'ssid_idx=1 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
" --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'" " --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num 'ct523c'"
]}, ]},
"CT-US-002_create_chamberview_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"", "CT-US-002_create_chamberview_2":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"",
"args_list":[ "args_list":[
" --lfmgr LF_MGR --port LF_MGR_PORT --delete_scenario", " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ucentral-scenario ", " --create_scenario ucentral-scenario ",
" --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-1' NA wiphy1,AUTO -1 NA' ",
" --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA' ", " --raw_line 'profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA' ",
@@ -130,7 +130,7 @@
}, },
"CT-US-002_wifi_capacity_AX200 CT-US-002":{"enabled":"TRUE","load_db":"skip","command":"lf_wifi_capacity_test.py","args":"", "CT-US-002_wifi_capacity_AX200 CT-US-002":{"enabled":"TRUE","load_db":"skip","command":"lf_wifi_capacity_test.py","args":"",
"args_list":[ "args_list":[
" --mgr LF_MGR --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", " --mgr LF_MGR --port LF_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,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 ", " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 ",
" --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG",
@@ -139,7 +139,7 @@
}, },
"CT-US-002_dataplane_AX200":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"", "CT-US-002_dataplane_AX200":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"",
"args_list":[ "args_list":[
" --mgr LF_MGR --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-dpt", " --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 DUT_NAME --duration 30s --station 1.1.wlan4", " --config_name test_con --upstream 1.1.eth2 --dut DUT_NAME --duration 30s --station 1.1.wlan4",
" --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;88;120;256;512;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'",

View File

@@ -129,7 +129,7 @@ class lf_check():
self.host_ip_test = None self.host_ip_test = None
self.email_title_txt = "" self.email_title_txt = ""
self.email_txt = "" self.email_txt = ""
self.lf_mgr = "" self.lf_mgr_ip = ""
self.lf_mgr_port = "" self.lf_mgr_port = ""
self.dut_name = "" # "ASUSRT-AX88U" note this is not dut_set_name self.dut_name = "" # "ASUSRT-AX88U" note this is not dut_set_name
self.dut_bssid = "" #"3c:7c:3f:55:4d:64" - this is the mac for the radio this may be seen with a scan self.dut_bssid = "" #"3c:7c:3f:55:4d:64" - this is the mac for the radio this may be seen with a scan
@@ -402,10 +402,10 @@ blog: http://{blog}:2368
self.email_txt = self.json_data["test_parameters"]["email_txt"] self.email_txt = self.json_data["test_parameters"]["email_txt"]
else: else:
self.logger.info("email_txt not in test_parameters json") self.logger.info("email_txt not in test_parameters json")
if "lf_mgr" in self.json_data["test_parameters"]: if "lf_mgr_ip" in self.json_data["test_parameters"]:
self.lf_mgr = self.json_data["test_parameters"]["lf_mgr"] self.lf_mgr = self.json_data["test_parameters"]["lf_mgr_ip"]
else: else:
self.logger.info("lf_mgr not in test_parameters json") self.logger.info("lf_mgr_ip not in test_parameters json")
if "lf_mgr_port" in self.json_data["test_parameters"]: if "lf_mgr_port" in self.json_data["test_parameters"]:
self.lf_mgr_port = self.json_data["test_parameters"]["lf_mgr_port"] self.lf_mgr_port = self.json_data["test_parameters"]["lf_mgr_port"]
else: else:
@@ -711,8 +711,8 @@ blog: http://{blog}:2368
if 'TEST_IP' in self.test_dict[test]['args']: if 'TEST_IP' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('TEST_IP',self.test_ip) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('TEST_IP',self.test_ip)
if 'LF_MGR' in self.test_dict[test]['args']: if 'LF_MGR_IP' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('LF_MGR',self.lf_mgr) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('LF_MGR_IP',self.lf_mgr_ip)
if 'LF_MGR_PORT' in self.test_dict[test]['args']: if 'LF_MGR_PORT' in self.test_dict[test]['args']:
self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('LF_MGR_PORT',self.lf_mgr_port) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace('LF_MGR_PORT',self.lf_mgr_port)
if 'DUT_NAME' in self.test_dict[test]['args']: if 'DUT_NAME' in self.test_dict[test]['args']: