diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 23:15:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 23:15:13 +0000 |
| commit | 0b1eee6bb39243ef117f65b0eaf3d6f14b0aa3d7 (patch) | |
| tree | 41b1f7735040e59425cf6ed60828a66916c4e596 /nova/api | |
| parent | 1d8af7541495f460d573dbb245aed8750c4bcbb2 (diff) | |
| parent | 843af52d49554f15c13e5617b9eb672c35c7fe51 (diff) | |
Merge "Check flavor id on resize."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index fc4905a11..ba23cb50b 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -949,8 +949,8 @@ class Controller(wsgi.Controller): except exception.FlavorNotFound: msg = _("Unable to locate requested flavor.") raise exc.HTTPBadRequest(explanation=msg) - except exception.CannotResizeToSameSize: - msg = _("Resize requires a change in size.") + except exception.CannotResizeToSameFlavor: + msg = _("Resize requires a flavor change.") raise exc.HTTPBadRequest(explanation=msg) except exception.InstanceInvalidState as state_error: common.raise_http_conflict_for_instance_invalid_state(state_error, |