From afc5534dd17349f0ba46d6f940a778143da557b7 Mon Sep 17 00:00:00 2001 From: Pulkit Tandon Date: Wed, 6 Jun 2018 13:46:18 +0530 Subject: [PATCH] Corredted the Control Data IP selection for k8s snat and fabric forwarding scripts Change-Id: I9993a55186b6ea3ccca5dc199c03a856f01064a3 Closes-bug: #1773758 --- scripts/k8s_scripts/test_fabric_forwarding.py | 7 +------ scripts/k8s_scripts/test_snat.py | 7 +------ serial_scripts/k8s_scripts/test_fabric_forwarding.py | 7 +------ .../k8s_scripts/test_fabric_snat_restart_scenarios.py | 7 +------ 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/scripts/k8s_scripts/test_fabric_forwarding.py b/scripts/k8s_scripts/test_fabric_forwarding.py index e0a76db37..b5c556b8c 100644 --- a/scripts/k8s_scripts/test_fabric_forwarding.py +++ b/scripts/k8s_scripts/test_fabric_forwarding.py @@ -8,12 +8,7 @@ class TestFabricFWD(BaseK8sTest): @classmethod def setUpClass(cls): super(TestFabricFWD, cls).setUpClass() - if cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],service="CONTROL"): - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROL") - else: - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROLLER") + cls.ip_to_ping = cls.inputs.bgp_control_ips[0] @classmethod def tearDownClass(cls): diff --git a/scripts/k8s_scripts/test_snat.py b/scripts/k8s_scripts/test_snat.py index 95322ecc9..1905a8f75 100644 --- a/scripts/k8s_scripts/test_snat.py +++ b/scripts/k8s_scripts/test_snat.py @@ -8,12 +8,7 @@ class TestSNAT(BaseK8sTest): @classmethod def setUpClass(cls): super(TestSNAT, cls).setUpClass() - if cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],service="CONTROL"): - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROL") - else: - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROLLER") + cls.ip_to_ping = cls.inputs.bgp_control_ips[0] @classmethod def tearDownClass(cls): diff --git a/serial_scripts/k8s_scripts/test_fabric_forwarding.py b/serial_scripts/k8s_scripts/test_fabric_forwarding.py index 2b3bcfef9..6052fdaf9 100644 --- a/serial_scripts/k8s_scripts/test_fabric_forwarding.py +++ b/serial_scripts/k8s_scripts/test_fabric_forwarding.py @@ -8,12 +8,7 @@ class TestFabricFWDRestarts(BaseK8sTest): @classmethod def setUpClass(cls): super(TestFabricFWDRestarts, cls).setUpClass() - if cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],service="CONTROL"): - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROL") - else: - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROLLER") + cls.ip_to_ping = cls.inputs.bgp_control_ips[0] @classmethod def tearDownClass(cls): diff --git a/serial_scripts/k8s_scripts/test_fabric_snat_restart_scenarios.py b/serial_scripts/k8s_scripts/test_fabric_snat_restart_scenarios.py index 4b1cef8df..949717476 100644 --- a/serial_scripts/k8s_scripts/test_fabric_snat_restart_scenarios.py +++ b/serial_scripts/k8s_scripts/test_fabric_snat_restart_scenarios.py @@ -14,12 +14,7 @@ class TestFabricSNATRestarts(BaseK8sTest): @classmethod def setUpClass(cls): super(TestFabricSNATRestarts, cls).setUpClass() - if cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],service="CONTROL"): - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROL") - else: - cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0], - service="CONTROLLER") + cls.ip_to_ping = cls.inputs.bgp_control_ips[0] @classmethod def tearDownClass(cls):