openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use discover_extensions for novaclient"

Browse Source
This commit is contained in:
Jenkins 2015-09-23 18:18:02 +00:00 committed by Gerrit Code Review
commit 29aad2a9b5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstackclient/compute/client.py
View File

@ -34,13 +34,8 @@ _compute_api_version = None
def make_client(instance): def make_client(instance):
"""Returns a compute service client.""" """Returns a compute service client."""
# Defer client imports until we actually need them # Defer client import until we actually need them
from novaclient import client as nova_client from novaclient import client as nova_client
from novaclient import extension
try:
from novaclient.v2.contrib import list_extensions
except ImportError:
from novaclient.v1_1.contrib import list_extensions
if _compute_api_version is not None: if _compute_api_version is not None:
version = _compute_api_version version = _compute_api_version
@ -52,7 +47,8 @@ def make_client(instance):
# 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
extensions = [extension.Extension('list_extensions', list_extensions)] extensions = [ext for ext in nova_client.discover_extensions(version)
if ext.name == "list_extensions"]
# 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)