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

user defined columsn in test_ipv4_variable_time

Browse Source
This commit is contained in:
Matthew Stidham
2021-01-22 11:53:24 -08:00
parent 452504cf64
commit 2931522e37
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py-json/realm.py
View File

@@ -1154,8 +1154,8 @@ class L3CXProfile(BaseProfile):
raise ValueError("Monitor needs a list of Layer 3 connections") raise ValueError("Monitor needs a list of Layer 3 connections")
if (monitor_interval is None) or (monitor_interval < 1): if (monitor_interval is None) or (monitor_interval < 1):
raise ValueError("L3CXProfile::monitor wants monitor_interval >= 1 second") raise ValueError("L3CXProfile::monitor wants monitor_interval >= 1 second")
if col_names is None: #if col_names is None:
raise ValueError("L3CXProfile::monitor wants a list of column names to monitor") #raise ValueError("L3CXProfile::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]:
if output_format.lower() != 'excel': if output_format.lower() != 'excel':

8
py-scripts/test_ipv4_variable_time.py
View File

@@ -193,6 +193,7 @@ python3 ./test_ipv4_variable_time.py
optional_args.add_argument('--a_min', help='--a_min bps rate minimum for side_a', default=256000) optional_args.add_argument('--a_min', help='--a_min bps rate minimum for side_a', default=256000)
optional_args.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=256000) optional_args.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=256000)
optional_args.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="2m") optional_args.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="2m")
optional_args.add_argument('--col_names', help='Which columns you want to monitor', default=['Name','Rx Rate','Rx PDUs'])
args = parser.parse_args() args = parser.parse_args()
num_sta = 2 num_sta = 2
@@ -249,7 +250,12 @@ python3 ./test_ipv4_variable_time.py
layer3connections=','.join([[*x.keys()][0] for x in ip_var_test.local_realm.json_get('endp')['endpoint']]) layer3connections=','.join([[*x.keys()][0] for x in ip_var_test.local_realm.json_get('endp')['endpoint']])
except: except:
raise ValueError('Try setting the upstream port flag if your device does not have an eth1 port') raise ValueError('Try setting the upstream port flag if your device does not have an eth1 port')
ip_var_test.l3cxprofile.monitor(col_names=['Name','Rx Rate','Rx PDUs'], if type(args.col_names) is not list:
col_names=None
else:
col_names = args.col_names
print(col_names)
ip_var_test.l3cxprofile.monitor(col_names=col_names,
report_file=report_f, report_file=report_f,
duration_sec=ip_var_test.local_realm.parse_time(args.test_duration).total_seconds(), duration_sec=ip_var_test.local_realm.parse_time(args.test_duration).total_seconds(),
created_cx= layer3connections, created_cx= layer3connections,