commit 10e2db4420d74db51259f55cc5b98482b53b116b
author Hanna Arhipova <harhipova@mirantis.com> Thu May 02 13:17:00 2019 +0300
committer harhipova <harhipova@mirantis.com> Thu May 02 10:22:52 2019 +0000
tree 7c57e09349b6ca8135af8208018078da40324595
parent 1db3888a0df328e8c41f3f465c9ed28bb1f95763

Run opencontrain tests for OpenStack-type deployment only

Change-Id: I2b36bf33c4d3fde3fac37d669a4a2e8e449d4caf
Fix-Prod: #PROD-27782(PROD:27782

test_set/cvp-sanity/tests/test_contrail.py

diff --git a/test_set/cvp-sanity/tests/test_contrail.py b/test_set/cvp-sanity/tests/test_contrail.py
index 035c3b3..b7870a3 100644
--- a/test_set/cvp-sanity/tests/test_contrail.py
+++ b/test_set/cvp-sanity/tests/test_contrail.py
@@ -13,7 +13,7 @@
         expr_form='pillar'
     )
 
-def test_contrail_compute_status(local_salt_client):
+def test_contrail_compute_status(local_salt_client, check_openstack):
     cs = get_contrail_status(local_salt_client, 'nova:compute',
                              STATUS_COMMAND, STATUS_FILTER)
     broken_services = []
@@ -37,7 +37,7 @@
                                                              indent=4))
 
 
-def test_contrail_node_status(local_salt_client):
+def test_contrail_node_status(local_salt_client, check_openstack):
     command = STATUS_COMMAND
 
     # TODO: what will be in OpenContrail 5?
@@ -67,7 +67,7 @@
                                                              indent=4))
 
 
-def test_contrail_vrouter_count(local_salt_client):
+def test_contrail_vrouter_count(local_salt_client, check_openstack):
     cs = get_contrail_status(local_salt_client, 'nova:compute',
                              STATUS_COMMAND, STATUS_FILTER)
 
@@ -87,7 +87,7 @@
                                                       len(cs.keys()))
 
 
-def test_public_ui_contrail(local_salt_client, ctl_nodes_pillar):
+def test_public_ui_contrail(local_salt_client, ctl_nodes_pillar, check_openstack):
     IP = local_salt_client.pillar_get(param='_param:cluster_public_host')
     protocol = 'https'
     port = '8143'