openstack
/
glance
Code Issues Proposed changes

Merge "Change status code from 500 to 400 for image update request"

This commit is contained in:
Jenkins 2015-06-16 23:56:43 +00:00 committed by Gerrit Code Review
parent ccf2922988 9f9629ada5
commit 1221691e5a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glance/api/v2/images.py
View File

@ -339,6 +339,8 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
_default_sort_dir = 'desc'
_supported_operations = ('add', 'remove', 'replace')
def __init__(self, schema=None):
super(RequestDeserializer, self).__init__()
self.schema = schema or get_schema()
@ -382,15 +384,23 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
return dict(image=image, extra_properties=properties, tags=tags)
def _get_change_operation_d10(self, raw_change):
try:
return raw_change['op']
except KeyError:
msg = _("Unable to find '%s' in JSON Schema change") % 'op'
op = raw_change.get('op')
if op is None:
msg = _('Unable to find `op` in JSON Schema change. '
'It must be one of the following: %(available)s.') % \
{'available': ', '.join(self._supported_operations)}
raise webob.exc.HTTPBadRequest(explanation=msg)
if op not in self._supported_operations:
msg = _('Invalid operation: `%(op)s`. '
'It must be one of the following: %(available)s.') % \
{'op': op,
'available': ', '.join(self._supported_operations)}
raise webob.exc.HTTPBadRequest(explanation=msg)
return op
def _get_change_operation_d4(self, raw_change):
op = None
for key in ['replace', 'add', 'remove']:
for key in self._supported_operations:
if key in raw_change:
if op is not None:
msg = _('Operation objects must contain only one member'

1
glance/tests/unit/v2/test_images_resource.py
View File

@ -2271,6 +2271,7 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
True,
False,
None,
{'op': 'invalid', 'path': '/name', 'value': 'fedora'}
]
for change in changes:
request = self._get_fake_patch_request()