commit 0c37382c0ab0e4ffc7239762089b0a9426d0f81f
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue Oct 30 17:55:50 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue Oct 30 18:00:59 2018 +0400
tree 5372d1dc1469a4f9025b53615bd427fd631fd6c8
parent 9d80f9cbde031e18dddf8db5406c60c61305d1b2

Always get first node in calico tests and fix target

Change-Id: Icfd072eddd1d807b7b2ed7bf7f47d768480b4b7d
Related-PROD: PROD-24473
Related-PROD: PROD-24472

tcp_tests/tests/system/test_calico.py

diff --git a/tcp_tests/tests/system/test_calico.py b/tcp_tests/tests/system/test_calico.py
index ca5c116..6399eb3 100644
--- a/tcp_tests/tests/system/test_calico.py
+++ b/tcp_tests/tests/system/test_calico.py
@@ -107,9 +107,7 @@
         assert len(first_node_ips) > 0, "Couldn't find first k8s node IP!"
         first_node_names = [name for name in underlay.node_names()
                             if name.startswith(first_node.name)]
-        assert len(first_node_names) == 1, "Couldn't find first k8s node " \
-                                           "hostname in SSH config!"
-        first_node_name = first_node_names.pop()
+        first_node_name = first_node_names[0]
 
         target_pod_ip = None
 

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 2fddde6..be234d1 100644
--- a/tcp_tests/tests/system/test_k8s_actions.py
+++ b/tcp_tests/tests/system/test_k8s_actions.py
@@ -222,7 +222,7 @@
         show_step(1)
 
         # Find out calico and flannel networks
-        tgt_k8s_control = "I@kubernetes:control:enabled:True"
+        tgt_k8s_control = "I@kubernetes:master"
 
         flannel_pillar = salt_deployed.get_pillar(
             tgt=tgt_k8s_control,