From 68121692c04fe6d247dadfc8cea640b61ff04342 Mon Sep 17 00:00:00 2001 From: Dipti Date: Fri, 30 Oct 2020 13:41:59 -0700 Subject: [PATCH] parameter fixes --- py-scripts/example_wep_connection.py | 4 +++- py-scripts/test_fileio.py | 7 ++++++- py-scripts/test_ipv4_l4_ftp_upload.py | 7 ++++++- py-scripts/test_ipv4_l4_ftp_urls_per_ten.py | 8 +++++++- py-scripts/test_ipv4_l4_wifi.py | 7 ++++++- py-scripts/test_ipv4_ps.py | 7 ++++++- py-scripts/test_ipv4_ttls.py | 13 +++++++++---- py-scripts/test_ipv6_connection.py | 5 ++++- py-scripts/test_ipv6_variable_time.py | 5 ++++- py-scripts/test_l3_WAN_LAN.py | 5 ++++- 10 files changed, 55 insertions(+), 13 deletions(-) diff --git a/py-scripts/example_wep_connection.py b/py-scripts/example_wep_connection.py index 8e5b09a4..feb612eb 100755 --- a/py-scripts/example_wep_connection.py +++ b/py-scripts/example_wep_connection.py @@ -90,7 +90,9 @@ def main(): args = parser.parse_args() num_sta = 2 if (args.num_stations is not None) and (int(args.num_stations) > 0): - num_sta = int(args.num_stations) + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, diff --git a/py-scripts/test_fileio.py b/py-scripts/test_fileio.py index d26471a2..70306ee4 100755 --- a/py-scripts/test_fileio.py +++ b/py-scripts/test_fileio.py @@ -239,8 +239,13 @@ python3 ./test_fileio.py --upstream_port eth1 --fio_type fe_nfs4 --min_read 1Mbp parser.add_argument('--server_mount', help='--server_mount The server to mount, ex: 192.168.100.5/exports/test1', default="10.40.0.1:/var/tmp/test") args = parser.parse_args() + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_test = FileIOTest(args.mgr, diff --git a/py-scripts/test_ipv4_l4_ftp_upload.py b/py-scripts/test_ipv4_l4_ftp_upload.py index a2932377..2b126f66 100755 --- a/py-scripts/test_ipv4_l4_ftp_upload.py +++ b/py-scripts/test_ipv4_l4_ftp_upload.py @@ -185,7 +185,12 @@ python3 ./test_ipv4_l4_ftp_wifi.py --upstream_port eth1 \\ default="ul ftp://10.40.0.1 /dev/null") args = parser.parse_args() - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_test = IPV4L4(args.mgr, lfjson_port, ssid=args.ssid, password=args.passwd, diff --git a/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py b/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py index f3481894..c2ea5368 100755 --- a/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py @@ -168,7 +168,13 @@ python3 ./test_ipv4_l4_ftp_urls_per_ten.py --upstream_port eth1 \\ default=600) args = parser.parse_args() - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted + + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_test = IPV4L4(args.mgr, lfjson_port, ssid=args.ssid, password=args.passwd, upstream_port=args.upstream_port,radio= args.radio, diff --git a/py-scripts/test_ipv4_l4_wifi.py b/py-scripts/test_ipv4_l4_wifi.py index 1ad1d101..7c37696e 100755 --- a/py-scripts/test_ipv4_l4_wifi.py +++ b/py-scripts/test_ipv4_l4_wifi.py @@ -188,8 +188,13 @@ python3 ./test_ipv4_l4_wifi.py --upstream_port eth1 \\ parser.add_argument('--dest', help='--dest specifies the destination (dl) or source (ul) for the file', default="/dev/null") args = parser.parse_args() + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=2, padding_number_=10000, + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_test = IPV4L4(args.mgr, lfjson_port, ssid=args.ssid, password=args.passwd, diff --git a/py-scripts/test_ipv4_ps.py b/py-scripts/test_ipv4_ps.py index 1fac86b8..06d23dce 100755 --- a/py-scripts/test_ipv4_ps.py +++ b/py-scripts/test_ipv4_ps.py @@ -208,8 +208,13 @@ Note: multiple --radio switches may be entered up to the number of radios avai parser.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="5m") args = parser.parse_args() + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_var_test = IPV4VariableTime(args.mgr, lfjson_port, number_template="00", sta_list=station_list, diff --git a/py-scripts/test_ipv4_ttls.py b/py-scripts/test_ipv4_ttls.py index 85df3748..c7ead9d7 100755 --- a/py-scripts/test_ipv4_ttls.py +++ b/py-scripts/test_ipv4_ttls.py @@ -240,9 +240,9 @@ test_ipv4_ttls.py: Generic command layout: python ./test_ipv4_ttls.py --upstream_port --radio - --num_stations - --ssid - --keyphrase + --num_stations 3 + --ssid ssid-wpa-1 + --keyphrase ssid-wpa-1 --security --debug @@ -263,7 +263,12 @@ test_ipv4_ttls.py: parser.add_argument('--use_hs20', help='use HotSpot 2.0', default=False) parser.add_argument('--enable_pkc', help='enable opportunistic PMKSA WPA2 key caching', default=False) args = parser.parse_args() - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000) + num_sta = 2 + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000) ttls_test = TTLSTest(lfjson_host, lfjson_port, ssid=args.ssid, password=args.passwd, diff --git a/py-scripts/test_ipv6_connection.py b/py-scripts/test_ipv6_connection.py index 8b4f0278..dc2c5753 100755 --- a/py-scripts/test_ipv6_connection.py +++ b/py-scripts/test_ipv6_connection.py @@ -140,8 +140,11 @@ python3 ./test_ipv6_connection.py --upstream_port eth1 \\ parser.add_argument('--timeout', help='--timeout sets the length of time to wait until a connection is successful', default=120) args = parser.parse_args() + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=num_sta-1, end_id_=1, padding_number_=10000, radio=args.radio) ipv6_test = IPv6Test(args.mgr, lfjson_port, ssid=args.ssid, password=args.passwd, diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py index ee9a84a5..90218da1 100755 --- a/py-scripts/test_ipv6_variable_time.py +++ b/py-scripts/test_ipv6_variable_time.py @@ -192,8 +192,11 @@ python3 ./test_ipv6_connection.py --upstream_port eth1 \\ parser.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="5m") args = parser.parse_args() + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_var_test = IPV6VariableTime(args.mgr, lfjson_port, number_template="00", sta_list=station_list, diff --git a/py-scripts/test_l3_WAN_LAN.py b/py-scripts/test_l3_WAN_LAN.py index 04595b93..e0f3085b 100755 --- a/py-scripts/test_l3_WAN_LAN.py +++ b/py-scripts/test_l3_WAN_LAN.py @@ -208,8 +208,11 @@ TBD parser.add_argument('--vr_name', help='--vr_name sets the name to be used by the virtual router', default="vr_test") args = parser.parse_args() + if (args.num_stations is not None) and (int(args.num_stations) > 0): + num_stations_converted = int(args.num_stations) + num_sta = num_stations_converted - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=num_sta-1, padding_number_=10000, radio=args.radio) ip_var_test = VRTest(args.mgr, lfjson_port, number_template="00", sta_list=station_list,