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, 6 insertions, 6 deletions

diff --git a/openstackclient/image/client.py b/openstackclient/image/client.py
index 0ef694f4..1be6c765 100644
--- a/openstackclient/image/client.py
+++ b/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,
         )
     )