From 85b5b28de9e0a3271a624e3916eafd5cce6f5619 Mon Sep 17 00:00:00 2001 From: Logan Lipke Date: Thu, 6 Aug 2020 14:17:11 -0700 Subject: [PATCH] Updated script to use new arg parsing methods --- py-scripts/test_ipv4_l4_urls_per_ten.py | 68 ++++++++++++++++++------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index f255d2bd..8d64f32b 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -20,13 +20,14 @@ import datetime class IPV4L4(LFCliBase): def __init__(self, host, port, ssid, security, password, url, requests_per_ten, station_list, - target_requests_per_ten=60, number_template="00000", resource=1, num_tests=1, + target_requests_per_ten=60, number_template="00000", num_tests=1, radio="wiphy0", _debug_on=False, _exit_on_error=False, _exit_on_fail=False): super().__init__(host, port, _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) self.host = host self.port = port + self.radio = radio self.ssid = ssid self.security = security self.password = password @@ -34,7 +35,6 @@ class IPV4L4(LFCliBase): self.requests_per_ten = requests_per_ten self.number_template = number_template self.sta_list = station_list - self.resource = resource self.num_tests = num_tests self.target_requests_per_ten = target_requests_per_ten @@ -74,13 +74,10 @@ class IPV4L4(LFCliBase): self.station_profile.set_command_flag("add_sta", "create_admin_down", 1) self.station_profile.set_command_param("set_port", "report_timer", 1500) self.station_profile.set_command_flag("set_port", "rpt_timer", 1) - self.station_profile.create(resource=1, radio="wiphy0", sta_names_=self.sta_list, debug=self.debug) + self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) self._pass("PASS: Station build finished") - temp_sta_list = [] - for station in range(len(self.sta_list)): - temp_sta_list.append(str(self.resource) + "." + self.sta_list[station]) - self.cx_profile.create(ports=temp_sta_list, sleep_time=.5, debug_=self.debug, suppress_related_commands_=None) + self.cx_profile.create(ports=self.station_profile.station_names, sleep_time=.5, debug_=self.debug, suppress_related_commands_=None) def start(self, print_pass=False, print_fail=False): temp_stas = self.sta_list.copy() @@ -89,8 +86,8 @@ class IPV4L4(LFCliBase): interval_time = cur_time + datetime.timedelta(minutes=10) passes = 0 expected_passes = 0 - self.station_profile.admin_up(1) - if self.local_realm.wait_for_ip(self.resource, temp_stas): + self.station_profile.admin_up() + if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) else: self._fail("Stations failed to get IPs", print_fail) @@ -119,25 +116,60 @@ class IPV4L4(LFCliBase): def stop(self): self.cx_profile.stop_cx() for sta_name in self.sta_list: - data = LFUtils.portDownRequest(1, sta_name) + data = LFUtils.portDownRequest(1, self.local_realm.name_to_eid(sta_name)[2]) url = "cli-json/set_port" self.json_post(url, data) def cleanup(self, sta_list): self.cx_profile.cleanup() - self.station_profile.cleanup(self.resource, sta_list) - LFUtils.wait_until_ports_disappear(resource_id=self.resource, base_url=self.lfclient_url, port_list=sta_list, + self.station_profile.cleanup(sta_list) + LFUtils.wait_until_ports_disappear(base_url=self.lfclient_url, port_list=sta_list, debug=self.debug) def main(): - lfjson_host = "localhost" lfjson_port = 8080 - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000) - ip_test = IPV4L4(lfjson_host, lfjson_port, ssid="jedway-wpa2-x2048-4-4", password="jedway-wpa2-x2048-4-4", - security="wpa2", station_list=station_list, url="dl http://10.40.0.1 /dev/null", num_tests=1, - target_requests_per_ten=600, - requests_per_ten=600) + + parser = LFCliBase.create_basic_argparse( + prog='test_generic.py', + # formatter_class=argparse.RawDescriptionHelpFormatter, + formatter_class=argparse.RawTextHelpFormatter, + epilog='''\ + Useful Information: + 1. TBD + ''', + + description='''\ + test_generic.py: + -------------------- + TBD + + Generic command layout: + python ./test_ipv4_l4.py --upstream_port --radio --debug + + Note: multiple --radio switches may be entered up to the number of radios available: + --radio --radio + + python3 ./test_ipv4_l4.py --upstream_port eth1 --radio wiphy0 32 candelaTech-wpa2-x2048-4-1 candelaTech-wpa2-x2048-4-1 wpa2 --radio wiphy1 64 candelaTech-wpa2-x2048-5-3 candelaTech-wpa2-x2048-5-3 wpa2 + + ''') + + parser.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="5m") + parser.add_argument('--requests_per_ten', help='--requests_per_ten number of request per ten minutes', default=600) + parser.add_argument('--num_tests', help='--num_tests number of tests to run. Each test runs 10 minutes', default=1) + parser.add_argument('--url', help='--url specifies upload/download, address, and dest', + default="dl http://10.40.0.1 /dev/null") + parser.add_argument('--target_per_ten', help='--target_per_ten target number of request per ten minutes. test will check for 90% this value', + default=600) + args = parser.parse_args() + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + radio=args.radio) + + ip_test = IPV4L4(args.mgr, lfjson_port, ssid=args.ssid, password=args.passwd, + security=args.security, station_list=station_list, url=args.url, num_tests=args.num_tests, + target_requests_per_ten=args.target_per_ten, + requests_per_ten=args.requests_per_ten) ip_test.cleanup(station_list) ip_test.build() ip_test.start()