diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2014-10-17 23:43:38 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2014-10-18 00:01:52 -0500 |
| commit | 2166d7d3afbbdc1659e4cffdb7bcd890cd00ec19 (patch) | |
| tree | 63f1596a4eab44fa41ac54d4692dd3ba7f4efa93 /openstackclient/network/client.py | |
| parent | 0de67016c7daa1712b568cb2e49728fac3eb57ad (diff) | |
| download | python-openstackclient-2166d7d3afbbdc1659e4cffdb7bcd890cd00ec19.tar.gz | |
Remove ClientManager._service_catalog
Anything that needs a service catalog can get it directly from
auth_ref.service_catalog, no need to carry the extra attribute.
ClientManager.get_endpoint_for_service_type() reamins the proper
method to get an endpoint for clients that still need one directly.
Change-Id: I809091c9c71d08f29606d7fd8b500898ff2cb8ae
Diffstat (limited to 'openstackclient/network/client.py')
| -rw-r--r-- | openstackclient/network/client.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py index e4ce2f6a..bb3e1b23 100644 --- a/openstackclient/network/client.py +++ b/openstackclient/network/client.py @@ -34,16 +34,18 @@ def make_client(instance): API_VERSIONS) LOG.debug('Instantiating network client: %s', network_client) - if not instance._url: - instance._url = instance.get_endpoint_for_service_type( - "network", region_name=instance._region_name) + endpoint = instance.get_endpoint_for_service_type( + API_NAME, + region_name=instance._region_name, + ) + return network_client( username=instance._username, tenant_name=instance._project_name, password=instance._password, region_name=instance._region_name, auth_url=instance._auth_url, - endpoint_url=instance._url, + endpoint_url=endpoint, token=instance.auth.get_token(instance.session), insecure=instance._insecure, ca_cert=instance._cacert, |