openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use novaclient.client.Client for initialization Nova client"

Browse Source
This commit is contained in:
Jenkins 2015-09-10 05:19:23 +00:00 committed by Gerrit Code Review
commit a591ab34c7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstackclient/compute/client.py
View File

@ -42,10 +42,12 @@ def make_client(instance):
except ImportError: except ImportError:
from novaclient.v1_1.contrib import list_extensions from novaclient.v1_1.contrib import list_extensions
compute_client = nova_client.get_client_class( if _compute_api_version is not None:
instance._api_version[API_NAME], version = _compute_api_version
) else:
LOG.debug('Instantiating compute client: %s', compute_client) version = instance._api_version[API_NAME]
LOG.debug('Instantiating compute client for V%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
@ -55,10 +57,8 @@ def make_client(instance):
# Remember interface only if it is set # Remember interface only if it is set
kwargs = utils.build_kwargs_dict('endpoint_type', instance._interface) kwargs = utils.build_kwargs_dict('endpoint_type', instance._interface)
if _compute_api_version is not None: client = nova_client.Client(
kwargs.update({'api_version': _compute_api_version}) version,
client = compute_client(
session=instance.session, session=instance.session,
extensions=extensions, extensions=extensions,
http_log_debug=http_log_debug, http_log_debug=http_log_debug,