From 2b3c11f2af74c1b67e42eab7c60bc35fc03d83af Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Sat, 10 Jul 2021 20:27:32 -0600 Subject: [PATCH] lf_check.py: bug fixes for using lf_mgr_ip ct_us_001.json, ct_us_002.json : updated to use LF_MGR_IP, LF_MGR_PORT in all tests Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/ct_us_001.json | 10 +++++----- py-scripts/tools/ct_us_002.json | 10 +++++----- py-scripts/tools/lf_check.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/py-scripts/tools/ct_us_001.json b/py-scripts/tools/ct_us_001.json index 7441a632..c1feec8d 100644 --- a/py-scripts/tools/ct_us_001.json +++ b/py-scripts/tools/ct_us_001.json @@ -78,7 +78,7 @@ "suite_wc_dp":{ "CT-US-001_create_chamberview_dut_1":{"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", + " --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=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'" @@ -95,7 +95,7 @@ }, "CT-US-001_wifi_capacity_ATH10K(9984)":{"enabled":"TRUE","load_db":"skip","command":"lf_wifi_capacity_test.py","args":"", "args_list":[ - " --mgr 192.168.100.116 --port 8080 --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", + " --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 --stations 1.1.wlan1", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", @@ -104,7 +104,7 @@ }, "CT-US-001_dataplane_ATH10K(9984)":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"", "args_list":[ - " --mgr 192.168.100.116 --port 8080 --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 asus_5g --duration 30s --station 1.1.wlan1", " --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'", @@ -132,7 +132,7 @@ }, "CT-US-001_wifi_capacity_AX210":{"enabled":"TRUE","load_db":"skip","command":"lf_wifi_capacity_test.py","args":"", "args_list":[ - " --mgr 192.168.100.116 --port 8080 --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", + " --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 --stations 1.1.wlan3", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", @@ -141,7 +141,7 @@ }, "CT-US-001_dataplane_AX210":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"", "args_list":[ - " --mgr 192.168.100.116 --port 8080 --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 asus_5g --duration 30s --station 1.1.wlan3", " --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'", diff --git a/py-scripts/tools/ct_us_002.json b/py-scripts/tools/ct_us_002.json index 4aadea03..87eb0320 100644 --- a/py-scripts/tools/ct_us_002.json +++ b/py-scripts/tools/ct_us_002.json @@ -78,7 +78,7 @@ "suite_wc_dp":{ "CT-US-002_create_chamberview_dut_1":{"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", + " --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=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'" @@ -94,7 +94,7 @@ }, "CT-US-002_wifi_capacity_ATH10k(9984)":{"enabled":"TRUE","load_db":"skip","command":"lf_wifi_capacity_test.py","args":"", "args_list":[ - "--mgr 192.168.100.200 --port 8080 --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", + " --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 --stations 1.1.wlan1", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", @@ -103,7 +103,7 @@ }, "CT-US-002_dataplane_ATH10k(9984) CT-US-002":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"", "args_list":[ - "--mgr 192.168.100.200 --port 8080 --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.wlan1", " --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' ", @@ -114,7 +114,7 @@ }, "CT-US-002_create_chamberview_dut_2":{"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", + " --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=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'" @@ -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":"", "args_list":[ - " --mgr LF_MGR --port LF_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", + " --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 --stations 1.1.wlan4 ", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 59288a93..1006d7f0 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -187,13 +187,13 @@ class lf_check(): hostname = socket.gethostname() ip = socket.gethostbyname(hostname) if(self.email_txt != ""): - message_txt = """{email_txt} lanforge target {lf_mgr} + message_txt = """{email_txt} lanforge target {lf_mgr_ip} Results from {hostname}: http://{ip}/{report} Blog: http://{blog}:2368 NOTE: for now to see stdout and stderr remove /home/lanforge from path. -""".format(hostname=hostname, ip=ip, report=report_url, email_txt=self.email_txt, lf_mgr=self.lf_mgr,blog=self.blog_host) +""".format(hostname=hostname, ip=ip, report=report_url, email_txt=self.email_txt, lf_mgr_ip=self.lf_mgr_ip,blog=self.blog_host) else: message_txt = """Results from {hostname}: @@ -403,7 +403,7 @@ blog: http://{blog}:2368 else: self.logger.info("email_txt not in test_parameters json") if "lf_mgr_ip" in self.json_data["test_parameters"]: - self.lf_mgr = self.json_data["test_parameters"]["lf_mgr_ip"] + self.lf_mgr_ip = self.json_data["test_parameters"]["lf_mgr_ip"] else: self.logger.info("lf_mgr_ip not in test_parameters json") if "lf_mgr_port" in self.json_data["test_parameters"]: