flexible lfclient_port and correct l3 field names

py-json/realm.py

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

py-scripts/test_ipv4_variable_time.py

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