From 4f402d15f4643ac80125d008aa40d0771aa44f4a Mon Sep 17 00:00:00 2001 From: Logan Lipke Date: Mon, 13 Jul 2020 12:42:50 -0700 Subject: [PATCH] Modified path append to work better with Windows, updated use of wait_for_ip calls to work with new params --- py-scripts/test_ipv4_connection.py | 4 ++-- py-scripts/test_ipv4_l4.py | 4 +++- py-scripts/test_ipv4_l4_urls_per_ten.py | 8 +++++--- py-scripts/test_ipv4_variable_time.py | 7 +++++-- py-scripts/test_ipv6_connection.py | 2 +- py-scripts/test_ipv6_variable_time.py | 7 +++++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py index b27ece0e..bb8ababc 100755 --- a/py-scripts/test_ipv4_connection.py +++ b/py-scripts/test_ipv4_connection.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 import sys - +import os if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) import LANforge from LANforge.lfcli_base import LFCliBase from LANforge import LFUtils diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py index 2eef7b83..fde18943 100755 --- a/py-scripts/test_ipv4_l4.py +++ b/py-scripts/test_ipv4_l4.py @@ -102,7 +102,9 @@ class IPV4L4(LFCliBase): old_rx_values = self.__get_values() end_time = self.local_realm.parse_time(self.test_duration) + cur_time self.station_profile.admin_up(1) - self.local_realm.wait_for_ip() + temp_stas = self.sta_list.copy() + temp_stas.append("eth1") + self.local_realm.wait_for_ip(self.resource, temp_stas) self.cx_profile.start_cx() passes = 0 expected_passes = 0 diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index 2d9f06c1..7968c7bb 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 import sys - +import os if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) import argparse from LANforge.lfcli_base import LFCliBase @@ -100,7 +100,9 @@ class IPV4L4(LFCliBase): passes = 0 expected_passes = 0 self.station_profile.admin_up(1) - self.local_realm.wait_for_ip() + temp_stas = self.sta_list.copy() + temp_stas.append("eth1") + self.local_realm.wait_for_ip(self.resource, temp_stas) self.cx_profile.start_cx() for test in range(self.num_tests): expected_passes += 1 diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py index f3c6b1d9..ab75578e 100755 --- a/py-scripts/test_ipv4_variable_time.py +++ b/py-scripts/test_ipv4_variable_time.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import sys +import os if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) import argparse from LANforge.lfcli_base import LFCliBase @@ -87,7 +88,9 @@ class IPV4VariableTime(LFCliBase): def start(self, print_pass=False, print_fail=False): self.station_profile.admin_up(self.resource) - self.local_realm.wait_for_ip() + temp_stas = self.sta_list.copy() + temp_stas.append("eth1") + self.local_realm.wait_for_ip(self.resource, temp_stas) cur_time = datetime.datetime.now() old_cx_rx_values = self.__get_rx_values() end_time = self.local_realm.parse_time(self.test_duration) + cur_time diff --git a/py-scripts/test_ipv6_connection.py b/py-scripts/test_ipv6_connection.py index 53db8dff..d904938f 100755 --- a/py-scripts/test_ipv6_connection.py +++ b/py-scripts/test_ipv6_connection.py @@ -7,7 +7,7 @@ if sys.version_info[0] != 3: exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) import LANforge from LANforge.lfcli_base import LFCliBase from LANforge import LFUtils diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py index 049ee513..e5759ab7 100755 --- a/py-scripts/test_ipv6_variable_time.py +++ b/py-scripts/test_ipv6_variable_time.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 import sys +import os if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) import argparse from LANforge.lfcli_base import LFCliBase @@ -89,7 +90,9 @@ class IPV6VariableTime(LFCliBase): def start(self, print_pass=False, print_fail=False): print("Starting test") self.station_profile.admin_up(self.resource) - self.local_realm.wait_for_ip(ipv6=True) + temp_stas = self.sta_list.copy() + temp_stas.append("eth1") + self.local_realm.wait_for_ip(self.resource, temp_stas, ipv6=True) cur_time = datetime.datetime.now() old_cx_rx_values = self.__get_rx_values() end_time = self.local_realm.parse_time(self.test_duration) + cur_time