openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Support X.latest format for OS_COMPUTE_API_VERSION"

This commit is contained in:
Jenkins 2016-05-16 22:57:28 +00:00 committed by Gerrit Code Review
parent 3d12ae8e03 a5a343a5a8
commit 948c76b0a4
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
openstackclient/compute/client.py
View File

@ -41,8 +41,18 @@ def make_client(instance):
version = _compute_api_version version = _compute_api_version
else: else:
version = instance._api_version[API_NAME] version = instance._api_version[API_NAME]
from novaclient import api_versions
# convert to APIVersion object
version = api_versions.get_api_version(version)
LOG.debug('Instantiating compute client for V%s', version) if version.is_latest():
import novaclient
# NOTE(RuiChen): executing version discovery make sense, but that need
# an initialized REST client, it's not available now,
# fallback to use the max version of novaclient side.
version = novaclient.API_MAX_VERSION
LOG.debug('Instantiating compute client for %s', version)
# Set client http_log_debug to True if verbosity level is high enough # Set client http_log_debug to True if verbosity level is high enough
http_log_debug = utils.get_effective_log_level() <= logging.DEBUG http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
@ -91,30 +101,27 @@ def check_api_version(check_version):
""" """
# Defer client imports until we actually need them # Defer client imports until we actually need them
try:
from novaclient import api_versions
except ImportError:
# Retain previous behaviour
return False
import novaclient import novaclient
from novaclient import api_versions
global _compute_api_version global _compute_api_version
# Copy some logic from novaclient 2.27.0 for basic version detection # Copy some logic from novaclient 3.3.0 for basic version detection
# NOTE(dtroyer): This is only enough to resume operations using API # NOTE(dtroyer): This is only enough to resume operations using API
# version 2.0 or any valid version supplied by the user. # version 2.0 or any valid version supplied by the user.
_compute_api_version = api_versions.get_api_version(check_version) _compute_api_version = api_versions.get_api_version(check_version)
if _compute_api_version > api_versions.APIVersion("2.0"): # Bypass X.latest format microversion
if not _compute_api_version.matches( if not _compute_api_version.is_latest():
novaclient.API_MIN_VERSION, if _compute_api_version > api_versions.APIVersion("2.0"):
novaclient.API_MAX_VERSION, if not _compute_api_version.matches(
): novaclient.API_MIN_VERSION,
raise exceptions.CommandError( novaclient.API_MAX_VERSION,
"versions supported by client: %s - %s" % ( ):
novaclient.API_MIN_VERSION.get_string(), raise exceptions.CommandError(
novaclient.API_MAX_VERSION.get_string(), "versions supported by client: %s - %s" % (
), novaclient.API_MIN_VERSION.get_string(),
) novaclient.API_MAX_VERSION.get_string(),
),
)
return True return True

6
releasenotes/notes/bug-1561838-3a006a8263d7536d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- Support X.latest format for OS_COMPUTE_API_VERSION in order to talk with
the latest nova microversion API, that is very helpful shortcut usage to
use new nova side features.
[Bug `1561838 <https://bugs.launchpad.net/python-openstackclient/+bug/1561838>`_]