From b115c45f958a901b3ce0d55441e5115de059f129 Mon Sep 17 00:00:00 2001 From: Dipti Date: Wed, 16 Dec 2020 09:17:05 -0800 Subject: [PATCH] test_duration is now able to be set - def to 2m --- py-scripts/test_ipv4_l4_ftp_urls_per_ten.py | 47 ++++++++++----------- py-scripts/test_ipv4_l4_urls_per_ten.py | 24 +++++++---- 2 files changed, 38 insertions(+), 33 deletions(-) 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 f9373d85..f549c07a 100755 --- a/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py @@ -19,8 +19,8 @@ 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", num_tests=1, radio="wiphy0", + def __init__(self, ssid, security, password, url, requests_per_ten, station_list,test_duration="2m",host="localhost", port=8080, + number_template="00000", num_tests=1, radio="wiphy0", _debug_on=False, upstream_port="eth1", _exit_on_error=False, _exit_on_fail=False): @@ -37,7 +37,8 @@ class IPV4L4(LFCliBase): 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.target_requests_per_ten = requests_per_ten + 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() @@ -85,11 +86,7 @@ class IPV4L4(LFCliBase): def start(self, print_pass=False, print_fail=False): self.port_util.set_ftp(port_name=self.local_realm.name_to_eid(self.upstream_port)[2], resource=1, on=True) 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) - passes = 0 - expected_passes = 0 + self.station_profile.admin_up() if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) @@ -98,11 +95,16 @@ class IPV4L4(LFCliBase): exit(1) self.cx_profile.start_cx() print("Starting test") + curr_time = datetime.datetime.now() + end_time = self.local_realm.parse_time(self.test_duration) + curr_time + sleep_interval = self.local_realm.parse_time(self.test_duration) // 5 + passes = 0 + expected_passes = 0 for test in range(self.num_tests): expected_passes += 1 - while cur_time < interval_time: - time.sleep(1) - cur_time = datetime.datetime.now() + while curr_time < end_time: + time.sleep(sleep_interval.total_seconds()) + curr_time = datetime.datetime.now() if self.cx_profile.check_errors(self.debug): if self.__check_request_rate(): @@ -131,10 +133,8 @@ class IPV4L4(LFCliBase): def main(): lfjson_port = 8080 - parser = LFCliBase.create_basic_argparse( prog='test_ipv4_l4_urls_per_ten', - # formatter_class=argparse.RawDescriptionHelpFormatter, formatter_class=argparse.RawTextHelpFormatter, epilog='''\ Create layer-4 endpoints to connect to an ftp server and test that urls/s are meeting or exceeding the target rate @@ -150,22 +150,22 @@ python3 ./test_ipv4_l4_ftp_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 \\ + --test_duration 2m \\ {2m | 30s | 3h | 1d ...etc} --interval 1s \\ --requests_per_ten 600 \\ --num_tests 1 \\ - --url "dl http://10.40.0.1 /dev/null" \\ - --target_per_ten 600 \\ + --url "dl ftp://10.0.0.105 file_name.bin" {ul\dl ftp://[ftp server IP] [filename]} --debug ''') - + required = parser.add_argument_group('required arguments') + required.add_argument('--security', help='WiFi Security protocol: < open | wep | wpa | wpa2 | wpa3 >', required=True) parser.add_argument('--requests_per_ten', help='--requests_per_ten number of request per ten minutes', default=600) + parser.add_argument('--test_duration', help='--test duration of a single test', 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% of this value', - default=600) + #parser.add_argument('--target_per_ten', help='--target_per_ten target number of request per ten minutes. test will check for 90 percent of this value', + #default=600) args = parser.parse_args() num_sta = 2 @@ -186,8 +186,8 @@ python3 ./test_ipv4_l4_ftp_urls_per_ten.py --upstream_port eth1 \\ 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) + requests_per_ten=args.requests_per_ten, + test_duration=args.test_duration) ip_test.cleanup(station_list) ip_test.build() ip_test.start() @@ -198,8 +198,7 @@ python3 ./test_ipv4_l4_ftp_urls_per_ten.py --upstream_port eth1 \\ time.sleep(30) ip_test.cleanup(station_list) if ip_test.passes(): - print("Full test passed, all endpoints met or exceeded 90% of the target rate") - + print("Full test passed, all endpoints met or exceeded 90 percent of the target rate") if __name__ == "__main__": main() diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index 3eb0d276..e0fd36e3 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -18,7 +18,7 @@ import datetime class IPV4L4(LFCliBase): - def __init__(self, ssid, security, password, url, requests_per_ten, station_list, host="localhost", port=8080, + def __init__(self, ssid, security, password, url, requests_per_ten, station_list, host="localhost", port=8080,test_duration="2m", target_requests_per_ten=60, number_template="00000", num_tests=1, radio="wiphy0", _debug_on=False, upstream_port="eth1", _exit_on_error=False, @@ -34,6 +34,7 @@ class IPV4L4(LFCliBase): self.url = url self.requests_per_ten = int(requests_per_ten) self.number_template = number_template + self.test_duration=test_duration self.sta_list = station_list self.num_tests = int(num_tests) self.target_requests_per_ten = int(target_requests_per_ten) @@ -82,10 +83,7 @@ class IPV4L4(LFCliBase): def start(self, print_pass=False, print_fail=False): 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=2) - passes = 0 - expected_passes = 0 + self.station_profile.admin_up() if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) @@ -94,13 +92,18 @@ class IPV4L4(LFCliBase): exit(1) self.cx_profile.start_cx() print("Starting test") + curr_time = datetime.datetime.now() + end_time = self.local_realm.parse_time(self.test_duration) + curr_time + sleep_interval = self.local_realm.parse_time(self.test_duration) // 5 + passes = 0 + expected_passes = 0 for test in range(self.num_tests): expected_passes += 1 - while cur_time < interval_time: - time.sleep(1) + while curr_time < end_time: + time.sleep(sleep_interval.total_seconds()) if self.debug: print(".",end="") - cur_time = datetime.datetime.now() + curr_time = datetime.datetime.now() if self.cx_profile.check_errors(self.debug): if self.__check_request_rate(): @@ -111,7 +114,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=2) + #interval_time = cur_time + datetime.timedelta(minutes=2) if passes == expected_passes: self._pass("PASS: All tests passes", print_pass) @@ -148,6 +151,7 @@ python3 ./test_ipv4_l4_urls_per_ten.py --num_tests 1 \\ --url "dl http://10.40.0.1 /dev/null" \\ --target_per_ten 600 \\ + --test_duration 2m --debug ''') required = parser.add_argument_group('required arguments') @@ -155,6 +159,7 @@ python3 ./test_ipv4_l4_urls_per_ten.py 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('--test_duration', help='duration of test',default="2m") parser.add_argument('--target_per_ten', help='--target_per_ten target number of request per ten minutes. test will check for 90 percent this value',default=600) args = parser.parse_args() @@ -176,6 +181,7 @@ python3 ./test_ipv4_l4_urls_per_ten.py security=args.security, station_list=station_list, url=args.url, + test_duration=args.test_duration, num_tests=args.num_tests, target_requests_per_ten=args.target_per_ten, requests_per_ten=args.requests_per_ten)