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

additions to L4Prof monitor, edits to logic of col names in L3 Monitor

Browse Source
This commit is contained in:
Dipti
2021-01-21 22:49:12 -08:00
parent 204b6d4e76
commit 44093e28a2
2 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
py-json/realm.py
View File

@@ -11,7 +11,7 @@ from LANforge import add_dut
from LANforge import lfcli_base from LANforge import lfcli_base
from LANforge import add_vap from LANforge import add_vap
from LANforge.lfcli_base import LFCliBase from LANforge.lfcli_base import LFCliBase
from generic_cx import GenericCx #from generic_cx import GenericCx
from LANforge import add_monitor from LANforge import add_monitor
from LANforge.add_monitor import * from LANforge.add_monitor import *
import os import os
@@ -1162,11 +1162,12 @@ class L3CXProfile(BaseProfile):
else: else:
output_format = report_file.split('.')[-1] output_format = report_file.split('.')[-1]
# Step 1, column names # Step 1, column names . what is this for?
if fields == None: fields=None
pass if col_names is not None and len(col_names) > 0:
else:
fields = ",".join(col_names) fields = ",".join(col_names)
else:
header_row=list((list(self.json_get("/endp/all")['endpoint'][0].values())[0].keys()))
print(fields) print(fields)
# Step 2, monitor columns # Step 2, monitor columns
start_time = datetime.datetime.now() start_time = datetime.datetime.now()
@@ -1179,8 +1180,6 @@ class L3CXProfile(BaseProfile):
old_cx_rx_values = self.__get_rx_values() old_cx_rx_values = self.__get_rx_values()
timestamps = [] timestamps = []
# for x in range(0,int(round(iterations,0))): # for x in range(0,int(round(iterations,0))):
if col_names == None:
header_row=list((list(self.json_get("/endp/all")['endpoint'][0].values())[0].keys()))
while datetime.datetime.now() < end_time: while datetime.datetime.now() < end_time:
if fields == None: if fields == None:
response = self.json_get("/endp/all") response = self.json_get("/endp/all")
@@ -1199,7 +1198,7 @@ class L3CXProfile(BaseProfile):
if self.debug: if self.debug:
print(old_cx_rx_values, new_cx_rx_values) print(old_cx_rx_values, new_cx_rx_values)
print("\n-----------------------------------") print("\n-----------------------------------")
print(curr_time) print(t)
print("-----------------------------------\n") print("-----------------------------------\n")
expected_passes += 1 expected_passes += 1
if self.__compare_vals(old_cx_rx_values, new_cx_rx_values): if self.__compare_vals(old_cx_rx_values, new_cx_rx_values):
@@ -1712,45 +1711,52 @@ class L4CXProfile(LFCliBase):
output_format = report_file.split('.')[-1] output_format = report_file.split('.')[-1]
# Step 1, column names # Step 1, column names
fields=None
if col_names is not None and len(col_names) > 0:
fields = ",".join(col_names) fields = ",".join(col_names)
else:
header_row=list((list(self.json_get("/endp/all")['endpoint'][0].values())[0].keys()))
print(fields) print(fields)
# Step 2, monitor columns, # Step 2, monitor columns,
start_time = datetime.datetime.now() start_time = datetime.datetime.now()
end_time = start_time + datetime.timedelta(seconds=duration_sec) end_time = start_time + datetime.timedelta(seconds=duration_sec)
#print(end_time)
sleep_interval = duration_sec // 5 sleep_interval = duration_sec // 5
value_map = dict() value_map = dict()
passes = 0 passes = 0
expected_passes = 0 expected_passes = 0
timestamps = [] timestamps = []
for x in range(0,int(round(iterations,0))): for test in range(1+iterations):
#while current loop hasn't ended
while datetime.datetime.now() < end_time: while datetime.datetime.now() < end_time:
response = self.json_get("layer4/list?fields=urls/s") #what does response ? get?
response=self.json_get("layer4/all")
#response = self.json_get("layer4/list?fields=urls/s")
if "endpoint" not in response: if "endpoint" not in response:
print(response) print(response)
raise ValueError("no endpoint?") raise ValueError("Cannot find any endpoints")
if monitor: if monitor:
if self.debug: if self.debug:
print(response) print(response)
time.sleep(sleep_interval.total_seconds())
t = datetime.datetime.now() t = datetime.datetime.now()
timestamps.append(t) timestamps.append(t)
value_map[t] = response value_map[t] = response
if self.debug:
print(old_cx_rx_values, new_cx_rx_values)
print("\n-----------------------------------")
print(curr_time)
print("-----------------------------------\n")
expected_passes += 1 expected_passes += 1
if self.__compare_vals(old_cx_rx_values, new_cx_rx_values): if self.cx_profile.check_errors(self.debug):
if self.__check_request_rate():
passes += 1 passes += 1
else: else:
self._fail("FAIL: Not all stations increased traffic") self._fail("FAIL: Request rate did not exceed 90% target rate", print_fail)
self.exit_fail() break
old_cx_rx_values = new_cx_rx_values else:
self._fail("FAIL: Errors found getting to %s " % self.url, print_fail)
break
time.sleep(monitor_interval) time.sleep(monitor_interval)
print(value_map) print(value_map)
############################################# edited 'til here - dipti 1/21/20
# if passes == expected_passes: # if passes == expected_passes:
# self._pass("PASS: All tests passed") # self._pass("PASS: All tests passed")
# step 3 organize data # step 3 organize data

1
py-scripts/test_ipv4_l4_urls_per_ten.py
View File

@@ -128,7 +128,6 @@ class IPV4L4(LFCliBase):
else: else:
self._fail("FAIL: Errors found getting to %s " % self.url, print_fail) self._fail("FAIL: Errors found getting to %s " % self.url, print_fail)
break break
#interval_time = cur_time + datetime.timedelta(minutes=2)
if passes == expected_passes: if passes == expected_passes:
self._pass("PASS: All tests passes", print_pass) self._pass("PASS: All tests passes", print_pass)