Merge "osc-lib: shell"

Author: Jenkins

openstackclient/common/clientmanager.py

@@ -86,7 +86,7 @@ def get_plugin_modules(group):
 
         # Add the plugin to the ClientManager
         setattr(
-            ClientManager,
+            clientmanager.ClientManager,
             module.API_NAME,
             clientmanager.ClientCache(
                 getattr(sys.modules[ep.module_name], 'make_client', None)

openstackclient/compute/client.py

@@ -64,15 +64,15 @@ def make_client(instance):
                   if ext.name == "list_extensions"]
 
     # 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)
 
     client = nova_client.Client(
         version,
         session=instance.session,
         extensions=extensions,
         http_log_debug=http_log_debug,
         timings=instance.timing,
-        region_name=instance._region_name,
+        region_name=instance.region_name,
         **kwargs
     )
 

openstackclient/identity/client.py

@@ -16,7 +16,6 @@
 import logging
 
 from keystoneclient.v2_0 import client as identity_client_v2
-from osc_lib.api import auth
 from osc_lib import utils
 
 from openstackclient.i18n import _
@@ -50,11 +49,11 @@ def make_client(instance):
     LOG.debug('Instantiating identity client: %s', identity_client)
 
     # Remember interface only if interface is set
-    kwargs = utils.build_kwargs_dict('interface', instance._interface)
+    kwargs = utils.build_kwargs_dict('interface', instance.interface)
 
     client = identity_client(
         session=instance.session,
-        region_name=instance._region_name,
+        region_name=instance.region_name,
         **kwargs
     )
 
@@ -70,7 +69,7 @@ def build_option_parser(parser):
         help=_('Identity API version, default=%s '
                '(Env: OS_IDENTITY_API_VERSION)') % DEFAULT_API_VERSION,
     )
-    return auth.build_auth_plugins_option_parser(parser)
+    return parser
 
 
 class IdentityClientv2(identity_client_v2.Client):

openstackclient/image/client.py

@@ -47,15 +47,15 @@ def make_client(instance):
 
     endpoint = instance.get_endpoint_for_service_type(
         API_NAME,
-        region_name=instance._region_name,
-        interface=instance._interface,
+        region_name=instance.region_name,
+        interface=instance.interface,
     )
 
     client = image_client(
         endpoint,
         token=instance.auth.get_token(instance.session),
-        cacert=instance._cacert,
-        insecure=instance._insecure,
+        cacert=instance.cacert,
+        insecure=not instance.verify,
     )
 
     # Create the low-level API
@@ -70,8 +70,8 @@ def make_client(instance):
         session=instance.session,
         endpoint=instance.get_endpoint_for_service_type(
             IMAGE_API_TYPE,
-            region_name=instance._region_name,
-            interface=instance._interface,
+            region_name=instance.region_name,
+            interface=instance.interface,
         )
     )
 

openstackclient/network/client.py

@@ -34,9 +34,9 @@
 def make_client(instance):
     """Returns a network proxy"""
     prof = profile.Profile()
-    prof.set_region(API_NAME, instance._region_name)
+    prof.set_region(API_NAME, instance.region_name)
     prof.set_version(API_NAME, instance._api_version[API_NAME])
-    prof.set_interface(API_NAME, instance._interface)
+    prof.set_interface(API_NAME, instance.interface)
     conn = connection.Connection(authenticator=instance.session.auth,
                                  verify=instance.session.verify,
                                  cert=instance.session.cert,

openstackclient/object/client.py

@@ -32,8 +32,8 @@ def make_client(instance):
 
     endpoint = instance.get_endpoint_for_service_type(
         'object-store',
-        region_name=instance._region_name,
-        interface=instance._interface,
+        region_name=instance.region_name,
+        interface=instance.interface,
     )
 
     client = object_store_v1.APIv1(