openstack
/
glance
Code Issues Proposed changes

Merge "Fix 409 response when updating an image by removing read-only property"

This commit is contained in:
Jenkins 2015-10-13 12:35:56 +00:00 committed by Gerrit Code Review
parent 27ca72587e f945f81575
commit fc44ebb8e9
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,7 +478,7 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
msg = _("Attribute '%s' is reserved.") % path_root
raise webob.exc.HTTPForbidden(explanation=six.text_type(msg))
if change['op'] == 'delete':
if change['op'] == 'remove':
return
partial_image = None
@ -557,7 +557,8 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
if not op == 'remove':
change['value'] = self._get_change_value(raw_change, op)
self._validate_change(change)
self._validate_change(change)
changes.append(change)

43
glance/tests/functional/v2/test_images.py
View File

@ -574,6 +574,49 @@ class TestImages(functional.FunctionalTest):
self.stop_servers()
def test_update_readonly_prop(self):
self.start_servers(**self.__dict__.copy())
# Create an image (with two deployer-defined properties)
path = self._url('/v2/images')
headers = self._headers({'content-type': 'application/json'})
data = jsonutils.dumps({'name': 'image-1'})
response = requests.post(path, headers=headers, data=data)
image = jsonutils.loads(response.text)
image_id = image['id']
path = self._url('/v2/images/%s' % image_id)
media_type = 'application/openstack-images-v2.1-json-patch'
headers = self._headers({'content-type': media_type})
props = ['/id', '/file', '/location', '/schema', '/self']
for prop in props:
doc = [{'op': 'replace',
'path': prop,
'value': 'value1'}]
data = jsonutils.dumps(doc)
response = requests.patch(path, headers=headers, data=data)
self.assertEqual(403, response.status_code)
for prop in props:
doc = [{'op': 'remove',
'path': prop,
'value': 'value1'}]
data = jsonutils.dumps(doc)
response = requests.patch(path, headers=headers, data=data)
self.assertEqual(403, response.status_code)
for prop in props:
doc = [{'op': 'add',
'path': prop,
'value': 'value1'}]
data = jsonutils.dumps(doc)
response = requests.patch(path, headers=headers, data=data)
self.assertEqual(403, response.status_code)
self.stop_servers()
def test_download_random_access(self):
self.start_servers(**self.__dict__.copy())
# Create another image (with two deployer-defined properties)