modified the scripts to get the control data ip as CONTROL_DATA_NET_LIST

is no longer used. Closes-bug: #1773758 Change-Id: I7d5ec48e311dd062d8b24499e158d6ef969a164a
Juniper · Jun 4, 2018 · e595e26 · e595e26
1 parent 3c12b63
commit e595e26
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/scripts/k8s_scripts/test_fabric_forwarding.py b/scripts/k8s_scripts/test_fabric_forwarding.py
@@ -8,10 +8,12 @@ class TestFabricFWD(BaseK8sTest):
     @classmethod
     def setUpClass(cls):
         super(TestFabricFWD, cls).setUpClass()
-        if cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip):
-            cls.ip_to_ping = cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip)
+        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.cfgm_ip
+            cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],
+                                                       service="CONTROLLER")
 
     @classmethod
     def tearDownClass(cls):

diff --git a/scripts/k8s_scripts/test_snat.py b/scripts/k8s_scripts/test_snat.py
@@ -8,10 +8,12 @@ class TestSNAT(BaseK8sTest):
     @classmethod
     def setUpClass(cls):
         super(TestSNAT, cls).setUpClass()
-        if cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip):
-            cls.ip_to_ping = cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip)
+        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.cfgm_ip
+            cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],
+                                                       service="CONTROLLER")
 
     @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,10 +8,12 @@ class TestFabricFWDRestarts(BaseK8sTest):
     @classmethod
     def setUpClass(cls):
         super(TestFabricFWDRestarts, cls).setUpClass()
-        if cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip):
-            cls.ip_to_ping = cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip)
+        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.cfgm_ip
+            cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],
+                                                       service="CONTROLLER")
 
     @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,10 +14,12 @@ class TestFabricSNATRestarts(BaseK8sTest):
     @classmethod
     def setUpClass(cls):
         super(TestFabricSNATRestarts, cls).setUpClass()
-        if cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip):
-            cls.ip_to_ping = cls.inputs.get_ctrl_data_ip(cls.inputs.cfgm_ip)
+        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.cfgm_ip
+            cls.ip_to_ping = cls.inputs.get_service_ip(cls.inputs.bgp_control_ips[0],
+                                                       service="CONTROLLER")
 
     @classmethod
     def tearDownClass(cls):