Merge "Enhanced the test code to pick the correct k8s_master IP out o…

…f the list of k8s_master role mentioned in contrail_test_inputs.yaml" into R5.0

common/contrail_test_init.py

@@ -710,7 +710,12 @@ def parse_topo(self):
                 self.kube_manager_ips.append(host_data['host_ip'])
                 self.kube_manager_control_ips.append(service_ip)
             if 'k8s_master' in roles:
-                self.k8s_master_ip = host_data['host_ip'] #K8s Currently only supports 1 master
+                with hide('everything'):
+                    with settings(
+                        host_string='%s@%s' % (username, host_data['host_ip']),
+                        password=password, warn_only=True, abort_on_prompts=False):
+                        if exists('/etc/kubernetes/admin.conf'):
+                            self.k8s_master_ip = host_data['host_ip'] #K8s Currently only supports 1 master
             if 'k8s_node' in roles:
                 self.k8s_slave_ips.append(host_data['host_ip'])
             host_data['data-ip'] = host_data['host_data_ip'] = host_data_ip

serial_scripts/k8s_scripts/test_ingress.py

@@ -256,7 +256,8 @@ def test_ingress_fanout_with_vrouter_agent_restart(self):
         for compute_ip in self.inputs.compute_ips:
             self.inputs.restart_service('contrail-vrouter-agent',[compute_ip],
                                          container='agent')
-        cluster_status, error_nodes = ContrailStatusChecker(self.inputs).wait_till_contrail_cluster_stable()
+        cluster_status, error_nodes = ContrailStatusChecker(self.inputs).wait_till_contrail_cluster_stable(
+                                                            nodes=self.inputs.compute_ips, roles="vrouter")
         assert cluster_status, 'Cluster is not stable after restart'
         assert self.validate_nginx_lb([pod1, pod2], ingress.cluster_ip,
                                       test_pod=pod5, path=path1, host=host1)