From c6f0088846518858c41d85e09e746ab32d3cc478 Mon Sep 17 00:00:00 2001 From: Logan Lipke Date: Fri, 13 Nov 2020 17:06:01 -0800 Subject: [PATCH] Removed reliance on upstream port having ip --- py-scripts/test_ipv4_l4.py | 2 +- py-scripts/test_ipv4_l4_ftp_upload.py | 2 +- py-scripts/test_ipv4_l4_ftp_urls_per_ten.py | 2 +- py-scripts/test_ipv4_l4_urls_per_ten.py | 2 +- py-scripts/test_ipv4_variable_time.py | 2 +- py-scripts/test_ipv6_variable_time.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py index 12f032ae..8c177a31 100755 --- a/py-scripts/test_ipv4_l4.py +++ b/py-scripts/test_ipv4_l4.py @@ -99,7 +99,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]) + # temp_stas.append(self.local_realm.name_to_eid(self.upstream_port)[2]) self.station_profile.admin_up() if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) diff --git a/py-scripts/test_ipv4_l4_ftp_upload.py b/py-scripts/test_ipv4_l4_ftp_upload.py index 2b126f66..21f31619 100755 --- a/py-scripts/test_ipv4_l4_ftp_upload.py +++ b/py-scripts/test_ipv4_l4_ftp_upload.py @@ -102,7 +102,7 @@ class IPV4L4(LFCliBase): 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() self.station_profile.admin_up() - temp_stas.append(self.local_realm.name_to_eid(self.upstream_port)[2]) + # temp_stas.append(self.local_realm.name_to_eid(self.upstream_port)[2]) if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) else: 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 c2ea5368..d4fce559 100755 --- a/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_ftp_urls_per_ten.py @@ -85,7 +85,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]) + # 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 diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py index a1dab812..06cfea2f 100755 --- a/py-scripts/test_ipv4_l4_urls_per_ten.py +++ b/py-scripts/test_ipv4_l4_urls_per_ten.py @@ -82,7 +82,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]) + # 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 diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py index 2a2515ea..018603fa 100755 --- a/py-scripts/test_ipv4_variable_time.py +++ b/py-scripts/test_ipv4_variable_time.py @@ -95,7 +95,7 @@ class IPV4VariableTime(LFCliBase): def start(self, print_pass=False, print_fail=False): self.station_profile.admin_up() temp_stas = self.station_profile.station_names.copy() - temp_stas.append(self.upstream) + # temp_stas.append(self.upstream) if self.local_realm.wait_for_ip(temp_stas): self._pass("All stations got IPs", print_pass) else: diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py index 382e0175..2c3b51fc 100755 --- a/py-scripts/test_ipv6_variable_time.py +++ b/py-scripts/test_ipv6_variable_time.py @@ -94,7 +94,7 @@ class IPV6VariableTime(LFCliBase): def start(self, print_pass=False, print_fail=False): self.station_profile.admin_up() temp_stas = self.station_profile.station_names.copy() - temp_stas.append(self.upstream) + # 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: