Remove use of deprecated config options for volume API selection

Tempest has moved the Volume APIs testing to v3 as default and can be run
under v2 API via catalog_type.
- https://review.opendev.org/#/q/topic:volume-default-testing-v3+(status:open+OR+status:merged)

Below config options were deprecated since Rocky and now Tempest is going
to remove those (Needed-By patch):
    * ``CONF.volume-feature-enabled.api_v2``
    * ``CONF.volume-feature-enabled.api_v3``

Change-Id: Ib35bc0c4f9581857aba2fca4a17dc24e7424e8bd
Needed-By: https://review.opendev.org/#/c/698754/
This commit is contained in:
Ghanshyam Mann 2019-12-12 17:01:09 +00:00
parent 27cb0c96b9
commit 6175bf8f7c
1 changed files with 1 additions and 10 deletions

View File

@ -32,20 +32,11 @@ class TestCinderVolumes(base.BaseApplicationCatalogScenarioTest):
if not CONF.service_available.cinder:
msg = "Cinder is not available. Skipping volumes tests"
raise cls.skipException(msg)
if (not CONF.volume_feature_enabled.api_v3 and
not CONF.volume_feature_enabled.api_v2):
msg = ("Neither cinder v2 nor v3 are available. Skipping"
"volumes tests")
raise cls.skipException(msg)
@classmethod
def setup_clients(cls):
super(TestCinderVolumes, cls).setup_clients()
# Prefer volume v3 which is the current version
if CONF.volume_feature_enabled.api_v3:
_volume = cls.services_manager.volume_v3
elif CONF.volume_feature_enabled.api_v2:
_volume = cls.services_manager.volume_v2
_volume = cls.services_manager.volume_v3
cls.volumes_client = _volume.VolumesClient()
cls.backups_client = _volume.BackupsClient()
cls.snapshots_client = _volume.SnapshotsClient()