commit fa1774ad98cbfc89db6294f079c2fae4903d6dae
author Dennis Dmitriev <ddmitriev@mirantis.com> Tue May 28 15:27:44 2019 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Wed May 29 12:34:35 2019 +0300
tree 72efd59774ebf20df5816f1867925c83efe99c8e
parent 876bbf5ba122d9a2ac5dbf22341cea8f245d2217

Do not use fixture salt_deployed where it is not needed

Closes-Bug: #PROD-30630
Change-Id: Ib6126a4589f861a1ca8aa0f69691c3862daf81fe

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 c93e152..c6d61dd 100644
--- a/tcp_tests/tests/system/test_k8s_actions.py
+++ b/tcp_tests/tests/system/test_k8s_actions.py
@@ -203,7 +203,7 @@
     @pytest.mark.k8s_genie
     @pytest.mark.k8s_system
     def test_k8s_genie_flannel(self, show_step, config,
-                               salt_deployed, k8s_deployed):
+                               salt_actions, k8s_deployed):
         """Test genie-cni+flannel cni setup
 
         Scenario:
@@ -228,15 +228,15 @@
         # Find out calico and flannel networks
         tgt_k8s_control = "I@kubernetes:master"
 
-        flannel_pillar = salt_deployed.get_pillar(
+        flannel_pillar = salt_actions.get_pillar(
             tgt=tgt_k8s_control,
             pillar="kubernetes:master:network:flannel:private_ip_range")[0]
         flannel_network = netaddr.IPNetwork(flannel_pillar.values()[0])
         LOG.info("Flannel network: {}".format(flannel_network))
 
-        calico_network_pillar = salt_deployed.get_pillar(
+        calico_network_pillar = salt_actions.get_pillar(
             tgt=tgt_k8s_control, pillar="_param:calico_private_network")[0]
-        calico_netmask_pillar = salt_deployed.get_pillar(
+        calico_netmask_pillar = salt_actions.get_pillar(
             tgt=tgt_k8s_control, pillar="_param:calico_private_netmask")[0]
         calico_network = netaddr.IPNetwork(
             "{0}/{1}".format(calico_network_pillar.values()[0],
@@ -322,8 +322,7 @@
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_dashboard
     @pytest.mark.k8s_system
-    def test_k8s_dashboard(self, show_step, config,
-                           salt_deployed, k8s_deployed):
+    def test_k8s_dashboard(self, show_step, config, k8s_deployed):
         """Test dashboard setup
 
         Scenario:
@@ -399,8 +398,7 @@
     @pytest.mark.fail_snapshot
     @pytest.mark.k8s_ingress_nginx
     @pytest.mark.k8s_system
-    def test_k8s_ingress_nginx(self, show_step, config,
-                               salt_deployed, k8s_deployed):
+    def test_k8s_ingress_nginx(self, show_step, config, k8s_deployed):
         """Test ingress-nginx configured and working with metallb
 
         Scenario:
@@ -471,7 +469,7 @@
     @pytest.mark.grab_versions
     @pytest.mark.fail_snapshot
     def test_k8s_cicd_upgrade(self, show_step, config,
-                              salt_deployed, k8s_deployed):
+                              salt_actions, k8s_deployed):
         """Test k8s upgrade cicd pipeline
 
         Scenario:
@@ -480,10 +478,10 @@
             3. Wait for job to end
         """
         show_step(1)
-        jenkins_info = salt_deployed.get_pillar(
+        jenkins_info = salt_actions.get_pillar(
             tgt='cid*1*', pillar="jenkins:client:master")[0].values()[0]
 
-        salt_api = salt_deployed.get_pillar(
+        salt_api = salt_actions.get_pillar(
             tgt='cid*1*', pillar="_param:jenkins_salt_api_url")[0].values()[0]
 
         show_step(2)