commit 947bb4ce1a583adfd063d6aaf0dbf199958a60c2
author Jenkins <jenkins@review.openstack.org> Wed Sep 30 05:17:20 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 30 05:17:20 2015 +0000
tree 836152d80084e3458d205783b099a9c8f4a6b776
parent e42bfe4ea8070f261906b089f522ff0ba5d96a61
parent bc678ad48ed3b389673262775c33ec89e4f2369c

Merge "Check cinder api version in compute tests"

tempest/common/compute.py

diff --git a/tempest/common/compute.py b/tempest/common/compute.py
index d107ec2..41b0529 100644
--- a/tempest/common/compute.py
+++ b/tempest/common/compute.py
@@ -89,11 +89,14 @@
 
     if volume_backed:
         volume_name = data_utils.rand_name('volume')
-        volume = clients.volumes_client.create_volume(
+        volumes_client = clients.volumes_v2_client
+        if CONF.volume_feature_enabled.api_v1:
+            volumes_client = clients.volumes_client
+        volume = volumes_client.create_volume(
             display_name=volume_name,
             imageRef=image_id)
-        clients.volumes_client.wait_for_volume_status(volume['volume']['id'],
-                                                      'available')
+        volumes_client.wait_for_volume_status(volume['volume']['id'],
+                                              'available')
 
         bd_map_v2 = [{
             'uuid': volume['volume']['id'],