commit b95ec9c2c4fa150b270ea78d61feaa40d7600fdb
author Zuul <zuul@review.openstack.org> Thu Jun 14 07:10:36 2018 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jun 14 07:10:36 2018 +0000
tree 0f6567470fe257818b7085014775e769349d8208
parent fff8131f3904c178289e00553f06018d4b1cebe3
parent 9e80f079df24ba3c06909232d3ee455a6ed2b0e2

Merge "Remove volume v1 API service client usage"

ironic_tempest_plugin/manager.py

diff --git a/ironic_tempest_plugin/manager.py b/ironic_tempest_plugin/manager.py
index 9967a5d..b529e3c 100644
--- a/ironic_tempest_plugin/manager.py
+++ b/ironic_tempest_plugin/manager.py
@@ -81,12 +81,10 @@
         cls.security_group_rules_client = (
             cls.os_primary.security_group_rules_client)
 
-        if CONF.volume_feature_enabled.api_v2:
-            cls.volumes_client = cls.os_primary.volumes_v2_client
-            cls.snapshots_client = cls.os_primary.snapshots_v2_client
-        else:
-            cls.volumes_client = cls.os_primary.volumes_client
-            cls.snapshots_client = cls.os_primary.snapshots_client
+        if (CONF.volume_feature_enabled.api_v2 or
+            CONF.volume_feature_enabled.api_v3):
+            cls.volumes_client = cls.os_primary.volumes_client_latest
+            cls.snapshots_client = cls.os_primary.snapshots_client_latest
 
     # ## Test functions library
     #