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

sta_connect2.py: add test result report feature

Browse Source 
Signed-off-by: Scott Wedge <scott.wedge@candelatech.com>
This commit is contained in:
Scott Wedge
2022-02-18 16:07:28 -06:00
committed by shivam
parent 436a22b0c8
commit d5521f85ef
1 changed files with 123 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
py-scripts/sta_connect2.py
View File

@@ -20,7 +20,7 @@ import argparse
from pprint import pformat from pprint import pformat
import time import time
import logging import logging
import pandas as pd import datetime
if sys.version_info[0] != 3: if sys.version_info[0] != 3:
print("This script requires Python 3") print("This script requires Python 3")
@@ -58,7 +58,7 @@ class StaConnect2(Realm):
_sta_name=None, _sta_prefix='sta', _bringup_time_sec=300, _sta_name=None, _sta_prefix='sta', _bringup_time_sec=300,
debug_=False, _dut_security=OPEN, _exit_on_error=False, debug_=False, _dut_security=OPEN, _exit_on_error=False,
_cleanup_on_exit=True, _clean_all_sta=False, _runtime_sec=20, kpi_csv=None, outfile=None, _cleanup_on_exit=True, _clean_all_sta=False, _runtime_sec=20, kpi_csv=None, outfile=None,
side_a_bps=None, side_b_bps=None, side_a_pdu=None, side_b_pdu=None, _exit_on_fail=False): download_bps=None, upload_bps=None, side_a_pdu=None, side_b_pdu=None, _exit_on_fail=False):
# do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn) # do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn)
# that is py2 era syntax and will force self into the host variable, making you # that is py2 era syntax and will force self into the host variable, making you
# very confused. # very confused.
@@ -77,10 +77,11 @@ class StaConnect2(Realm):
self.resource = _resource self.resource = _resource
self.outfile = outfile self.outfile = outfile
self.kpi_csv = kpi_csv self.kpi_csv = kpi_csv
self.side_a_bps = side_a_bps self.download_bps = download_bps
self.side_b_bps = side_b_bps self.upload_bps = upload_bps
self.side_a_pdu = side_a_pdu self.side_a_pdu = side_a_pdu
self.side_b_pdu = side_b_pdu self.side_b_pdu = side_b_pdu
self.epoch_time = int(time.time())
self.upstream_resource = _upstream_resource self.upstream_resource = _upstream_resource
self.upstream_port = _upstream_port self.upstream_port = _upstream_port
self.runtime_secs = _runtime_sec self.runtime_secs = _runtime_sec
@@ -114,7 +115,7 @@ class StaConnect2(Realm):
results = self.outfile[:-4] results = self.outfile[:-4]
results = results + "-results.csv" results = results + "-results.csv"
self.csv_results_file = open(results, "w") self.csv_results_file = open(results, "w")
self.csv_kpi_writer = csv.writer(self.csv_results_file, delimiter=",") self.csv_results_writer = csv.writer(self.csv_results_file, delimiter=",")
def get_kpi_results(self): def get_kpi_results(self):
# make json call to get kpi results # make json call to get kpi results
@@ -124,7 +125,7 @@ class StaConnect2(Realm):
logger.info("endp_list: {endp_list}".format(endp_list=endp_list)) logger.info("endp_list: {endp_list}".format(endp_list=endp_list))
def get_csv_name(self): def get_csv_name(self):
print("self.csv_results_file {}".format(self.csv_results_file.name)) logger.info("self.csv_results_file {}".format(self.csv_results_file.name))
return self.csv_results_file.name return self.csv_results_file.name
def get_endp_stats_for_port(self, eid_name, endps): def get_endp_stats_for_port(self, eid_name, endps):
@@ -208,7 +209,7 @@ class StaConnect2(Realm):
endp_list = self.json_get( endp_list = self.json_get(
"endp?fields=name,eid,delay,jitter,rx+rate,rx+rate+ll,rx+bytes,rx+drop+%25,rx+pkts+ll", "endp?fields=name,eid,delay,jitter,rx+rate,rx+rate+ll,rx+bytes,rx+drop+%25,rx+pkts+ll",
debug_=True) debug_=True)
logger.info("endp_list: {endp_list}".format(endp_list=endp_list)) # logger.info("endp_list: {endp_list}".format(endp_list=endp_list))
endp_rx_drop_map = {} endp_rx_drop_map = {}
endp_rx_map = {} endp_rx_map = {}
our_endps = {} our_endps = {}
@@ -236,14 +237,14 @@ class StaConnect2(Realm):
endps.append(endp_value) endps.append(endp_value)
logger.debug("endpoint: {item} value:\n".format(item=item)) logger.debug("endpoint: {item} value:\n".format(item=item))
logger.debug(endp_value) logger.debug(endp_value)
print("item {item}".format(item=item)) # print("item {item}".format(item=item))
for value_name, value in endp_value.items(): for value_name, value in endp_value.items():
if value_name == 'rx bytes': if value_name == 'rx bytes':
endp_rx_map[item] = value endp_rx_map[item] = value
if value_name == 'rx rate': if value_name == 'rx rate':
endp_rx_map[item] = value endp_rx_map[item] = value
print("value {value}".format(value=value)) # print("value {value}".format(value=value))
if value_name == 'rx rate ll': if value_name == 'rx rate ll':
endp_rx_map[item] = value endp_rx_map[item] = value
# print("value {value}".format(value=value)) # print("value {value}".format(value=value))
@@ -257,27 +258,22 @@ class StaConnect2(Realm):
# info for download test data # info for download test data
if item.startswith("udp") and item.endswith("-A"): if item.startswith("udp") and item.endswith("-A"):
logger.info(total_dl) udp_ul += int(value)
udp_dl += int(value) # logger.info(udp_udl)
logger.info(udp_dl)
elif item.startswith("tcp") and item.endswith("-A"): elif item.startswith("tcp") and item.endswith("-A"):
logger.info(total_dl) tcp_ul += int(value)
tcp_dl += int(value) # logger.info(tcp_dl)
logger.info(tcp_dl)
# info for upload test data # info for upload test data
if item.startswith("udp") and item.endswith("-B"): if item.startswith("udp") and item.endswith("-B"):
logger.info(total_dl) udp_dl += int(value)
udp_ul += int(value) # logger.info(udp_ul)
logger.info(udp_ul)
elif item.startswith("tcp") and item.endswith("-B"): elif item.startswith("tcp") and item.endswith("-B"):
logger.info(total_dl) tcp_dl += int(value)
tcp_ul += int(value) # logger.info(tcp_ul)
logger.info(tcp_ul)
# combine total download (tcp&udp) and upload (tcp&udp) test data # combine total download (tcp&udp) and upload (tcp&udp) test data
if item.endswith("-A"): if item.endswith("-A"):
logger.info(total_dl)
total_dl += int(value) total_dl += int(value)
logger.info(total_dl) # logger.info(total_dl)
else: else:
total_ul += int(value) total_ul += int(value)
if value_name == 'rx rate ll': if value_name == 'rx rate ll':
@@ -294,6 +290,11 @@ class StaConnect2(Realm):
# while bouncing wifi stations. Check here to see if we should reset # while bouncing wifi stations. Check here to see if we should reset
# ports. # ports.
# Common code to generate timestamp for CSV files.
def time_stamp(self):
return time.strftime('%m_%d_%Y_%H_%M_%S',
time.localtime(self.epoch_time))
def get_station_url(self, sta_name_=None): def get_station_url(self, sta_name_=None):
if sta_name_ is None: if sta_name_ is None:
raise ValueError("get_station_url wants a station name") raise ValueError("get_station_url wants a station name")
@@ -397,8 +398,8 @@ class StaConnect2(Realm):
self.l3_udp_profile.side_a_min_pdu = 1200 self.l3_udp_profile.side_a_min_pdu = 1200
self.l3_udp_profile.side_b_min_pdu = 1500 self.l3_udp_profile.side_b_min_pdu = 1500
''' '''
self.l3_udp_profile.side_a_min_bps = self.side_a_bps # upload self.l3_udp_profile.side_a_min_bps = self.download_bps
self.l3_udp_profile.side_b_min_bps = self.side_b_bps # download self.l3_udp_profile.side_b_min_bps = self.upload_bps
self.l3_udp_profile.side_a_min_pdu = self.side_a_pdu self.l3_udp_profile.side_a_min_pdu = self.side_a_pdu
self.l3_udp_profile.side_b_min_pdu = self.side_b_pdu self.l3_udp_profile.side_b_min_pdu = self.side_b_pdu
self.l3_udp_profile.report_timer = 1000 self.l3_udp_profile.report_timer = 1000
@@ -417,8 +418,8 @@ class StaConnect2(Realm):
self.l3_tcp_profile.side_a_min_bps = 128000 self.l3_tcp_profile.side_a_min_bps = 128000
self.l3_tcp_profile.side_b_min_bps = 56000 self.l3_tcp_profile.side_b_min_bps = 56000
''' '''
self.l3_tcp_profile.side_a_min_bps = self.side_a_bps self.l3_tcp_profile.side_a_min_bps = self.download_bps
self.l3_tcp_profile.side_b_min_bps = self.side_b_bps self.l3_tcp_profile.side_b_min_bps = self.upload_bps
self.l3_tcp_profile.name_prefix = self.name_prefix self.l3_tcp_profile.name_prefix = self.name_prefix
self.l3_tcp_profile.report_timer = 1000 self.l3_tcp_profile.report_timer = 1000
self.l3_tcp_profile.create(endp_type="lf_tcp", self.l3_tcp_profile.create(endp_type="lf_tcp",
@@ -555,7 +556,6 @@ class StaConnect2(Realm):
def collect_endp_stats(self, endp_map): def collect_endp_stats(self, endp_map):
logger.info("Collecting Data") logger.info("Collecting Data")
logger.info("collect_endp_stats() - endp_map: %s", endp_map.items)
fields = "/all" fields = "/all"
for (cx_name, endps) in endp_map.items(): for (cx_name, endps) in endp_map.items():
try: try:
@@ -573,25 +573,12 @@ class StaConnect2(Realm):
ptest_b_tx = endp_json['endpoint']['tx bytes'] ptest_b_tx = endp_json['endpoint']['tx bytes']
ptest_b_rx = endp_json['endpoint']['rx bytes'] ptest_b_rx = endp_json['endpoint']['rx bytes']
# print("collect_endp_stats() -ln 380- ptest_b_tx: ", ptest_b_tx)
# print("collect_endp_stats() -ln 381- ptest_b_rx: ", ptest_b_rx)
self.compare_vals(endps[0], ptest_a_tx) self.compare_vals(endps[0], ptest_a_tx)
self.compare_vals(endps[0], ptest_a_rx) self.compare_vals(endps[0], ptest_a_rx)
self.compare_vals(endps[1], ptest_b_tx) self.compare_vals(endps[1], ptest_b_tx)
self.compare_vals(endps[1], ptest_b_rx) self.compare_vals(endps[1], ptest_b_rx)
'''
# smw
kpi_tx = []
kpi_rx = []
kpi_tx.append(ptest_b_tx)
kpi_rx.append(ptest_b_rx)
self.record_kpi_csv(kpi_tx, kpi_rx)
'''
except Exception as e: except Exception as e:
self.error(e) self.error(e)
@@ -644,16 +631,14 @@ class StaConnect2(Realm):
def record_kpi_csv( def record_kpi_csv(
self, self,
sta_list, sta_list,
test_rates,
udp_dl, udp_dl,
tcp_dl, tcp_dl,
udp_ul, udp_ul,
tcp_ul, tcp_ul,
total_dl, total_dl,
total_ul): total_ul):
'''
logger.info("record_kpi_csv() - sta_list: %s", sta_list) logger.info("record_kpi_csv() - sta_list: %s", sta_list)
logger.info("record_kpi_csv() - test_rates: %s", test_rates)
logger.info("record_kpi_csv() - total_ul: %s", total_ul) logger.info("record_kpi_csv() - total_ul: %s", total_ul)
logger.info("record_kpi_csv() - total_dl: %s", total_dl) logger.info("record_kpi_csv() - total_dl: %s", total_dl)
logger.info("record_kpi_csv() - udp_dl: %s", udp_dl) logger.info("record_kpi_csv() - udp_dl: %s", udp_dl)
@@ -661,7 +646,7 @@ class StaConnect2(Realm):
logger.info("record_kpi_csv() - tcp_dl: %s", tcp_dl) logger.info("record_kpi_csv() - tcp_dl: %s", tcp_dl)
logger.info("record_kpi_csv() - tcp_ul: %s", tcp_ul) logger.info("record_kpi_csv() - tcp_ul: %s", tcp_ul)
'''
logger.debug( logger.debug(
"NOTE: Adding kpi to kpi.csv, sta_count {sta_list} total-download-bps:{total_dl} upload: {total_ul} bi-directional: {total}\n".format( "NOTE: Adding kpi to kpi.csv, sta_count {sta_list} total-download-bps:{total_dl} upload: {total_ul} bi-directional: {total}\n".format(
sta_list=sta_list, total_dl=total_dl, total_ul=total_ul, sta_list=sta_list, total_dl=total_dl, total_ul=total_ul,
@@ -678,16 +663,16 @@ class StaConnect2(Realm):
# kpi data for UDP download traffic # kpi data for UDP download traffic
results_dict = self.kpi_csv.kpi_csv_get_dict_update_time() results_dict = self.kpi_csv.kpi_csv_get_dict_update_time()
results_dict['Graph-Group'] = "UDP Download Rate" results_dict['Graph-Group'] = "UDP Download Rate"
results_dict['short-description'] = "UDP-DL {udp_dl} bps pdu {side_b_pdu} {sta_list} STA".format( results_dict['short-description'] = "UDP-DL {download_bps} bps pdu {side_a_pdu} {sta_list} STA".format(
udp_dl=udp_dl, side_b_pdu=self.side_b_pdu, sta_list=sta_list) download_bps=self.download_bps, side_a_pdu=self.side_a_pdu, sta_list=sta_list)
results_dict['numeric-score'] = "{}".format(udp_dl) results_dict['numeric-score'] = "{}".format(udp_dl)
results_dict['Units'] = "bps" results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict) self.kpi_csv.kpi_csv_write_dict(results_dict)
# kpi data for UDP upload traffic # kpi data for UDP upload traffic
results_dict['Graph-Group'] = "UDP Upload Rate" results_dict['Graph-Group'] = "UDP Upload Rate"
results_dict['short-description'] = "UDP-UL {udp_ul} bps pdu {side_a_bps} {sta_list} STA".format( results_dict['short-description'] = "UDP-UL {upload_bps} bps pdu {side_b_pdu} {sta_list} STA".format(
udp_ul=udp_ul, side_a_bps=self.side_a_pdu, sta_list=sta_list) upload_bps=self.upload_bps, side_b_pdu=self.side_b_pdu, sta_list=sta_list)
results_dict['numeric-score'] = "{}".format(udp_ul) results_dict['numeric-score'] = "{}".format(udp_ul)
results_dict['Units'] = "bps" results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict) self.kpi_csv.kpi_csv_write_dict(results_dict)
@@ -695,55 +680,85 @@ class StaConnect2(Realm):
# kpi data for TCP download traffic # kpi data for TCP download traffic
results_dict = self.kpi_csv.kpi_csv_get_dict_update_time() results_dict = self.kpi_csv.kpi_csv_get_dict_update_time()
results_dict['Graph-Group'] = "TCP Download Rate" results_dict['Graph-Group'] = "TCP Download Rate"
results_dict['short-description'] = "TCP-DL {tcp_dl} bps {sta_list} STA".format( results_dict['short-description'] = "TCP-DL {download_bps} bps {sta_list} STA".format(
tcp_dl=tcp_dl, sta_list=sta_list) download_bps=self.download_bps, sta_list=sta_list)
results_dict['numeric-score'] = "{}".format(tcp_dl) results_dict['numeric-score'] = "{}".format(tcp_dl)
results_dict['Units'] = "bps" results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict) self.kpi_csv.kpi_csv_write_dict(results_dict)
# kpi data for TCP upload traffic # kpi data for TCP upload traffic
results_dict['Graph-Group'] = "TCP Upload Rate" results_dict['Graph-Group'] = "TCP Upload Rate"
results_dict['short-description'] = "TCP-UL {tcp_ul} bps {sta_list} STA".format( results_dict['short-description'] = "TCP-UL {upload_bps} bps {sta_list} STA".format(
tcp_ul=tcp_ul, sta_list=sta_list) upload_bps=self.upload_bps, sta_list=sta_list)
results_dict['numeric-score'] = "{}".format(tcp_ul) results_dict['numeric-score'] = "{}".format(tcp_ul)
results_dict['Units'] = "bps" results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict) self.kpi_csv.kpi_csv_write_dict(results_dict)
def record_results(
self,
sta_count,
udp_dl,
tcp_dl,
udp_ul,
tcp_ul,
total_dl_bps,
total_ul_bps):
dl = self.download_bps
ul = self.upload_bps
dl_pdu = self.side_a_pdu
ul_pdu = self.side_b_pdu
tags = dict()
tags['requested-ul-bps'] = ul
tags['requested-dl-bps'] = dl
tags['ul-pdu-size'] = ul_pdu
tags['dl-pdu-size'] = dl_pdu
tags['station-count'] = sta_count
# tags['attenuation'] = atten
tags["script"] = 'sta_connect2'
''' '''
results_dict['Graph-Group'] = "TCP Rate UL+DL" # Add user specified tags
results_dict[ for k in self.user_tags:
'short-description'] = "UL {total_ul} bps pdu {side_a_pdu} + DL {dl} bps pud {side_b_pdu}- {sta_list} STA".format( tags[k[0]] = k[1]
total_ul=total_ul, side_a_pdu=self.side_a_pdu, dl=total_dl, side_b_pdu=self.side_b_pdu, sta_list=sta_list)
results_dict['numeric-score'] = "{}".format(
(total_ul + total_dl))
results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict)
results_dict['Graph-Group'] = "Per Stations Rate DL"
results_dict['short-description'] = "DL LL {total_dl} bps pdu {side_b_pdu} {endps} STA".format(
total_dl=total_dl, side_b_pdu=self.side_b_pdu, endps=endps)
results_dict['numeric-score'] = "{}".format(total_dl_ll_bps)
results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict)
results_dict['Graph-Group'] = "Per Stations Rate UL"
results_dict['short-description'] = "UL LL {total_ul} bps pdu {side_a_pdu} {endps} STA".format(
total_ul=total_ul, side_a_pdu=self.side_a_pdu, endps=endps)
results_dict['numeric-score'] = "{}".format(total_ul_ll_bps)
results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict)
results_dict['Graph-Group'] = "Per Stations Rate UL+DL"
results_dict[
'short-description'] = "UL LL {total_ul} bps pdu {side_a_pdu} + DL LL {total_dl} bps pud {side_b_pdu}- {endps} STA".format(
total_ul=total_ul, side_a_pdu=self.side_a_pdu, total_dl=total_dl, side_b_pdu=self.side_b_pdu, endps=endps)
results_dict['numeric-score'] = "{}".format(
(total_ul_ll_bps + total_dl_ll_bps))
results_dict['Units'] = "bps"
self.kpi_csv.kpi_csv_write_dict(results_dict)
''' '''
# now = str(datetime.datetime.utcnow().isoformat())
print(
"NOTE: Adding results to influx, total-download-bps: %s upload: %s bi-directional: %s\n" %
(total_dl_bps, total_ul_bps, (total_ul_bps + total_dl_bps)))
'''
if self.influxdb is not None:
self.influxdb.post_to_influx(
"total-download-bps", total_dl_bps, tags, now)
self.influxdb.post_to_influx(
"total-upload-bps", total_ul_bps, tags, now)
self.influxdb.post_to_influx(
"total-bi-directional-bps",
total_ul_bps +
total_dl_bps,
tags,
now)
'''
if self.csv_results_file:
row = [self.epoch_time, self.time_stamp(), sta_count,
ul, ul, dl, dl, dl_pdu, dl_pdu, ul_pdu, ul_pdu,
udp_ul, tcp_ul, udp_dl, tcp_dl,
total_dl_bps, total_ul_bps, (total_ul_bps + total_dl_bps)
]
'''
# Add values for any user specified tags
for k in self.user_tags:
row.append(k[1])
'''
self.csv_results_writer.writerow(row)
self.csv_results_file.flush()
def csv_generate_results_column_headers(self): def csv_generate_results_column_headers(self):
csv_rx_headers = [ csv_rx_headers = [
'Time epoch', 'Time epoch',
@@ -757,20 +772,21 @@ class StaConnect2(Realm):
'UL-Max-PDU', 'UL-Max-PDU',
'DL-Min-PDU', 'DL-Min-PDU',
'DL-Max-PDU', 'DL-Max-PDU',
'Attenuation', # 'Attenuation',
'Total-Download-Bps', 'UDP-Upload-Bps',
'Total-Upload-Bps', 'TCP-Upload-Bps',
'Total-UL/DL-Bps', 'UDP-Download-Bps',
'Total-Download-LL-Bps', 'TCP-Download-Bps',
'Total-Upload-LL-Bps', 'Total-UDP/TCP-Upload-Bps',
'Total-UL/DL-LL-Bps'] 'Total-UDP/TCP-Download-Bps',
'Total-UDP/TCP-UL/DL-Bps']
return csv_rx_headers return csv_rx_headers
# Write initial headers to csv file. # Write initial headers to csv file.
def csv_add_column_headers(self): def csv_add_column_headers(self):
if self.csv_results_file is not None: if self.csv_results_file is not None:
self.csv_kpi_writer.writerow( self.csv_results_writer.writerow(
self.csv_generate_results_column_headers()) self.csv_generate_results_column_headers())
self.csv_results_file.flush() self.csv_results_file.flush()
@@ -825,8 +841,8 @@ CLI Example for kpi.csv report output:
parser.add_argument("--dut_security", type=str, help="DUT security: openLF, wpa, wpa2, wpa3") parser.add_argument("--dut_security", type=str, help="DUT security: openLF, wpa, wpa2, wpa3")
parser.add_argument("--dut_passwd", type=str, help="DUT PSK password. Do not set for OPEN auth") parser.add_argument("--dut_passwd", type=str, help="DUT PSK password. Do not set for OPEN auth")
parser.add_argument("--dut_bssid", type=str, help="DUT BSSID to which we expect to connect.") parser.add_argument("--dut_bssid", type=str, help="DUT BSSID to which we expect to connect.")
parser.add_argument("--side_a_bps", type=int, help="Set the minimum bps value on test endpoint A. Default: 128000", default=128000) parser.add_argument("--download_bps", type=int, help="Set the minimum bps value on test endpoint A. Default: 128000", default=128000)
parser.add_argument("--side_b_bps", type=int, help="Set the minimum bps value on test endpoint B. Default: 128000", default=128000) parser.add_argument("--upload_bps", type=int, help="Set the minimum bps value on test endpoint B. Default: 128000", default=128000)
parser.add_argument("--side_a_pdu", type=int, help="Set the minimum pdu value on test endpoint A. Default: 1200", default=1200) parser.add_argument("--side_a_pdu", type=int, help="Set the minimum pdu value on test endpoint A. Default: 1200", default=1200)
parser.add_argument("--side_b_pdu", type=int, help="Set the minimum pdu value on test endpoint B. Default: 1500", default=1500) parser.add_argument("--side_b_pdu", type=int, help="Set the minimum pdu value on test endpoint B. Default: 1500", default=1500)
parser.add_argument("--debug", help="enable debugging", action="store_true") parser.add_argument("--debug", help="enable debugging", action="store_true")
@@ -908,7 +924,7 @@ CLI Example for kpi.csv report output:
_output_pdf="sta_connect2.pdf") _output_pdf="sta_connect2.pdf")
kpi_path = report.get_report_path() kpi_path = report.get_report_path()
kpi_filename = "kpi.csv" # kpi_filename = "kpi.csv"
logger.info("kpi_path :{kpi_path}".format(kpi_path=kpi_path)) logger.info("kpi_path :{kpi_path}".format(kpi_path=kpi_path))
kpi_csv = lf_kpi_csv.lf_kpi_csv( kpi_csv = lf_kpi_csv.lf_kpi_csv(
@@ -926,7 +942,7 @@ CLI Example for kpi.csv report output:
csv_outfile = "{}_{}-sta_connect2.csv".format( csv_outfile = "{}_{}-sta_connect2.csv".format(
args.csv_outfile, current_time) args.csv_outfile, current_time)
csv_outfile = report.file_add_path(csv_outfile) csv_outfile = report.file_add_path(csv_outfile)
print("csv output file : {}".format(csv_outfile)) logger.info("csv output file : {}".format(csv_outfile))
upstream_port = LFUtils.name_to_eid(args.upstream_port) upstream_port = LFUtils.name_to_eid(args.upstream_port)
if args.upstream_resource: if args.upstream_resource:
@@ -947,8 +963,8 @@ CLI Example for kpi.csv report output:
_influx_host=args.influx_host, _influx_host=args.influx_host,
kpi_csv=kpi_csv, kpi_csv=kpi_csv,
outfile=args.csv_outfile, outfile=args.csv_outfile,
side_a_bps=args.side_a_bps, download_bps=args.download_bps,
side_b_bps=args.side_b_bps, upload_bps=args.upload_bps,
side_a_pdu=args.side_a_pdu, side_a_pdu=args.side_a_pdu,
side_b_pdu=args.side_b_pdu, side_b_pdu=args.side_b_pdu,
_exit_on_fail=True, _exit_on_fail=True,
@@ -977,30 +993,21 @@ CLI Example for kpi.csv report output:
logger.info("napping %f sec", staConnect.runtime_secs) logger.info("napping %f sec", staConnect.runtime_secs)
time.sleep(staConnect.runtime_secs) time.sleep(staConnect.runtime_secs)
# staConnect.stop()
# kpi_results_dict = staConnect.get_rx_values()
# staConnect.record_kpi_csv(kpi_results_dict)
temp_stations_list = [] temp_stations_list = []
temp_stations_list.extend(staConnect.station_profile.station_names.copy()) temp_stations_list.extend(staConnect.station_profile.station_names.copy())
'''
for station_profile in staConnect.station_profiles:
temp_stations_list.extend(station_profile.station_names.copy())
'''
endp_rx_map, endp_rx_drop_map, endps, udp_dl, tcp_dl, udp_ul, tcp_ul, total_dl, total_ul, total_dl_ll, total_ul_ll = staConnect.get_rx_values() endp_rx_map, endp_rx_drop_map, endps, udp_dl, tcp_dl, udp_ul, tcp_ul, total_dl, total_ul, total_dl_ll, total_ul_ll = staConnect.get_rx_values()
test_rates = staConnect.get_result_list()
# staConnect.record_kpi_csv(endps, total_ul, total_dl, total_dl_ll, total_ul_ll) staConnect.record_kpi_csv(len(temp_stations_list), udp_dl, tcp_dl, udp_ul, tcp_ul, total_dl, total_ul)
staConnect.record_kpi_csv(len(temp_stations_list), test_rates, udp_dl, tcp_dl, udp_ul, tcp_ul, total_dl, total_ul) staConnect.record_results(len(temp_stations_list), udp_dl, tcp_dl, udp_ul, tcp_ul, total_dl, total_ul)
# logger.info("{} {} {} {} {} {} {}".format(endp_rx_map, endp_rx_drop_map, endps, total_dl, total_ul, total_dl_ll, total_ul_ll))
# logger.info(staConnect.get_rx_values())
staConnect.stop() staConnect.stop()
# exit(1) # exit(1)
# py-json/lanforge/lfcli_base.py - get_result_list(): # py-json/lanforge/lfcli_base.py - get_result_list():
staConnect.get_result_list() staConnect.get_result_list()
logger.info("staConnect.get_results_list: %s", staConnect.get_result_list()) # logger.info("staConnect.get_results_list: %s", staConnect.get_result_list())
is_passing = staConnect.passes() is_passing = staConnect.passes()
# TODO clean up pass fail to use realm # TODO clean up pass fail to use realm
@@ -1014,11 +1021,9 @@ CLI Example for kpi.csv report output:
message = staConnect.get_all_message() message = staConnect.get_all_message()
logger.info(message) logger.info(message)
# Reporting Results (.pdf & .html) # Reporting Results (.pdf & .html)
csv_results_file = staConnect.get_csv_name() csv_results_file = staConnect.get_csv_name()
print("csv_results_file: ", csv_results_file) logger.info("csv_results_file: %s", csv_results_file)
# csv_results_file = kpi_path + "/" + kpi_filename # csv_results_file = kpi_path + "/" + kpi_filename
report.set_title("L3 Station Connect 2") report.set_title("L3 Station Connect 2")
report.build_banner() report.build_banner()