openstack/nova
Code Issues Proposed changes

Merge "Change v3 shelve to v2.1"

Browse Source
This commit is contained in:
Jenkins
2014-08-31 06:49:44 +00:00
committed by Gerrit Code Review
parent 664f0972b9 9daf3bdd87
commit 094f8cd13f
5 changed files with 45 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/compute/plugins/v3/shelve.py
View File

@@ -56,7 +56,7 @@ class ShelveController(wsgi.Controller):
return webob.Response(status_int=202)
@exts.expected_errors((404, 409))
@wsgi.action('shelve_offload')
@wsgi.action('shelveOffload')
def _shelve_offload(self, req, id, body):
"""Force removal of a shelved instance from the compute node."""
context = req.environ["nova.context"]
@@ -70,7 +70,7 @@ class ShelveController(wsgi.Controller):
raise exc.HTTPConflict(explanation=e.format_message())
except exception.InstanceInvalidState as state_error:
common.raise_http_conflict_for_instance_invalid_state(state_error,
'shelve_offload')
'shelveOffload')
return webob.Response(status_int=202)