commit 0fa65bfd86e0826ffb124974c5a884e213fbeb56
author Tatyanka Leontovich <tleontovich@mirantis.com> Sat Dec 29 23:22:14 2018 +0000
committer Gerrit Code Review <support@gerrithub.io> Sat Dec 29 23:22:14 2018 +0000
tree 707e658b66cff090748efd637ef78581d2dcf518
parent 57c4320ce66aad3b995750151b70b1513edec912
parent bfbc483ed4441e067d1120b8e7eb5f34adea8275

Merge "Add OC with queens and ocata"

tcp_tests/managers/k8smanager.py

diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 3ae1a1b..2aea092 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -300,6 +300,15 @@
             timeout_msg="Timeout for CNCF reached."
         )
 
+    def determine_conformance_node(self, target):
+        masters_fqdn = self._salt.get_pillar(
+            tgt='I@kubernetes:master', pillar='linux:network:fqdn')
+        node_names = [v for pillar in masters_fqdn for
+                      k, v in pillar.items()]
+        return [node_name for node_name
+                in node_names
+                if node_name.startswith(target)][0]
+
     def start_conformance_inside_pod(self, cnf_type='k8s', timeout=60 * 60):
         """
         Create conformance pod and wait for results
@@ -323,8 +332,8 @@
 
         pod = cnf_pod.read()
         target = "{}.".format(pod.spec.node_name)
-        self.conformance_node = self.__underlay.get_target_node_names(
-            target)[0]
+
+        self.conformance_node = self.determine_conformance_node(target)
 
         def cnf_status():
             pod = cnf_pod.read()

tcp_tests/tests/system/test_k8s_actions.py

diff --git a/tcp_tests/tests/system/test_k8s_actions.py b/tcp_tests/tests/system/test_k8s_actions.py
index 6467a8a..d12fffc 100644
--- a/tcp_tests/tests/system/test_k8s_actions.py
+++ b/tcp_tests/tests/system/test_k8s_actions.py
@@ -122,7 +122,7 @@
         assert sample.is_service_available()
 
         show_step(6)
-        k8s_deployed.run_conformance(log_out="k8s_conformance.log")
+        k8s_deployed.start_conformance_inside_pod()
 
         show_step(7)
         chain_versions = config.k8s.k8s_update_chain.split(" ")
@@ -134,8 +134,7 @@
             assert sample.is_service_available()
 
             LOG.info("Running conformance on {} version".format(version))
-            log_name = "k8s_conformance_{}.log".format(version)
-            k8s_deployed.run_conformance(log_out=log_name, raise_on_err=False)
+            k8s_deployed.start_conformance_inside_pod()
 
         assert sample.is_service_available()
 
@@ -186,7 +185,7 @@
             assert sample.is_service_available(external=True)
 
         show_step(6)
-        k8s_deployed.run_conformance()
+        k8s_deployed.start_conformance_inside_pod()
 
         show_step(7)
         for sample in samples:
@@ -305,7 +304,7 @@
         check_pods_availability()
 
         show_step(12)
-        k8s_deployed.run_conformance()
+        k8s_deployed.start_conformance_inside_pod()
 
         show_step(13)
         check_pods_availability()