Merge "Remove volume v1 API service client usage"

This commit is contained in:
Zuul 2018-06-14 07:10:36 +00:00 committed by Gerrit Code Review
commit b95ec9c2c4
1 changed files with 4 additions and 6 deletions

View File

@ -81,12 +81,10 @@ class ScenarioTest(tempest.test.BaseTestCase):
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
#