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

args.influx_bucket is None just as it should be

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@protonmail.com>
This commit is contained in:
Matthew Stidham
2021-04-20 12:57:39 -07:00
parent f8202bbfb3
commit 991421a245
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py-scripts/test_l3_longevity.py
View File

@@ -735,7 +735,6 @@ class L3VariableTime(Realm):
self.__record_rx_dropped_percent(rx_drop_percent) self.__record_rx_dropped_percent(rx_drop_percent)
# At end of test step, record KPI information. # At end of test step, record KPI information.
print("Influxdb is %s" % self.influxdb)
if self.influxdb is not None: if self.influxdb is not None:
self.record_kpi(len(temp_stations_list), ul, dl, ul_pdu_str, dl_pdu_str, atten_val, total_dl_bps, total_ul_bps) self.record_kpi(len(temp_stations_list), ul, dl, ul_pdu_str, dl_pdu_str, atten_val, total_dl_bps, total_ul_bps)
@@ -787,7 +786,7 @@ class L3VariableTime(Realm):
# Submit data to the influx db if configured to do so. # Submit data to the influx db if configured to do so.
def record_kpi(self, sta_count, ul, dl, ul_pdu, dl_pdu, atten, total_dl_bps, total_ul_bps): def record_kpi(self, sta_count, ul, dl, ul_pdu, dl_pdu, atten, total_dl_bps, total_ul_bps):
tags=dict() tags = dict()
tags['requested-ul-bps'] = ul tags['requested-ul-bps'] = ul
tags['requested-dl-bps'] = dl tags['requested-dl-bps'] = dl
tags['ul-pdu-size'] = ul_pdu tags['ul-pdu-size'] = ul_pdu
@@ -800,13 +799,13 @@ class L3VariableTime(Realm):
for k in self.user_tags: for k in self.user_tags:
tags[k[0]] = k[1] tags[k[0]] = k[1]
time = str(datetime.datetime.utcnow().isoformat()) now = str(datetime.datetime.utcnow().isoformat())
print("NOTE: Adding kpi to influx, total-download-bps: %s upload: %s bi-directional: %s\n"%(total_dl_bps, total_ul_bps, (total_ul_bps + total_dl_bps))) print("NOTE: Adding kpi to influx, total-download-bps: %s upload: %s bi-directional: %s\n"%(total_dl_bps, total_ul_bps, (total_ul_bps + total_dl_bps)))
self.influxdb.post_to_influx("total-download-bps", total_dl_bps, tags, time) 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, time) 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, time) self.influxdb.post_to_influx("total-bi-directional-bps", total_ul_bps + total_dl_bps, tags, now)
if self.csv_kpi_file: if self.csv_kpi_file:
row = [self.epoch_time, self.time_stamp(), sta_count, row = [self.epoch_time, self.time_stamp(), sta_count,
@@ -1134,8 +1133,7 @@ python3 test_l3_longevity.py --cisco_ctlr 192.168.100.112 --cisco_dfs True --mgr
csv_outfile = args.csv_outfile csv_outfile = args.csv_outfile
influxdb = None influxdb = None
if len(args.influx_bucket) > 0: if args.influx_bucket is not None:
print("Influx bucket %s" % args.influx_bucket)
from influx2 import RecordInflux from influx2 import RecordInflux
influxdb = RecordInflux(_lfjson_host=lfjson_host, influxdb = RecordInflux(_lfjson_host=lfjson_host,
_lfjson_port=lfjson_port, _lfjson_port=lfjson_port,