openstack/cinder
Code Issues Proposed changes

Merge "Redundant body validation for volume_upload_image"

Browse Source
This commit is contained in:
Jenkins
2013-11-30 06:45:02 +00:00
committed by Gerrit Code Review
parent 59efb05b49 4a8ad10c3d
commit 6a6fc11489
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/api/contrib/volume_actions.py
View File

@@ -215,12 +215,7 @@ class VolumeActionsController(wsgi.Controller):
def _volume_upload_image(self, req, id, body):
"""Uploads the specified volume to image service."""
context = req.environ['cinder.context']
try:
params = body['os-volume_upload_image']
except (TypeError, KeyError):
msg = _("Invalid request body")
raise webob.exc.HTTPBadRequest(explanation=msg)
params = body['os-volume_upload_image']
if not params.get("image_name"):
msg = _("No image_name was specified in request.")
raise webob.exc.HTTPBadRequest(explanation=msg)