Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion py-scripts/lf_ftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,7 @@ def updating_webui_runningjson(self, obj):

def my_monitor(self):
dataset = []
self.channel_list, self.mode_list, self.ssid_list, self.uc_avg, self.uc_max, self.url_data, self.uc_min, self.bytes_rd = [], [], [], [], [], [], [], []
self.channel_list, self.mode_list, self.ssid_list, self.uc_avg, self.uc_max, self.url_data, self.uc_min, self.bytes_rd, self.rx_rate = [], [], [], [], [], [], [], [], []
if self.clients_type == "Virtual":
response_port = self.json_get("/port/all")
for interface in response_port['interfaces']:
Expand Down Expand Up @@ -1606,6 +1606,7 @@ def my_monitor(self):
uc_min_data = self.json_get("layer4/list?fields=uc-min")
total_url_data = self.json_get("layer4/list?fields=total-urls")
bytes_rd = self.json_get("layer4/list?fields=bytes-rd")
rx_rate_data = self.json_get("layer4/list?fields=rx rate (1m)")
print(uc_avg_data)
print(total_url_data)
self.data_for_webui = {}
Expand All @@ -1620,6 +1621,7 @@ def my_monitor(self):
# reading uc-avg data in json format
self.url_data.append(total_url_data['endpoint']['total-urls'])
dataset.append(bytes_rd['endpoint']['bytes-rd'])
self.rx_rate.append(rx_rate_data['endpoint']['rx rate (1m)'])
if self.dowebgui == "True":
self.data_for_webui["url_data"] = self.url_data
self.data_for_webui["start_time"] = self.data["start_time"]
Expand Down Expand Up @@ -1654,6 +1656,11 @@ def my_monitor(self):
if CX == created_cx:
dataset.append(cx[CX]['bytes-rd'])
self.bytes_rd = [float(f"{(i / 1000000): .4f}") for i in dataset]
for cx in rx_rate_data['endpoint']:
for CX in cx:
for created_cx in self.cx_list:
if CX == created_cx:
self.rx_rate.append(cx[CX]['rx rate (1m)'])
if self.dowebgui == "True":
# FOR WEB-UI // storing values in self which is used to update the csv at the end.
self.data_for_webui["url_data"] = self.url_data
Expand Down
28 changes: 21 additions & 7 deletions py-scripts/lf_mixed_traffic.py
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,9 @@ def qos_test_overall_virtual(qos_tos_virtual=None):
port=self.port,
number_template="0000",
ap_name=ap_name,
num_stations=self.num_staions,
num_stations_2g=self.num_staions if "2.4G" in self.band else 0,
num_stations_5g=self.num_staions if "5G" in self.band else 0,
num_stations_6g=self.num_staions if "6G" in self.band else 0,
sta_list=self.station_list,
create_sta=False,
name_prefix="TOS-",
Expand Down Expand Up @@ -2029,7 +2031,10 @@ def generate_all_report(self, iot_summary=None):
if res:
self.data_set, self.load, res1 = qos_obj.generate_graph_data_set(res)
qos_obj.tos = tos
qos_obj.generate_individual_graph(res1, self.lf_report_mt, qos_obj.connections_download_avg, qos_obj.connections_upload_avg, qos_obj.avg_drop_a, qos_obj.avg_drop_b)
if self.virtual:
qos_obj.generate_individual_graph(res1, self.lf_report_mt)
else:
qos_obj.generate_individual_graph(res1, self.lf_report_mt, qos_obj.connections_download_avg, qos_obj.connections_upload_avg, qos_obj.avg_drop_a, qos_obj.avg_drop_b)
else:
df_throughput = pd.DataFrame(self.res["throughput_table_df"])
self.lf_report_mt.set_table_dataframe(df_throughput)
Expand Down Expand Up @@ -2065,8 +2070,11 @@ def generate_all_report(self, iot_summary=None):
self.lf_report_mt.build_graph()
# Helpful for testhouse when both QoS and multicast are checked, to avoid generating redundant RSSI heatmaps.
multicast_exists = "5" in self.tests and self.get_live_view
qos_obj.generate_individual_graph(self.res, self.lf_report_mt, qos_obj.connections_download_avg, qos_obj.connections_upload_avg, qos_obj.avg_drop_a,
qos_obj.avg_drop_b, self.total_floors, multicast_exists)
if self.virtual:
qos_obj.generate_individual_graph(self.res, self.lf_report_mt)
else:
qos_obj.generate_individual_graph(self.res, self.lf_report_mt, qos_obj.connections_download_avg, qos_obj.connections_upload_avg, qos_obj.avg_drop_a,
qos_obj.avg_drop_b, self.total_floors, multicast_exists)
if "3" in self.tests and self.ftp_test_status:
# 3.FTP test reporting in mixed traffic
self.lf_report_mt.set_obj_html(_obj_title="3. File Transfer Protocol (FTP) Test", _obj="")
Expand Down Expand Up @@ -3295,7 +3303,10 @@ def main():
mixed_obj.ping_test_obj, mixed_obj.ping_test_status = t1_parent.recv()
t1.join()
if "2" in args.tests:
mixed_obj.qos_test_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
if mixed_obj.virtual:
mixed_obj.throughput_qos_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
else:
mixed_obj.qos_test_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
t2.join()
if "3" in args.tests:
mixed_obj.ftp_test_obj, mixed_obj.ftp_test_status = t3_parent.recv()
Expand Down Expand Up @@ -3372,7 +3383,7 @@ def __init__(self, client_dict_A, client_dict_B):
start_id=args.sixg_start_id, all_sta=True)
# updating num stations and station list
virtual_station_list = sta_list_2g + sta_list_5g + sta_list_6g
logger.info("List of selected virtual stations:", virtual_station_list)
logger.info("List of selected virtual stations: {}".format(virtual_station_list))
mixed_obj.station_list = virtual_station_list
mixed_obj.num_staions = args.twog_num_stations + args.fiveg_num_stations + args.sixg_num_stations
if (args.use_default_config):
Expand Down Expand Up @@ -3494,7 +3505,10 @@ def __init__(self, client_dict_A, client_dict_B):
mixed_obj.ping_test_obj, mixed_obj.ping_test_status = t1_parent.recv()
t1.join()
if "2" in args.tests:
mixed_obj.qos_test_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
if mixed_obj.virtual:
mixed_obj.throughput_qos_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
else:
mixed_obj.qos_test_obj, mixed_obj.data_set, mixed_obj.load, mixed_obj.res, mixed_obj.qos_test_status = t2_parent.recv()
t2.join()
if "3" in args.tests:
mixed_obj.ftp_test_obj, mixed_obj.ftp_test_status = t3_parent.recv()
Expand Down
Loading
Loading