From 1f807eb2b973b6d1043e9fb0bd6609d42f6bbfdb Mon Sep 17 00:00:00 2001 From: Dipti Date: Tue, 3 Nov 2020 09:42:36 -0800 Subject: [PATCH] changes to lfcli_base to force ssid, password, radio and security --- py-json/LANforge/lfcli_base.py | 10 +++++----- py-scripts/test_generic.py | 28 +++++++++++++--------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index 51c2c84d..e5a1c280 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -26,7 +26,7 @@ class LFCliBase: self.lfclient_port = _lfjson_port self.debug = _debug if (_local_realm is not False): - self.local_realm = _local_realm; + self.local_realm = _local_realm self.lfclient_url = "http://%s:%s" % (self.lfclient_host, self.lfclient_port) self.test_results = [] @@ -246,10 +246,10 @@ class LFCliBase: parser.add_argument('-u', '--upstream_port', help='non-station port that generates traffic: ., e.g: 1.eth1', default='1.eth1') - parser.add_argument('--radio', help='radio EID, e.g: 1.wiphy2', default='wiphy2') - parser.add_argument('--security', help='WiFi Security protocol: ', default='wpa2') - parser.add_argument('--ssid', help='SSID for stations to associate to', default='jedway-wpa2-160') - parser.add_argument('--passwd', help='WiFi passphrase', default='jedway-wpa2-160') + parser.add_argument('--radio', help='radio EID, e.g: 1.wiphy2', default=None) + parser.add_argument('--security', help='WiFi Security protocol: ', default=None) + parser.add_argument('--ssid', help='SSID for stations to associate to', default=None) + parser.add_argument('--passwd', '--passphrase', '--password', '--pwd', help='WiFi passphrase', default=None) parser.add_argument('--num_stations', help='Number of stations to create', default=2) parser.add_argument('--debug', help='Enable debugging', default=False, action="store_true") diff --git a/py-scripts/test_generic.py b/py-scripts/test_generic.py index 8c451709..b9221c9b 100755 --- a/py-scripts/test_generic.py +++ b/py-scripts/test_generic.py @@ -20,14 +20,12 @@ import json class GenTest(LFCliBase): def __init__(self, host, port, ssid, security, password, sta_list, name_prefix, upstream, - number_template="000", test_duration="5m", type="lfping", dest="127.0.0.1", cmd ="", - interval=1, radio="wiphy0", speedtest_min_up=None, speedtest_min_dl=None, speedtest_max_ping=None, + number_template="000", test_duration="5m", type="lfping", dest=None, cmd =None, + interval=1, radio=None, speedtest_min_up=None, speedtest_min_dl=None, speedtest_max_ping=None, _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 + super().__init__(host, port, _local_realm=realm.Realm(host,port), _debug=_debug_on, _halt_on_error=_exit_on_error, _exit_on_fail=_exit_on_fail) self.ssid = ssid self.radio = radio self.upstream = upstream @@ -43,7 +41,7 @@ class GenTest(LFCliBase): self.speedtest_min_dl = float(speedtest_min_dl) if (speedtest_max_ping is not None): self.speedtest_max_ping = float(speedtest_max_ping) - self.local_realm = realm.Realm(lfclient_host=self.host, lfclient_port=self.port) + self.station_profile = self.local_realm.new_station_profile() self.generic_endps_profile = self.local_realm.new_generic_endp_profile() @@ -90,7 +88,7 @@ class GenTest(LFCliBase): def choose_generic_command(self): gen_results = self.json_get("generic/list?fields=name,last+results", debug_=self.debug) - if gen_results['endpoints'] is not None: + if (gen_results['endpoints'] is not None): for name in gen_results['endpoints']: for k, v in name.items(): if v['name'] in self.generic_endps_profile.created_endp and not v['name'].endswith('1'): @@ -130,7 +128,7 @@ class GenTest(LFCliBase): elif self.generic_endps_profile.type == "speedtest": result = self.choose_speedtest_command() elif self.generic_endps_profile.type == "iperf3": - continue + result = self.choose_iperf3_command() else: continue @@ -184,19 +182,19 @@ def main(): -------------------- Generic command example: python3 ./test_generic.py --upstream_port eth1 - --radio wiphy0 + --radio wiphy0 (required) --num_stations 3 - --security {open|wep|wpa|wpa2|wpa3} - --ssid netgear - --passwd admin123 - --type lfping {generic|lfping|iperf3|lf_curl} - --dest 10.40.0.1 + --security {open|wep|wpa|wpa2|wpa3} (required) + --ssid netgear (required) + --passwd admin123 (required) + --type lfping {generic|lfping|iperf3-client | iperf3-server |lf_curl} (required) + --dest 10.40.0.1 (required) --test_duration 2m --interval 1s --debug ''') - parser.add_argument('--type', help='type of command to run: generic, lfping, ifperf3, lfcurl', default="lfping") + parser.add_argument('--type', help='type of command to run: generic, lfping, iperf3-client, iperf3-server, lfcurl', default="lfping") parser.add_argument('--cmd', help='specifies command to be run by generic type endp', default='') parser.add_argument('--dest', help='destination IP for command', default="10.40.0.1") parser.add_argument('--test_duration', help='duration of the test eg: 30s, 2m, 4h', default="2m")