diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py index ae33c935..d3f5abbd 100755 --- a/py-scripts/test_ipv6_variable_time.py +++ b/py-scripts/test_ipv6_variable_time.py @@ -19,24 +19,25 @@ import datetime class IPV6VariableTime(LFCliBase): - def __init__(self, host, port, ssid, security, password, name_prefix, sta_list, + def __init__(self, host, port, ssid, security, password, sta_list, name_prefix, upstream, radio, side_a_min_rate=56, side_a_max_rate=0, side_b_min_rate=56, side_b_max_rate=0, - number_template="00000", test_duration="5m", - resource=1, + number_template="00000", test_duration="5m", use_ht160=False, _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.upstream = upstream self.host = host self.port = port self.ssid = ssid self.sta_list = sta_list - self.name_prefix = name_prefix self.security = security self.password = password + self.radio = radio self.number_template = number_template - self.resource = resource + self.debug = _debug_on + self.name_prefix = name_prefix self.test_duration = test_duration self.local_realm = realm.Realm(lfclient_host=self.host, lfclient_port=self.port) self.station_profile = self.local_realm.new_station_profile() @@ -44,10 +45,13 @@ class IPV6VariableTime(LFCliBase): self.station_profile.lfclient_url = self.lfclient_url self.station_profile.ssid = self.ssid - self.station_profile.ssid_pass = self.password, + self.station_profile.ssid_pass = self.password self.station_profile.security = self.security self.station_profile.number_template_ = self.number_template - self.station_profile.mode = 0 + self.station_profile.debug = self.debug + self.station_profile.use_ht160 = use_ht160 + if self.station_profile.use_ht160: + self.station_profile.mode = 9 self.cx_profile.host = self.host self.cx_profile.port = self.port @@ -57,18 +61,17 @@ class IPV6VariableTime(LFCliBase): self.cx_profile.side_b_min_bps = side_b_min_rate self.cx_profile.side_b_max_bps = side_b_max_rate - def __get_rx_values(self): cx_list = self.json_get("endp?fields=name,rx+bytes", debug_=self.debug) # print(self.cx_profile.created_cx.values()) - #print("==============\n", cx_list, "\n==============") + # print("==============\n", cx_list, "\n==============") cx_rx_map = {} for cx_name in cx_list['endpoint']: if cx_name != 'uri' and cx_name != 'handler': for item, value in cx_name.items(): for value_name, value_rx in value.items(): - if value_name == 'rx bytes' and item in self.cx_profile.created_cx.values(): - cx_rx_map[item] = value_rx + if value_name == 'rx bytes' and item in self.cx_profile.created_cx.values(): + cx_rx_map[item] = value_rx return cx_rx_map def __compare_vals(self, old_list, new_list): @@ -89,14 +92,13 @@ class IPV6VariableTime(LFCliBase): return False def start(self, print_pass=False, print_fail=False): - print("Starting test") - self.station_profile.admin_up(self.resource) - temp_stas = self.sta_list.copy() - temp_stas.append("eth1") - if self.local_realm.wait_for_ip(self.resource, temp_stas, ipv6=True): + self.station_profile.admin_up() + temp_stas = self.station_profile.station_names.copy() + temp_stas.append(self.upstream) + if self.local_realm.wait_for_ip(temp_stas, ipv4=False, ipv6=True): self._pass("All stations got IPs", print_pass) else: - self._fail("Stations failed to get IPs", print_fail, ipv6=True) + self._fail("Stations failed to get IPs", print_fail) exit(1) cur_time = datetime.datetime.now() old_cx_rx_values = self.__get_rx_values() @@ -129,43 +131,79 @@ class IPV6VariableTime(LFCliBase): def stop(self): self.cx_profile.stop_cx() - for sta_name in self.sta_list: - data = LFUtils.portDownRequest(1, sta_name) - url = "cli-json/set_port" - self.json_post(url, data) + self.station_profile.admin_down() - def cleanup(self, sta_list): + def pre_cleanup(self): + self.cx_profile.cleanup_prefix() + for sta in self.sta_list: + self.local_realm.rm_port(sta, check_exists=True) + + def cleanup(self): 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() + LFUtils.wait_until_ports_disappear(base_url=self.lfclient_url, port_list=self.station_profile.station_names, debug=self.debug) def build(self): + self.station_profile.use_security(self.security, self.ssid, self.password) self.station_profile.set_number_template(self.number_template) print("Creating stations") 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) - temp_sta_list = [] - for station in range(len(self.sta_list)): - temp_sta_list.append(str(self.resource) + "." + self.sta_list[station]) - self.station_profile.create(resource=1, radio="wiphy0", sta_names_=self.sta_list, debug=self.debug) - self.cx_profile.create(endp_type="lf_udp6", side_a=temp_sta_list, side_b="1.eth1", sleep_time=.5) + self.station_profile.create(radio=self.radio, sta_names_=self.sta_list, debug=self.debug) + self.cx_profile.create(endp_type="lf_udp", side_a=self.station_profile.station_names, side_b=self.upstream, + sleep_time=0) self._pass("PASS: Station build finished") def main(): - lfjson_host = "localhost" lfjson_port = 8080 - station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000) - ip_var_test = IPV6VariableTime(lfjson_host, lfjson_port, number_template="00", sta_list=station_list, - name_prefix="var_time", - ssid="jedway-wpa2-x2048-4-4", - password="jedway-wpa2-x2048-4-4", - resource=1, security="wpa2", test_duration="5m", - side_a_min_rate=256, side_b_min_rate=256) - ip_var_test.cleanup(station_list) + + parser = LFCliBase.create_basic_argparse( + prog='test_ipv6_variable_time.py', + # formatter_class=argparse.RawDescriptionHelpFormatter, + formatter_class=argparse.RawTextHelpFormatter, + epilog='''\ + Useful Information: + 1. TBD + ''', + + description='''\ +test_ipv6_variable_time.py: +-------------------- +TBD + +Generic command layout: +python ./test_ipv6_variable_time.py --upstream_port --radio --debug + +Note: multiple --radio switches may be entered up to the number of radios available: + --radio --radio + + python3 ./test_ipv6_variable_time.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('--a_min', help='--a_min bps rate minimum for side_a', default=256000) + parser.add_argument('--b_min', help='--b_min bps rate minimum for side_b', default=256000) + parser.add_argument('--test_duration', help='--test_duration sets the duration of the test', default="5m") + + args = parser.parse_args() + + station_list = LFUtils.portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000, + radio=args.radio) + + ip_var_test = IPV6VariableTime(args.mgr, lfjson_port, number_template="00", sta_list=station_list, + name_prefix="VT", + upstream=args.upstream_port, + ssid=args.ssid, + password=args.passwd, + radio=args.radio, + security=args.security, test_duration=args.test_duration, use_ht160=False, + side_a_min_rate=args.a_min, side_b_min_rate=args.b_min, _debug_on=args.debug) + + ip_var_test.pre_cleanup() ip_var_test.build() if not ip_var_test.passes(): print(ip_var_test.get_fail_message()) @@ -176,7 +214,7 @@ def main(): print(ip_var_test.get_fail_message()) exit(1) time.sleep(30) - ip_var_test.cleanup(station_list) + ip_var_test.cleanup() if ip_var_test.passes(): print("Full test passed, all connections increased rx bytes")