diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-09-08 23:56:42 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-09-08 23:56:42 +0000 |
| commit | 2446136426bf1bbe8c3f20604eabb5ec18b2e5a7 (patch) | |
| tree | d400f45a5f39c0727c9e00a6773cff1d2279ffb5 /nova/api | |
| parent | 67534d897896c2b3ebddcac9be86f669c431a7c2 (diff) | |
| parent | fe355a10ad0a215eb5295e46e6c106221972e7ed (diff) | |
fix for lp844364: fix check for fixed_ip association in os-floating-ips
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/floating_ips.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py index d1add8f83..d078b26c6 100644 --- a/nova/api/openstack/contrib/floating_ips.py +++ b/nova/api/openstack/contrib/floating_ips.py @@ -107,7 +107,7 @@ class FloatingIPController(object): context = req.environ['nova.context'] floating_ip = self.network_api.get_floating_ip(context, id) - if 'fixed_ip' in floating_ip: + if floating_ip.get('fixed_ip'): self.network_api.disassociate_floating_ip(context, floating_ip['address']) @@ -161,7 +161,7 @@ class Floating_ips(extensions.ExtensionDescriptor): raise webob.exc.HTTPBadRequest(explanation=msg) floating_ip = self.network_api.get_floating_ip_by_ip(context, address) - if 'fixed_ip' in floating_ip: + if floating_ip.get('fixed_ip'): self.network_api.disassociate_floating_ip(context, address) return webob.Response(status_int=202) |