diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-21 14:00:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-21 14:00:03 +0000 |
| commit | 35c308ebadc23929f96eb74ab59091b7e691f09e (patch) | |
| tree | 70e41a9c34d169c429347e03772ad1df76aefff3 /openstackclient/network | |
| parent | bc4a3f467facecdb690f3bdbad3a6bbef1996778 (diff) | |
| parent | 73809a98ed63af214ced7d3f51814ca91b122bbe (diff) | |
| download | python-openstackclient-35c308ebadc23929f96eb74ab59091b7e691f09e.tar.gz | |
Merge "Remove remaining uses of SDK Proxy.session"
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/client.py | 5 | ||||
| -rw-r--r-- | openstackclient/network/v2/floating_ip.py | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py index c562058d..9525b947 100644 --- a/openstackclient/network/client.py +++ b/openstackclient/network/client.py @@ -44,6 +44,11 @@ def make_client(instance): LOG.debug('Connection: %s', conn) LOG.debug('Network client initialized using OpenStack SDK: %s', conn.network) + + # NOTE(dtroyer): Horrible ugly hack since we don't actually save + # the connection anywhere yet, so stash it in the + # instance directly from here for other uses + instance.sdk_connection = conn return conn.network diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py index 980c41c7..41b208aa 100644 --- a/openstackclient/network/v2/floating_ip.py +++ b/openstackclient/network/v2/floating_ip.py @@ -241,7 +241,7 @@ class DeleteFloatingIP(common.NetworkAndComputeDelete): def take_action_network(self, client, parsed_args): (obj, self.ip_cache) = _find_floating_ip( - client.session, + self.app.client_manager.sdk_connection.session, self.ip_cache, self.r, ignore_missing=False, @@ -472,7 +472,7 @@ class ShowFloatingIP(common.NetworkAndComputeShowOne): def take_action_network(self, client, parsed_args): (obj, self.ip_cache) = _find_floating_ip( - client.session, + self.app.client_manager.sdk_connection.session, [], parsed_args.floating_ip, ignore_missing=False, |