From 43488a5d9a8d5166068275eae184782d00804b12 Mon Sep 17 00:00:00 2001 From: zhufl Date: Thu, 30 Jun 2016 12:18:35 +0800 Subject: [PATCH] Add purge flag in image_meta_to_headers 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 --- tempest/common/image.py | 5 +++++ tempest/tests/common/test_image.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tempest/common/image.py b/tempest/common/image.py index 72e3a72075..95a7d1a14c 100644 --- a/tempest/common/image.py +++ b/tempest/common/image.py @@ -47,6 +47,11 @@ def image_meta_to_headers(**metadata): fields_copy = copy.deepcopy(metadata) 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: headers['x-glance-api-copy-from'] = copy_from diff --git a/tempest/tests/common/test_image.py b/tempest/tests/common/test_image.py index 34772a2288..240df4d45a 100644 --- a/tempest/tests/common/test_image.py +++ b/tempest/tests/common/test_image.py @@ -46,7 +46,8 @@ class TestImage(base.TestCase): disk_format='vhd', copy_from='http://localhost/images/10', properties={'foo': 'bar'}, - api={'abc': 'def'}) + api={'abc': 'def'}, + purge_props=True) expected = { 'x-image-meta-name': 'test', @@ -54,6 +55,7 @@ class TestImage(base.TestCase): 'x-image-meta-disk_format': 'vhd', 'x-glance-api-copy-from': 'http://localhost/images/10', '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)