scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-04 04:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

gen_cxprofile: Fix improper line continuation errors

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-11-29 16:40:46 -08:00
parent 51d7e632e9
commit ce7a881510
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py-json/gen_cxprofile.py
View File

@@ -48,7 +48,7 @@ class GenCXProfile(LFCliBase):
if self.cmd == "": if self.cmd == "":
raise ValueError("Please ensure cmd has been set correctly") raise ValueError("Please ensure cmd has been set correctly")
elif self.type == "speedtest": elif self.type == "speedtest":
self.cmd = "vrf_exec.bash %s speedtest-cli --json --share" % (sta_name) self.cmd = "vrf_exec.bash %s speedtest-cli --json --share" % sta_name
elif self.type == "iperf3" and self.dest is not None: elif self.type == "iperf3" and self.dest is not None:
self.cmd = "iperf3 --forceflush --format k --precision 4 -c %s -t 60 --tos 0 -b 1K --bind_dev %s -i 1 " \ self.cmd = "iperf3 --forceflush --format k --precision 4 -c %s -t 60 --tos 0 -b 1K --bind_dev %s -i 1 " \
"--pidfile /tmp/lf_helper_iperf3_%s.pid" % (self.dest, sta_name, gen_name) "--pidfile /tmp/lf_helper_iperf3_%s.pid" % (self.dest, sta_name, gen_name)
@@ -131,7 +131,7 @@ class GenCXProfile(LFCliBase):
if self.cmd == "": if self.cmd == "":
raise ValueError("Please ensure cmd has been set correctly") raise ValueError("Please ensure cmd has been set correctly")
elif self.type == "speedtest": elif self.type == "speedtest":
self.cmd = "vrf_exec.bash %s speedtest-cli --json --share" % (sta_name) self.cmd = "vrf_exec.bash %s speedtest-cli --json --share" % sta_name
elif self.type == "iperf3" and self.dest is not None: elif self.type == "iperf3" and self.dest is not None:
self.cmd = "iperf3 --forceflush --format k --precision 4 -c %s -t 60 --tos 0 -b 1K --bind_dev %s -i 1 " \ self.cmd = "iperf3 --forceflush --format k --precision 4 -c %s -t 60 --tos 0 -b 1K --bind_dev %s -i 1 " \
"--pidfile /tmp/lf_helper_iperf3_test.pid" % (self.dest, sta_name) "--pidfile /tmp/lf_helper_iperf3_test.pid" % (self.dest, sta_name)
@@ -407,8 +407,7 @@ class GenCXProfile(LFCliBase):
for k, v in name.items(): for k, v in name.items():
if v['last results'] is not None and v['name'] in self.created_endp and v['last results'] != '': if v['last results'] is not None and v['name'] in self.created_endp and v['last results'] != '':
last_results = json.loads(v['last results']) last_results = json.loads(v['last results'])
if last_results['download'] is None and last_results['upload'] is None and last_results[ if last_results['download'] is None and last_results['upload'] is None and last_results['ping'] is None:
'ping'] is None:
return False, v['name'] return False, v['name']
elif last_results['download'] >= self.speedtest_min_dl and \ elif last_results['download'] >= self.speedtest_min_dl and \
last_results['upload'] >= self.speedtest_min_up and \ last_results['upload'] >= self.speedtest_min_up and \
@@ -417,7 +416,7 @@ class GenCXProfile(LFCliBase):
def choose_generic_command(self): def choose_generic_command(self):
gen_results = self.json_get("generic/list?fields=name,last+results", debug_=self.debug) gen_results = self.json_get("generic/list?fields=name,last+results", debug_=self.debug)
if (gen_results['endpoints'] is not None): if gen_results['endpoints'] is not None:
for name in gen_results['endpoints']: for name in gen_results['endpoints']:
for k, v in name.items(): for k, v in name.items():
if v['name'] in self.created_endp and not v['name'].endswith('1'): if v['name'] in self.created_endp and not v['name'].endswith('1'):
@@ -446,7 +445,7 @@ class GenCXProfile(LFCliBase):
except: except:
if (duration_sec is None) or (duration_sec <= 1): if (duration_sec is None) or (duration_sec <= 1):
raise ValueError("GenCXProfile::monitor wants duration_sec > 1 second") raise ValueError("GenCXProfile::monitor wants duration_sec > 1 second")
if (duration_sec <= monitor_interval_ms): if duration_sec <= monitor_interval_ms:
raise ValueError("GenCXProfile::monitor wants duration_sec > monitor_interval") raise ValueError("GenCXProfile::monitor wants duration_sec > monitor_interval")
if report_file is None: if report_file is None:
raise ValueError("Monitor requires an output file to be defined") raise ValueError("Monitor requires an output file to be defined")
@@ -461,8 +460,7 @@ class GenCXProfile(LFCliBase):
if output_format is not None: if output_format is not None:
if output_format.lower() != report_file.split('.')[-1]: if output_format.lower() != report_file.split('.')[-1]:
raise ValueError( raise ValueError(
'Filename %s has an extension that does not match output format %s .' % ( 'Filename %s has an extension that does not match output format %s .' % (report_file, output_format))
report_file, output_format))
else: else:
output_format = report_file.split('.')[-1] output_format = report_file.split('.')[-1]