osc-lib: shell

Convert to using ClientManager and OpenStackShell from osc-lib.
* Change all internal uses of ClientManager private attributes that are
  now public in osc-lib's ClientManager.  Leave back-compat copies in
  place in OSC's clientManager so we don't break plugins.
* Put some work-arounds in place for changes in osc-lib that we need until
  a new release makes it through the g-r and u-c change process.
* Add a test for Unicode decoding of argv in shell.main() to parallel
  the one in osc-lib.

Change-Id: I85289740d4ca081f2aca8c9b40ec422ad25d302c

1 files changed, 3 insertions, 4 deletions

diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py
index 0c609313..0292aac2 100644
--- a/openstackclient/identity/client.py
+++ b/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):