commit c3f76beb1f76b5c5936e2de8f3b2366af8f2ce27
author Jordan Pittier <jordan.pittier@scality.com> Tue Oct 11 17:06:21 2016 +0200
committer Jordan Pittier <jordan.pittier@scality.com> Wed Oct 12 18:44:51 2016 +0200
tree a1146d3e6a88004832f72afe59ae85ffe57d3861
parent 0a972c6ce87d145b4c4841407021b94a1bdda229

Use Cinder v2 by default in scenario tests

If both v1 and v2 are enabled, we should default to v2.

Change-Id: I9477768ab3d6535060864bfe57887e86a9d97ce2

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 4baf420..283fba5 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -80,12 +80,12 @@
         cls.security_group_rules_client = (
             cls.manager.security_group_rules_client)
 
-        if CONF.volume_feature_enabled.api_v1:
-            cls.volumes_client = cls.manager.volumes_client
-            cls.snapshots_client = cls.manager.snapshots_client
-        else:
+        if CONF.volume_feature_enabled.api_v2:
             cls.volumes_client = cls.manager.volumes_v2_client
             cls.snapshots_client = cls.manager.snapshots_v2_client
+        else:
+            cls.volumes_client = cls.manager.volumes_client
+            cls.snapshots_client = cls.manager.snapshots_client
 
     # ## Test functions library
     #
@@ -1352,14 +1352,14 @@
     @classmethod
     def setup_clients(cls):
         super(EncryptionScenarioTest, cls).setup_clients()
-        if CONF.volume_feature_enabled.api_v1:
-            cls.admin_volume_types_client = cls.os_adm.volume_types_client
-            cls.admin_encryption_types_client =\
-                cls.os_adm.encryption_types_client
-        else:
+        if CONF.volume_feature_enabled.api_v2:
             cls.admin_volume_types_client = cls.os_adm.volume_types_v2_client
             cls.admin_encryption_types_client =\
                 cls.os_adm.encryption_types_v2_client
+        else:
+            cls.admin_volume_types_client = cls.os_adm.volume_types_client
+            cls.admin_encryption_types_client =\
+                cls.os_adm.encryption_types_client
 
     def create_volume_type(self, client=None, name=None):
         if not client: