From b8bf147bdcdd33f3ad276ca8815fd253ec9b24af Mon Sep 17 00:00:00 2001
From: ghanshyam <gmann@ghanshyammann.com>
Date: Thu, 7 Jun 2018 10:34:17 +0000
Subject: [PATCH] Remove volume v1 API service client usage

Volume v1 API has been gone since long and Tempest also
marked their deprecation since Juno
- https://review.openstack.org/#/c/446238/

Now Tempest is removing the deprecated config option and
alias for voluem v1 service client in
- https://review.openstack.org/#/c/573135/

Before the Tempest patch gets merged, we need to remove all usage
of volume v1 things.

Change-Id: I2d715a8a63069da5cfe02fbc0992eccb7ba598a7
Needed-By: https://review.openstack.org/#/c/573135/
---
 .../tests/scenario/barbican_manager.py                    | 8 ++------
 barbican_tempest_plugin/tests/scenario/manager.py         | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/barbican_tempest_plugin/tests/scenario/barbican_manager.py b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
index 8e5d7c4..339cfb1 100644
--- a/barbican_tempest_plugin/tests/scenario/barbican_manager.py
+++ b/barbican_tempest_plugin/tests/scenario/barbican_manager.py
@@ -81,12 +81,8 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
         )
 
         if CONF.compute_feature_enabled.attach_encrypted_volume:
-            if CONF.volume_feature_enabled.api_v1:
-                cls.admin_volume_types_client =\
-                    os_adm.volume_types_client
-                cls.admin_encryption_types_client =\
-                    os_adm.encryption_types_client
-            else:
+            if (CONF.volume_feature_enabled.api_v2 or
+               CONF.volume_feature_enabled.api_v3):
                 cls.admin_volume_types_client =\
                     os_adm.volume_types_v2_client
                 cls.admin_encryption_types_client =\
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index 391fe02..8be324a 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -75,10 +75,8 @@ class ScenarioTest(manager.NetworkScenarioTest):
         cls.security_group_rules_client = (
             cls.os_primary.security_group_rules_client)
 
-        if CONF.volume_feature_enabled.api_v1:
-            cls.volumes_client = cls.os_primary.volumes_client
-            cls.snapshots_client = cls.os_primary.snapshots_client
-        else:
+        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