commit 5acc82aaef58fe960dfaa5b39d5557ce45117679
author Tatyana Leontovich <tleontovich@mirantis.com> Tue May 23 15:41:35 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Wed May 24 05:02:24 2017 -0400
tree 3a1772211ce97e1d74b8cc916b37924c79f23468
parent 700a7b04b7e12335dda6ec1fd9bce0c90c4b3865

Add SL into k8s deploy

Change-Id: I40e8fa92e546bd4e964f9e86b595fe4b8dfdba92
Reviewed-on: https://review.gerrithub.io/362185
Reviewed-by: <vrovachev@mirantis.com>
Reviewed-by: Sergii Golovatiuk <holser@gmail.com>
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/tests/system/conftest.py

diff --git a/tcp_tests/tests/system/conftest.py b/tcp_tests/tests/system/conftest.py
index 90f0fd4..93aae01 100644
--- a/tcp_tests/tests/system/conftest.py
+++ b/tcp_tests/tests/system/conftest.py
@@ -21,6 +21,7 @@
 from tcp_tests.fixtures.common_services_fixtures import *
 from tcp_tests.fixtures.openstack_fixtures import *
 from tcp_tests.fixtures.opencontrail_fixtures import *
+from tcp_tests.fixtures.stacklight_fixtures import *
 
 __all__ = sorted([  # sort for documentation
     # common_fixtures
@@ -45,4 +46,7 @@
     'openstack_deployed',
     # component fixtures
     'opencontrail',
+    # stacklight_fixtures
+    'sl_actions',
+    'sl_deployed',
 ])

tcp_tests/tests/system/test_install_k8s.py

diff --git a/tcp_tests/tests/system/test_install_k8s.py b/tcp_tests/tests/system/test_install_k8s.py
index e2e90a8..9fc4b0d 100644
--- a/tcp_tests/tests/system/test_install_k8s.py
+++ b/tcp_tests/tests/system/test_install_k8s.py
@@ -36,7 +36,7 @@
 
     # @pytest.mark.snapshot_needed
     # @pytest.mark.fail_snapshot
-    def test_k8s_install(self, underlay, openstack_deployed,
+    def test_k8s_install(self, underlay, sl_deployed, openstack_deployed,
                                      show_step):
         """Test for deploying an mcp environment and check it
 
@@ -44,6 +44,7 @@
             1. Prepare salt on hosts
             2. Setup controller nodes
             3. Setup compute nodes
+            4. Setup stack light nodes
 
         """
         LOG.info("*************** DONE **************")