diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-10 19:52:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-10 19:52:29 +0000 |
| commit | 8f06be98b8e83c5e74d12bfb7607e76902cd9385 (patch) | |
| tree | b41d3a334b272be06e849da96ceadf3309650e2f /nova/api | |
| parent | de2fec579e43ee34e9e9a87cc1d07869fa7e44dc (diff) | |
| parent | 5b0494f877ec1cb95bb18b8608a341c21109832f (diff) | |
Merge "Return proper error messages while associating floating IP"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 1c17591a4..67d52b9ca 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -259,7 +259,8 @@ class FloatingIPActionController(wsgi.Controller): except exception.NoFloatingIpInterface: msg = _('l3driver call to add floating ip failed') raise webob.exc.HTTPBadRequest(explanation=msg) - except exception.FloatingIpNotFoundForAddress: + except (exception.FloatingIpNotFoundForAddress, + exception.NotAuthorized): msg = _('floating ip not found') raise webob.exc.HTTPNotFound(explanation=msg) except Exception: |