From 261b4111d481562760321bfc83d64ba35e981b5b Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 26 Sep 2011 13:57:34 -0400 Subject: Explicit errors on confirm/revertResize failures Fixing bug 856527 Change-Id: Ib9be618596ade2e9a899ecdc10ec9f61bf06958a --- nova/api/openstack/servers.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nova/api') diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 18eef2464..c45e7510c 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -664,6 +664,9 @@ class Controller(object): def _action_confirm_resize(self, input_dict, req, id): try: self.compute_api.confirm_resize(req.environ['nova.context'], id) + except exception.MigrationNotFound: + msg = _("Instance has not been resized.") + raise exc.HTTPBadRequest(explanation=msg) except Exception, e: LOG.exception(_("Error in confirm-resize %s"), e) raise exc.HTTPBadRequest() @@ -672,6 +675,9 @@ class Controller(object): def _action_revert_resize(self, input_dict, req, id): try: self.compute_api.revert_resize(req.environ['nova.context'], id) + except exception.MigrationNotFound: + msg = _("Instance has not been resized.") + raise exc.HTTPBadRequest(explanation=msg) except Exception, e: LOG.exception(_("Error in revert-resize %s"), e) raise exc.HTTPBadRequest() -- cgit