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

rewrote my_monitor function to be more reusable, removed other monitor functions, renamed variables to better represent contents. Reporting WIP

Browse Source
This commit is contained in:
Logan Lipke
2021-11-10 11:45:22 -08:00
parent 1f24b2c79b
commit 322bc7ea55
1 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
py-scripts/lf_webpage.py
View File

@@ -57,6 +57,8 @@ class HttpDownload(Realm):
self.http_profile.debug = _debug_on self.http_profile.debug = _debug_on
self.created_cx = {} self.created_cx = {}
def set_values(self): def set_values(self):
# This method will set values according user input # This method will set values according user input
if self.bands == "5G": if self.bands == "5G":
@@ -156,44 +158,19 @@ class HttpDownload(Realm):
def stop(self): def stop(self):
self.http_profile.stop_cx() self.http_profile.stop_cx()
def my_monitor(self): def my_monitor(self, data_mon):
# data in json format # data in json format
data = self.local_realm.json_get("layer4/list?fields=uc-avg")
data1 = []
for i in range(len(data['endpoint'])):
data1.append(str(list(data['endpoint'][i]))[2:-2])
data2 = []
for i in range(self.num_sta):
data = self.local_realm.json_get("layer4/list?fields=uc-avg")
# print(type(data['endpoint'][i][data1[i]]['uc-avg']))
data2.append((data['endpoint'][i][data1[i]]['uc-avg']))
return data2
def monitor_bytes(self): data = self.local_realm.json_get("layer4/%s/list?fields=name,%s" %
# data in json format (','.join(self.http_profile.created_cx.keys()), data_mon.replace(' ', '+')))
data = self.local_realm.json_get("layer4/list?fields=bytes-rd") # print(data)
data1 = [] data1 = []
for i in range(len(data['endpoint'])): for cx in self.http_profile.created_cx.keys():
data1.append(str(list(data['endpoint'][i]))[2:-2]) for info in data['endpoint']:
data2 = [] if cx in info:
for i in range(self.num_sta): data1.append(info[cx][data_mon])
data = self.local_realm.json_get("layer4/list?fields=bytes-rd") # print(data_mon, data1)
# print(type(data['endpoint'][i][data1[i]]['uc-avg'])) return data1
data2.append((data['endpoint'][i][data1[i]]['bytes-rd']))
return data2
def monitor_rx(self):
# data in json format
data = self.local_realm.json_get("layer4/list?fields=rx rate")
data1 = []
for i in range(len(data['endpoint'])):
data1.append(str(list(data['endpoint'][i]))[2:-2])
data2 = []
for i in range(self.num_sta):
data = self.local_realm.json_get("layer4/list?fields=rx rate")
# print(type(data['endpoint'][i][data1[i]]['uc-avg']))
data2.append((data['endpoint'][i][data1[i]]['rx rate']))
return data2
def postcleanup(self): def postcleanup(self):
self.http_profile.cleanup() self.http_profile.cleanup()
@@ -632,7 +609,7 @@ def main():
parser.add_argument('--passwd', help='WiFi passphrase/password/key') parser.add_argument('--passwd', help='WiFi passphrase/password/key')
parser.add_argument('--target_per_ten', help='number of request per 10 minutes', default=100) parser.add_argument('--target_per_ten', help='number of request per 10 minutes', default=100)
parser.add_argument('--file_size', type=str, help='specify the size of file you want to download', default='5MB') parser.add_argument('--file_size', type=str, help='specify the size of file you want to download', default='5MB')
parser.add_argument('--bands', nargs="+", help='specify which band testing you want to run eg 5G OR 2.4G OR 5G 2.4G', default=["5G", "2.4G", "Both"]) parser.add_argument('--bands', nargs="+", help='specify which band testing you want to run eg 5G OR 2.4G OR Both', default=["5G", "2.4G", "Both"])
parser.add_argument('--duration', type=int, help='time to run traffic') parser.add_argument('--duration', type=int, help='time to run traffic')
parser.add_argument('--threshold_5g',help="Enter the threshold value for 5G Pass/Fail criteria", default="60") parser.add_argument('--threshold_5g',help="Enter the threshold value for 5G Pass/Fail criteria", default="60")
parser.add_argument('--threshold_2g',help="Enter the threshold value for 2.4G Pass/Fail criteria",default="90") parser.add_argument('--threshold_2g',help="Enter the threshold value for 2.4G Pass/Fail criteria",default="90")
@@ -692,21 +669,19 @@ def main():
print("time in seconds ", duration) print("time in seconds ", duration)
time.sleep(duration) time.sleep(duration)
http.stop() http.stop()
value = http.my_monitor() uc_avg_val = http.my_monitor('uc-avg')
value2 = http.monitor_bytes() rx_bytes_val = http.my_monitor('bytes-rd')
value3 = http.monitor_rx() rx_rate_val = http.my_monitor('rx rate')
http.postcleanup()
if bands == "5G": if bands == "5G":
print("yes") print("yes")
list5G.extend(value) list5G.extend(uc_avg_val)
list5G_bytes.extend(value2) list5G_bytes.extend(rx_bytes_val)
list5G_speed.extend(value3) list5G_speed.extend(rx_rate_val)
print(list5G) print(list5G)
print(list5G_bytes) print(list5G_bytes)
print(list5G_speed) print(list5G_speed)
final_dict['5G']['dl_time'] = list5G final_dict['5G']['dl_time'] = list5G
min5.append(min(list5G)) min5.append(min(list5G))
final_dict['5G']['min'] = min5 final_dict['5G']['min'] = min5
max5.append(max(list5G)) max5.append(max(list5G))
@@ -717,9 +692,9 @@ def main():
final_dict['5G']['speed'] = list5G_speed final_dict['5G']['speed'] = list5G_speed
elif bands == "2.4G": elif bands == "2.4G":
print("no") print("no")
list2G.extend(value) list2G.extend(uc_avg_val)
list2G_bytes.extend(value2) list2G_bytes.extend(rx_bytes_val)
list2G_speed.extend(value3) list2G_speed.extend(rx_rate_val)
print(list2G) print(list2G)
print(list2G_bytes) print(list2G_bytes)
print(list2G_speed) print(list2G_speed)
@@ -733,9 +708,9 @@ def main():
final_dict['2.4G']['bytes_rd'] = list2G_bytes final_dict['2.4G']['bytes_rd'] = list2G_bytes
final_dict['2.4G']['speed'] = list2G_speed final_dict['2.4G']['speed'] = list2G_speed
elif bands == "Both": elif bands == "Both":
Both.extend(value) Both.extend(uc_avg_val)
Both_bytes.extend(value2) Both_bytes.extend(rx_bytes_val)
Both_speed.extend(value3) Both_speed.extend(rx_rate_val)
final_dict['Both']['dl_time'] = Both final_dict['Both']['dl_time'] = Both
min_both.append(min(Both)) min_both.append(min(Both))
final_dict['Both']['min'] = min_both final_dict['Both']['min'] = min_both
@@ -746,6 +721,8 @@ def main():
final_dict['Both']['bytes_rd'] = Both_bytes final_dict['Both']['bytes_rd'] = Both_bytes
final_dict['Both']['speed'] = Both_speed final_dict['Both']['speed'] = Both_speed
http.postcleanup()
result_data = final_dict result_data = final_dict
print("result", result_data) print("result", result_data)
print("Test Finished") print("Test Finished")