summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/floating_ips.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index 2f3c56199..bf1246ccb 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -294,7 +294,9 @@ class FloatingIPActionController(wsgi.Controller):
disassociate_floating_ip(self, context, instance, address)
return webob.Response(status_int=202)
else:
- return webob.Response(status_int=404)
+ msg = _("Floating ip %(address)s is not associated with instance "
+ "%(id)s.") % locals()
+ raise webob.exc.HTTPUnprocessableEntity(explanation=msg)
class Floating_ips(extensions.ExtensionDescriptor):