From af555b9f09ff0dd1c060547763e5630de75978de Mon Sep 17 00:00:00 2001 From: Dipti Date: Tue, 24 Nov 2020 13:37:41 -0800 Subject: [PATCH] arguement edits, type cast edits --- py-scripts/test_generic.py | 10 +++++----- py-scripts/test_ipv4_l4_urls_per_ten.py | 16 +++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/py-scripts/test_generic.py b/py-scripts/test_generic.py index 4c1cd3ef..34771da0 100755 --- a/py-scripts/test_generic.py +++ b/py-scripts/test_generic.py @@ -198,16 +198,16 @@ python3 ./test_generic.py --upstream_port eth1 Example commands: LFPING: - ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy0 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --type lfping --dest 10.40.0.1 --security wpa2 + ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy0 --num_stations 3 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --type lfping --dest 10.40.0.1 --security wpa2 LFCURL (under construction): - ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy1 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type lfcurl --dest 10.40.0.1 + ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy1 --num_stations 3 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type lfcurl --dest 10.40.0.1 GENERIC: - ./test_generic.py --mgr localhost--mgr_port 4122 --radio wiphy1 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type generic + ./test_generic.py --mgr localhost--mgr_port 4122 --radio wiphy1 --num_stations 3 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type generic SPEEDTEST: - ./test_generic.py -./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy2 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --type speedtest --speedtest_min_up 20 + ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy2 --num_stations 3 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --type speedtest --speedtest_min_up 20 --speedtest_min_dl 20 --speedtest_max_ping 150 --security wpa2 IPERF3 (under construction): - ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy1 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type iperf3 + ./test_generic.py --mgr localhost --mgr_port 4122 --radio wiphy1 --num_stations 3 --ssid jedway-wpa2-x2048-4-1 --passwd jedway-wpa2-x2048-4-1 --security wpa2 --type iperf3 ''') parser.add_argument('--type', help='type of command to run: generic, lfping, iperf3-client, iperf3-server, lfcurl', default="lfping") diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index 06cfea2f..09cd1945 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -33,11 +33,11 @@ class IPV4L4(LFCliBase): self.security = security self.password = password self.url = url - self.requests_per_ten = requests_per_ten + self.requests_per_ten = int(requests_per_ten) self.number_template = number_template self.sta_list = station_list - self.num_tests = num_tests - self.target_requests_per_ten = target_requests_per_ten + self.num_tests = int(num_tests) + self.target_requests_per_ten = int(target_requests_per_ten) self.local_realm = realm.Realm(lfclient_host=self.host, lfclient_port=self.port) self.station_profile = self.local_realm.new_station_profile() @@ -63,7 +63,7 @@ class IPV4L4(LFCliBase): if name in self.cx_profile.created_cx.keys(): expected_passes += 1 if info['urls/s'] * self.requests_per_ten >= self.target_requests_per_ten * .9: - # print(name, info['urls/s'], info['urls/s'] * self.requests_per_ten, self.target_requests_per_ten * .9) + print(name, info['urls/s'], info['urls/s'] * self.requests_per_ten, self.target_requests_per_ten * .9) passes += 1 return passes == expected_passes @@ -84,7 +84,7 @@ class IPV4L4(LFCliBase): temp_stas = self.sta_list.copy() # temp_stas.append(self.local_realm.name_to_eid(self.upstream_port)[2]) cur_time = datetime.datetime.now() - interval_time = cur_time + datetime.timedelta(minutes=10) + interval_time = cur_time + datetime.timedelta(minutes=2) passes = 0 expected_passes = 0 self.station_profile.admin_up() @@ -99,6 +99,7 @@ class IPV4L4(LFCliBase): expected_passes += 1 while cur_time < interval_time: time.sleep(1) + print(".",end="") cur_time = datetime.datetime.now() if self.cx_profile.check_errors(self.debug): @@ -110,7 +111,7 @@ class IPV4L4(LFCliBase): else: self._fail("FAIL: Errors found getting to %s " % self.url, print_fail) break - interval_time = cur_time + datetime.timedelta(minutes=10) + interval_time = cur_time + datetime.timedelta(minutes=2) if passes == expected_passes: self._pass("PASS: All tests passes", print_pass) @@ -146,9 +147,6 @@ python3 ./test_ipv4_l4_urls_per_ten.py --upstream_port eth1 \\ --security {open|wep|wpa|wpa2|wpa3} \\ --ssid netgear \\ --passwd admin123 \\ - --dest 10.40.0.1 \\ - --test_duration 2m \\ - --interval 1s \\ --requests_per_ten 600 \\ --num_tests 1 \\ --url "dl http://10.40.0.1 /dev/null" \\