openstack/python-glanceclient
Code Issues Proposed changes

Use openstack-images-v2.1-json-patch for update method

Browse Source 
image.patch returns a JSON schema Draft 10 (application/openstack-images-v2.1-json-patch)
while the glaceclient update method specify a Content-Type header
application/openstack-images-v2.0-json-patch with correspond to a JSON schemea Draft 4.

Fixes bug 1206095
Change-Id: I8c5a96f0e117a81b5b527a96ef45758fc69b518d
This commit is contained in:
Ghe Rivero
2013-07-29 11:41:10 +00:00
parent 835638fd8a
commit 3307549a0f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glanceclient/v2/images.py
View File

@@ -147,7 +147,7 @@ class Controller(object):
delattr(image, key) delattr(image, key)
url = '/v2/images/%s' % image_id url = '/v2/images/%s' % image_id
hdrs = {'Content-Type': 'application/openstack-images-v2.0-json-patch'} hdrs = {'Content-Type': 'application/openstack-images-v2.1-json-patch'}
self.http_client.raw_request('PATCH', url, self.http_client.raw_request('PATCH', url,
headers=hdrs, headers=hdrs,
body=image.patch) body=image.patch)

10
tests/v2/test_images.py
View File

@@ -437,7 +437,7 @@ class TestController(testtools.TestCase):
params = {'name': 'pong'} params = {'name': 'pong'}
image = self.controller.update(image_id, **params) image = self.controller.update(image_id, **params)
expect_hdrs = { expect_hdrs = {
'Content-Type': 'application/openstack-images-v2.0-json-patch', 'Content-Type': 'application/openstack-images-v2.1-json-patch',
} }
expect_body = '[{"path": "/name", "value": "pong", "op": "replace"}]' expect_body = '[{"path": "/name", "value": "pong", "op": "replace"}]'
expect = [ expect = [
@@ -456,7 +456,7 @@ class TestController(testtools.TestCase):
params = {'finn': 'human'} params = {'finn': 'human'}
image = self.controller.update(image_id, **params) image = self.controller.update(image_id, **params)
expect_hdrs = { expect_hdrs = {
'Content-Type': 'application/openstack-images-v2.0-json-patch', 'Content-Type': 'application/openstack-images-v2.1-json-patch',
} }
expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]' expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]'
expect = [ expect = [
@@ -475,7 +475,7 @@ class TestController(testtools.TestCase):
remove_props = ['barney'] remove_props = ['barney']
image = self.controller.update(image_id, remove_props) image = self.controller.update(image_id, remove_props)
expect_hdrs = { expect_hdrs = {
'Content-Type': 'application/openstack-images-v2.0-json-patch', 'Content-Type': 'application/openstack-images-v2.1-json-patch',
} }
expect_body = '[{"path": "/barney", "op": "remove"}]' expect_body = '[{"path": "/barney", "op": "remove"}]'
expect = [ expect = [
@@ -496,7 +496,7 @@ class TestController(testtools.TestCase):
remove_props = ['barney'] remove_props = ['barney']
image = self.controller.update(image_id, remove_props, **params) image = self.controller.update(image_id, remove_props, **params)
expect_hdrs = { expect_hdrs = {
'Content-Type': 'application/openstack-images-v2.0-json-patch', 'Content-Type': 'application/openstack-images-v2.1-json-patch',
} }
expect_body = '[{"path": "/barney", "value": "miller", ' \ expect_body = '[{"path": "/barney", "value": "miller", ' \
'"op": "replace"}]' '"op": "replace"}]'
@@ -518,7 +518,7 @@ class TestController(testtools.TestCase):
remove_props = ['finn'] remove_props = ['finn']
image = self.controller.update(image_id, remove_props, **params) image = self.controller.update(image_id, remove_props, **params)
expect_hdrs = { expect_hdrs = {
'Content-Type': 'application/openstack-images-v2.0-json-patch', 'Content-Type': 'application/openstack-images-v2.1-json-patch',
} }
expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]' expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]'
expect = [ expect = [