diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-26 23:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-26 23:35:08 +0000 |
| commit | 888ce84fa8fa19a6f18887ae21388f4f3855ae79 (patch) | |
| tree | 33ecf4a6bb510fa933ed6e830c65063edd5ea24e | |
| parent | 73890232237df3a4b537921970adf71a3f537d4f (diff) | |
| parent | 21baedfc3185111589535cdc24fff83603a5e3fc (diff) | |
| download | nova-888ce84fa8fa19a6f18887ae21388f4f3855ae79.tar.gz | |
Merge "Fix `confirmResize` action status code in V2"
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 110a84e325..ea68a09e39 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -1089,7 +1089,7 @@ class Controller(wsgi.Controller): return self._view_builder.show(req, instance) - @wsgi.response(202) + @wsgi.response(204) @wsgi.serializers(xml=FullServerTemplate) @wsgi.deserializers(xml=ActionDeserializer) @wsgi.action('confirmResize') @@ -1106,7 +1106,6 @@ class Controller(wsgi.Controller): except exception.InstanceInvalidState as state_error: common.raise_http_conflict_for_instance_invalid_state(state_error, 'confirmResize') - return exc.HTTPNoContent() @wsgi.response(202) @wsgi.serializers(xml=FullServerTemplate) |