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

flexible lfclient_port and correct l3 field names

Browse Source
This commit is contained in:
Matthew Stidham
2021-01-22 10:50:09 -08:00
parent 8910aea156
commit bdd6dbe99c
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py-json/realm.py
View File

@@ -1091,6 +1091,7 @@ class L3CXProfile(BaseProfile):
self.created_endp = {} self.created_endp = {}
self.name_prefix = name_prefix_ self.name_prefix = name_prefix_
self.number_template = number_template_ self.number_template = number_template_
self.lfclient_port = lfclient_port
def get_cx_names(self): def get_cx_names(self):
return self.created_cx.keys() return self.created_cx.keys()
@@ -1168,7 +1169,6 @@ class L3CXProfile(BaseProfile):
fields = ",".join(col_names) fields = ",".join(col_names)
else: else:
header_row=list((list(self.json_get("/endp/all")['endpoint'][0].values())[0].keys())) header_row=list((list(self.json_get("/endp/all")['endpoint'][0].values())[0].keys()))
print(fields)
# Step 2, monitor columns # Step 2, monitor columns
start_time = datetime.datetime.now() start_time = datetime.datetime.now()
end_time = start_time + datetime.timedelta(seconds=duration_sec) end_time = start_time + datetime.timedelta(seconds=duration_sec)
@@ -1181,7 +1181,7 @@ class L3CXProfile(BaseProfile):
timestamps = [] timestamps = []
# for x in range(0,int(round(iterations,0))): # for x in range(0,int(round(iterations,0))):
while datetime.datetime.now() < end_time: while datetime.datetime.now() < end_time:
if fields == None: if fields is None:
response = self.json_get("/endp/all") response = self.json_get("/endp/all")
else: else:
response = self.json_get("/endp/%s?fields=%s" % (created_cx, fields)) response = self.json_get("/endp/%s?fields=%s" % (created_cx, fields))
@@ -1224,7 +1224,6 @@ class L3CXProfile(BaseProfile):
for point in range(0, len(endpoints2)): for point in range(0, len(endpoints2)):
endpoints2[point].insert(0, timestamps2[point]) endpoints2[point].insert(0, timestamps2[point])
# step 4 save and close # step 4 save and close
header_row = col_names
header_row.insert(0, 'Timestamp') header_row.insert(0, 'Timestamp')
print(header_row) print(header_row)
if output_format.lower() in ['excel', 'xlsx'] or report_file.split('.')[-1] == 'xlsx': if output_format.lower() in ['excel', 'xlsx'] or report_file.split('.')[-1] == 'xlsx':
@@ -1244,9 +1243,9 @@ class L3CXProfile(BaseProfile):
import requests import requests
import ast import ast
try: try:
systeminfo = ast.literal_eval(requests.get('http://localhost:8090').text) systeminfo = ast.literal_eval(requests.get('http://localhost:'+str(self.lfclient_port)).text)
except: except:
systeminfo = ast.literal_eval(requests.get('http://localhost:8090').text) systeminfo = ast.literal_eval(requests.get('http://localhost:'+str(self.lfclient_port)).text)
df['LFGUI Release'] = systeminfo['VersionInfo']['BuildVersion'] df['LFGUI Release'] = systeminfo['VersionInfo']['BuildVersion']
df['Script Name'] = script_name df['Script Name'] = script_name
df['Arguments'] = arguments df['Arguments'] = arguments

5
py-scripts/test_ipv4_variable_time.py
View File

@@ -200,8 +200,9 @@ python3 ./test_ipv4_variable_time.py
num_sta = int(args.num_stations) num_sta = int(args.num_stations)
#Create directory #Create directory
homedir=str(datetime.datetime.now()).replace(':','-')+'test_ipv4_variable_time' homedir = str(datetime.datetime.now().strftime("%Y-%m-%d-%H-%M")).replace(':','-')+'test_ipv4_variable_time'
os.mkdir('/home/lanforge/report_data/'+homedir) path = os.path.join('/home/lanforge/report-data/',homedir)
os.mkdir(path)
if args.report_file is None: if args.report_file is None:
if args.output_format in ['csv','json','html','hdf','stata','pickle','pdf','png','df','parquet','xlsx']: if args.output_format in ['csv','json','html','hdf','stata','pickle','pdf','png','df','parquet','xlsx']: