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

contuination of monitor in l4cxprof & addition of monitor urls_per_ten

Browse Source
This commit is contained in:
Dipti
2021-01-22 13:30:47 -08:00
parent 8af7255094
commit 745b897230
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py-json/realm.py
View File

@@ -1685,8 +1685,6 @@ class L4CXProfile(LFCliBase):
raise ValueError("Monitor needs a list of Layer 4 connections") raise ValueError("Monitor needs a list of Layer 4 connections")
if (monitor_interval is None) or (monitor_interval < 1): if (monitor_interval is None) or (monitor_interval < 1):
raise ValueError("L4CXProfile::monitor wants monitor_interval >= 1 second") raise ValueError("L4CXProfile::monitor wants monitor_interval >= 1 second")
if col_names is None:
raise ValueError("L4CXProfile::monitor wants a list of column names to monitor")
if output_format is not None: if output_format is not None:
if output_format.lower() != report_file.split('.')[-1]: if output_format.lower() != report_file.split('.')[-1]:
raise ValueError('Filename %s does not match output format %s' % (report_file, output_format)) raise ValueError('Filename %s does not match output format %s' % (report_file, output_format))
@@ -1698,6 +1696,7 @@ class L4CXProfile(LFCliBase):
fields=None fields=None
if col_names is not None and len(col_names) > 0: if col_names is not None and len(col_names) > 0:
fields = ",".join(col_names) fields = ",".join(col_names)
header_row=col_names
if self.debug: if self.debug:
print(fields) print(fields)
else: else:
@@ -1710,17 +1709,17 @@ class L4CXProfile(LFCliBase):
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)
sleep_interval = duration_sec // 5 sleep_interval = round(duration_sec // 5)
value_map = dict() value_map = dict()
passes = 0 passes = 0
expected_passes = 0 expected_passes = 0
timestamps = [] timestamps = []
for test in range(1+iterations): for test in range(1+iterations):
#while current loop hasn't ended
while datetime.datetime.now() < end_time: while datetime.datetime.now() < end_time:
#what does response ? get?
response=self.json_get("layer4/all") response=self.json_get("layer4/all")
#response = self.json_get("layer4/list?fields=urls/s") #response = self.json_get("layer4/list?fields=urls/s")
if self.debug:
print(response)
if "endpoint" not in response: if "endpoint" not in response:
print(response) print(response)
raise ValueError("Cannot find any endpoints") raise ValueError("Cannot find any endpoints")

9
py-scripts/test_ipv4_l4_urls_per_ten.py
View File

@@ -221,8 +221,13 @@ python3 ./test_ipv4_l4_urls_per_ten.py
layer4traffic=','.join([[*x.keys()][0] for x in ip_test.local_realm.json_get('layer4')['endpoint']]) layer4traffic=','.join([[*x.keys()][0] for x in ip_test.local_realm.json_get('layer4')['endpoint']])
except: except:
pass pass
ip_test.l4cxprofile.monitor(report_file=rpt_file, duration_sec=ip_test.local_realm.parse_time(args.test_duration).total_seconds(), ip_test.l4cxprofile.monitor(col_names=['Name','bytes-rd','rx rate (1 min)', 'urls/s'],
created_cx=layer4traffic, output_format=output_form, script_name='test_ipv4_l4_urls_per_ten', arguments=args) report_file=rpt_file,
duration_sec=ip_test.local_realm.parse_time(args.test_duration).total_seconds(),
created_cx=layer4traffic,
output_format=output_form,
script_name='test_ipv4_l4_urls_per_ten',
arguments=args)
ip_test.stop() ip_test.stop()
if not ip_test.passes(): if not ip_test.passes():
print(ip_test.get_fail_message()) print(ip_test.get_fail_message())