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

gen_cxprofile: Fix whitespace

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

24
py-json/gen_cxprofile.py
View File

@@ -9,7 +9,6 @@ import time
import datetime import datetime
import json import json
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base")
@@ -396,12 +395,11 @@ class GenCXProfile(LFCliBase):
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:
pprint(gen_results['endpoints']) pprint(gen_results['endpoints'])
#for name in gen_results['endpoints']: # for name in gen_results['endpoints']:
# pprint(name.items) # pprint(name.items)
#for k,v in name.items(): # for k,v in name.items():
exit(1) exit(1)
def choose_speedtest_command(self): def choose_speedtest_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:
@@ -409,11 +407,12 @@ 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['ping'] is None: if last_results['download'] is None and last_results['upload'] is None and last_results[
'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 \
last_results['ping'] <= self.speedtest_max_ping: last_results['ping'] <= self.speedtest_max_ping:
return True, v['name'] return True, v['name']
def choose_generic_command(self): def choose_generic_command(self):
@@ -462,7 +461,8 @@ 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 .' % (report_file, output_format)) 'Filename %s has an extension that does not match output format %s .' % (
report_file, output_format))
else: else:
output_format = report_file.split('.')[-1] output_format = report_file.split('.')[-1]
@@ -602,7 +602,9 @@ class GenCXProfile(LFCliBase):
exit(1) exit(1)
# append compared df to created one # append compared df to created one
if output_format.lower() != 'csv': if output_format.lower() != 'csv':
pandas_extensions.df_to_file(dataframe=pd.read_csv(report_file), output_f=output_format, save_path=report_file) pandas_extensions.df_to_file(dataframe=pd.read_csv(report_file), output_f=output_format,
save_path=report_file)
else: else:
if output_format.lower() != 'csv': if output_format.lower() != 'csv':
pandas_extensions.df_to_file(dataframe=pd.read_csv(report_file), output_f=output_format, save_path=report_file) pandas_extensions.df_to_file(dataframe=pd.read_csv(report_file), output_f=output_format,
save_path=report_file)