Corredted the Control Data IP selection for k8s snat and fabric forwa…

…rding scripts Change-Id: I9993a55186b6ea3ccca5dc199c03a856f01064a3 Closes-bug: #1773758
Juniper · Jun 6, 2018 · afc5534 · afc5534
1 parent c2e50e3
commit afc5534
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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):