openstack/nova
Code Issues Proposed changes

Merge "Add more information to generic _add_floating_ip exception message"

Browse Source
This commit is contained in:
Jenkins
2014-09-17 10:30:56 +00:00
committed by Gerrit Code Review
parent 8994277126 404f7ca9ce
commit eab855454b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/api/openstack/compute/contrib/floating_ips.py
View File

@@ -249,8 +249,12 @@ class FloatingIPActionController(wsgi.Controller):
raise webob.exc.HTTPNotFound(explanation=msg)
except exception.Forbidden as e:
raise webob.exc.HTTPForbidden(explanation=e.format_message())
except Exception:
msg = _('Error. Unable to associate floating ip')
except Exception as e:
msg = _('Unable to associate floating ip %(address)s to '
'fixed ip %(fixed_address)s for instance %(id)s. '
'Error: %(error)s') % (
{'address': address, 'fixed_address': fixed_address,
'id': id, 'error': e})
LOG.exception(msg)
raise webob.exc.HTTPBadRequest(explanation=msg)