Fix incorrect counting of backends
Split tests for cinder services into two tests
Change-Id: I74137b4cc31a82718fc2a17f5abfd117aacf9963
Fix-Issue:#PROD-29913(PROD:29913)
diff --git a/test_set/cvp-sanity/fixtures/base.py b/test_set/cvp-sanity/fixtures/base.py
index 4858c83..8e3b130 100644
--- a/test_set/cvp-sanity/fixtures/base.py
+++ b/test_set/cvp-sanity/fixtures/base.py
@@ -80,6 +80,14 @@
are not found on this environment.")
+@pytest.fixture(scope='session')
+def check_cinder_backends(local_salt_client):
+ backends_cinder_available = local_salt_client.test_ping(tgt='cinder:controller')
+ if not backends_cinder_available or not any(backends_cinder_available.values()):
+ pytest.skip("Cinder service or cinder:controller:backend pillar \
+ are not found on this environment.")
+
+
def pytest_namespace():
return {'contrail': None}