diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-17 21:14:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-17 21:14:05 +0000 |
| commit | b0ce95745db6c83bec7db45fdf7053fafe286dce (patch) | |
| tree | 822450afd4f3796f71b912134a92a8120a838010 /openstackclient/network | |
| parent | 18206a9224bd9f25c0a02498d6562efa6ee31c1b (diff) | |
| parent | e6ea45b2833fdd57a8011154aec5c1f6b00f44ca (diff) | |
| download | python-openstackclient-b0ce95745db6c83bec7db45fdf7053fafe286dce.tar.gz | |
Merge "Low-level Compute v2 API: floating ip"
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/floating_ip.py | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py index eaf27420..05b688a6 100644 --- a/openstackclient/network/v2/floating_ip.py +++ b/openstackclient/network/v2/floating_ip.py @@ -190,9 +190,9 @@ class CreateFloatingIP(common.NetworkAndComputeShowOne): return (display_columns, data) def take_action_compute(self, client, parsed_args): - obj = client.floating_ips.create(parsed_args.network) - columns = _get_columns(obj._info) - data = utils.get_dict_properties(obj._info, columns) + obj = client.api.floating_ip_create(parsed_args.network) + columns = _get_columns(obj) + data = utils.get_dict_properties(obj, columns) return (columns, data) @@ -245,13 +245,7 @@ class DeleteFloatingIP(common.NetworkAndComputeDelete): client.delete_ip(obj) def take_action_compute(self, client, parsed_args): - obj = utils.find_resource(client.floating_ips, self.r) - client.floating_ips.delete(obj.id) - - def take_action(self, parsed_args): - """Implements a naive cache for the list of floating IPs""" - - super(DeleteFloatingIP, self).take_action(parsed_args) + client.api.floating_ip_delete(self.r) class DeleteIPFloating(DeleteFloatingIP): @@ -414,10 +408,10 @@ class ListFloatingIP(common.NetworkAndComputeLister): 'Pool', ) - data = client.floating_ips.list() + data = client.api.floating_ip_list() return (headers, - (utils.get_item_properties( + (utils.get_dict_properties( s, columns, formatters={}, ) for s in data)) @@ -510,12 +504,9 @@ class ShowFloatingIP(common.NetworkAndComputeShowOne): return (display_columns, data) def take_action_compute(self, client, parsed_args): - obj = utils.find_resource( - client.floating_ips, - parsed_args.floating_ip, - ) - columns = _get_columns(obj._info) - data = utils.get_dict_properties(obj._info, columns) + obj = client.api.floating_ip_find(parsed_args.floating_ip) + columns = _get_columns(obj) + data = utils.get_dict_properties(obj, columns) return (columns, data) |