openstack/tempest
Code Issues Proposed changes

Add purge flag in image_meta_to_headers

Browse Source 
When calling image_client_v1's update_image with "purge" flag,
it raise 400 Bad Request with message "Bad header: x-image-meta-purge-props".
This is to add purge transform in image_meta_to_headers to support purge flag.

Change-Id: I2a30c2fc746701805f9e9cc77068c7eaa17dbcb8
Closes-Bug: #1597591
This commit is contained in:
zhufl 2016-06-30 12:18:35 +08:00
parent 61b82bf236
commit 43488a5d9a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tempest/common/image.py
View File

@ -47,6 +47,11 @@ def image_meta_to_headers(**metadata):
fields_copy = copy.deepcopy(metadata) fields_copy = copy.deepcopy(metadata)
copy_from = fields_copy.pop('copy_from', None) copy_from = fields_copy.pop('copy_from', None)
purge = fields_copy.pop('purge_props', None)
if purge is not None:
headers['x-glance-registry-purge-props'] = purge
if copy_from is not None: if copy_from is not None:
headers['x-glance-api-copy-from'] = copy_from headers['x-glance-api-copy-from'] = copy_from

6
tempest/tests/common/test_image.py
View File

@ -46,7 +46,8 @@ class TestImage(base.TestCase):
disk_format='vhd', disk_format='vhd',
copy_from='http://localhost/images/10', copy_from='http://localhost/images/10',
properties={'foo': 'bar'}, properties={'foo': 'bar'},
api={'abc': 'def'}) api={'abc': 'def'},
purge_props=True)
expected = { expected = {
'x-image-meta-name': 'test', 'x-image-meta-name': 'test',
@ -54,6 +55,7 @@ class TestImage(base.TestCase):
'x-image-meta-disk_format': 'vhd', 'x-image-meta-disk_format': 'vhd',
'x-glance-api-copy-from': 'http://localhost/images/10', 'x-glance-api-copy-from': 'http://localhost/images/10',
'x-image-meta-property-foo': 'bar', 'x-image-meta-property-foo': 'bar',
'x-glance-api-property-abc': 'def' 'x-glance-api-property-abc': 'def',
'x-glance-registry-purge-props': True
} }
self.assertEqual(expected, observed) self.assertEqual(expected, observed)