diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-08-12 17:17:20 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-12 17:17:20 +0000 |
| commit | 069056b7f5c9b2e9a1c35d37501897fd26100bac (patch) | |
| tree | 77227c7013a1149d82b77e0da378ee92b1299ba9 | |
| parent | bf334c786091ace63dd943e5e5893a239a22d21e (diff) | |
| parent | f95e0118d91a8f77345e4d78980e2523cb4dba56 (diff) | |
Fixes to the OSAPI floating API extension DELETE.
Updated to use correct args for self.disassociate (don't sweep exceptions which should cause test cases to fail under the rug).
Additionally updated to pass network_api.release_floating_ip the address instead of a dict.
| -rw-r--r-- | nova/api/openstack/contrib/floating_ips.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py index 2aba1068a..c07bfdf09 100644 --- a/nova/api/openstack/contrib/floating_ips.py +++ b/nova/api/openstack/contrib/floating_ips.py @@ -104,12 +104,9 @@ class FloatingIPController(object): ip = self.network_api.get_floating_ip(context, id) if 'fixed_ip' in ip: - try: - self.disassociate(req, id, '') - except Exception as e: - LOG.exception(_("Error disassociating fixed_ip %s"), e) + self.disassociate(req, id) - self.network_api.release_floating_ip(context, address=ip) + self.network_api.release_floating_ip(context, address=ip['address']) return {'released': { "id": ip['id'], |