openstack/python-openstackclient
Code Issues Proposed changes

Add check for cinderclient.v2 support

Browse Source 
Block Storage API v2 support is being removed from the cinderclient
during the Xena development cycle [0], so add a check to determine
whether the available cinderclient has v2 support.

[0] https://wiki.openstack.org/wiki/CinderXenaPTGSummary#Removing_the_Block_Storage_API_v2

Change-Id: Id54da1704d94526071f500c36a6e38d6d84aa7b8
This commit is contained in:
Brian Rosmaita
2021-05-20 09:18:26 -04:00
parent 6bdf030953
commit b019a56187
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/volume/client.py
View File

@@ -42,11 +42,15 @@ def make_client(instance):
from cinderclient.v3 import volume_snapshots from cinderclient.v3 import volume_snapshots
from cinderclient.v3 import volumes from cinderclient.v3 import volumes
# Try a small import to check if cinderclient v1 is supported # Check whether the available cinderclient supports v1 or v2
try: try:
from cinderclient.v1 import services # noqa from cinderclient.v1 import services # noqa
except Exception: except Exception:
del API_VERSIONS['1'] del API_VERSIONS['1']
try:
from cinderclient.v2 import services # noqa
except Exception:
del API_VERSIONS['2']
version = instance._api_version[API_NAME] version = instance._api_version[API_NAME]
from cinderclient import api_versions from cinderclient import api_versions