Skip to content

Commit 6a15f90

Browse files
author
Dean Troyer
committed
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 parent a42664c commit 6a15f90

10 files changed

Lines changed: 147 additions & 868 deletions

File tree

‎openstackclient/common/clientmanager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def get_plugin_modules(group):
8686

8787
# Add the plugin to the ClientManager
8888
setattr(
89-
ClientManager,
89+
clientmanager.ClientManager,
9090
module.API_NAME,
9191
clientmanager.ClientCache(
9292
getattr(sys.modules[ep.module_name], 'make_client', None)

‎openstackclient/compute/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ def make_client(instance):
6464
if ext.name == "list_extensions"]
6565

6666
# Remember interface only if it is set
67-
kwargs = utils.build_kwargs_dict('endpoint_type', instance._interface)
67+
kwargs = utils.build_kwargs_dict('endpoint_type', instance.interface)
6868

6969
client = nova_client.Client(
7070
version,
7171
session=instance.session,
7272
extensions=extensions,
7373
http_log_debug=http_log_debug,
7474
timings=instance.timing,
75-
region_name=instance._region_name,
75+
region_name=instance.region_name,
7676
**kwargs
7777
)
7878

‎openstackclient/identity/client.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import logging
1717

1818
from keystoneclient.v2_0 import client as identity_client_v2
19-
from osc_lib.api import auth
2019
from osc_lib import utils
2120

2221
from openstackclient.i18n import _
@@ -50,11 +49,11 @@ def make_client(instance):
5049
LOG.debug('Instantiating identity client: %s', identity_client)
5150

5251
# Remember interface only if interface is set
53-
kwargs = utils.build_kwargs_dict('interface', instance._interface)
52+
kwargs = utils.build_kwargs_dict('interface', instance.interface)
5453

5554
client = identity_client(
5655
session=instance.session,
57-
region_name=instance._region_name,
56+
region_name=instance.region_name,
5857
**kwargs
5958
)
6059

@@ -70,7 +69,7 @@ def build_option_parser(parser):
7069
help=_('Identity API version, default=%s '
7170
'(Env: OS_IDENTITY_API_VERSION)') % DEFAULT_API_VERSION,
7271
)
73-
return auth.build_auth_plugins_option_parser(parser)
72+
return parser
7473

7574

7675
class IdentityClientv2(identity_client_v2.Client):

‎openstackclient/image/client.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ def make_client(instance):
4747

4848
endpoint = instance.get_endpoint_for_service_type(
4949
API_NAME,
50-
region_name=instance._region_name,
51-
interface=instance._interface,
50+
region_name=instance.region_name,
51+
interface=instance.interface,
5252
)
5353

5454
client = image_client(
5555
endpoint,
5656
token=instance.auth.get_token(instance.session),
57-
cacert=instance._cacert,
58-
insecure=instance._insecure,
57+
cacert=instance.cacert,
58+
insecure=not instance.verify,
5959
)
6060

6161
# Create the low-level API
@@ -70,8 +70,8 @@ def make_client(instance):
7070
session=instance.session,
7171
endpoint=instance.get_endpoint_for_service_type(
7272
IMAGE_API_TYPE,
73-
region_name=instance._region_name,
74-
interface=instance._interface,
73+
region_name=instance.region_name,
74+
interface=instance.interface,
7575
)
7676
)
7777

‎openstackclient/network/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
def make_client(instance):
3535
"""Returns a network proxy"""
3636
prof = profile.Profile()
37-
prof.set_region(API_NAME, instance._region_name)
37+
prof.set_region(API_NAME, instance.region_name)
3838
prof.set_version(API_NAME, instance._api_version[API_NAME])
39-
prof.set_interface(API_NAME, instance._interface)
39+
prof.set_interface(API_NAME, instance.interface)
4040
conn = connection.Connection(authenticator=instance.session.auth,
4141
verify=instance.session.verify,
4242
cert=instance.session.cert,

‎openstackclient/object/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def make_client(instance):
3232

3333
endpoint = instance.get_endpoint_for_service_type(
3434
'object-store',
35-
region_name=instance._region_name,
36-
interface=instance._interface,
35+
region_name=instance.region_name,
36+
interface=instance.interface,
3737
)
3838

3939
client = object_store_v1.APIv1(

0 commit comments

Comments
 (0)