From 745b8972306d5331a6b6ee64371f35e6964dd52e Mon Sep 17 00:00:00 2001 From: Dipti Date: Fri, 22 Jan 2021 13:30:47 -0800 Subject: [PATCH] contuination of monitor in l4cxprof & addition of monitor urls_per_ten --- py-json/realm.py | 9 ++++----- py-scripts/test_ipv4_l4_urls_per_ten.py | 9 +++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/py-json/realm.py b/py-json/realm.py index e05ce082..3426276f 100755 --- a/py-json/realm.py +++ b/py-json/realm.py @@ -1685,8 +1685,6 @@ class L4CXProfile(LFCliBase): raise ValueError("Monitor needs a list of Layer 4 connections") if (monitor_interval is None) or (monitor_interval < 1): 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.lower() != report_file.split('.')[-1]: raise ValueError('Filename %s does not match output format %s' % (report_file, output_format)) @@ -1698,6 +1696,7 @@ class L4CXProfile(LFCliBase): fields=None if col_names is not None and len(col_names) > 0: fields = ",".join(col_names) + header_row=col_names if self.debug: print(fields) else: @@ -1710,17 +1709,17 @@ class L4CXProfile(LFCliBase): start_time = datetime.datetime.now() end_time = start_time + datetime.timedelta(seconds=duration_sec) - sleep_interval = duration_sec // 5 + sleep_interval = round(duration_sec // 5) value_map = dict() passes = 0 expected_passes = 0 timestamps = [] for test in range(1+iterations): - #while current loop hasn't ended while datetime.datetime.now() < end_time: - #what does response ? get? response=self.json_get("layer4/all") #response = self.json_get("layer4/list?fields=urls/s") + if self.debug: + print(response) if "endpoint" not in response: print(response) raise ValueError("Cannot find any endpoints") diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index ac03c228..f0dccc52 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -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']]) except: pass - ip_test.l4cxprofile.monitor(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.l4cxprofile.monitor(col_names=['Name','bytes-rd','rx rate (1 min)', 'urls/s'], + 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() if not ip_test.passes(): print(ip_test.get_fail_message())