Use valid metadata keys for compute images
Glance's v2 has a strict policy on what keys may/may not be used as
custom properties for images. The list of valid properties used by nova
is defined here[0].
This patch updates tempests tests to make it compatible with Glance's
v2.
https://github.com/openstack/glance/blob/master/etc/schema-image.json
Change-Id: I074e5d2fa73e74afc2c130d4c18f79bbee387ce5
diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py
index e45e941..c3b144d 100644
--- a/tempest/api/compute/images/test_image_metadata.py
+++ b/tempest/api/compute/images/test_image_metadata.py
@@ -49,20 +49,20 @@
def setUp(self):
super(ImagesMetadataTestJSON, self).setUp()
- meta = {'key1': 'value1', 'key2': 'value2'}
+ meta = {'os_version': 'value1', 'os_distro': 'value2'}
self.client.set_image_metadata(self.image_id, meta)
@test.attr(type='gate')
def test_list_image_metadata(self):
# All metadata key/value pairs for an image should be returned
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'value1', 'key2': 'value2'}
+ expected = {'os_version': 'value1', 'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_set_image_metadata(self):
# The metadata for the image should match the new values
- req_metadata = {'meta2': 'value2', 'meta3': 'value3'}
+ req_metadata = {'os_version': 'value2', 'architecture': 'value3'}
self.client.set_image_metadata(self.image_id,
req_metadata)
@@ -72,37 +72,39 @@
@test.attr(type='gate')
def test_update_image_metadata(self):
# The metadata for the image should match the updated values
- req_metadata = {'key1': 'alt1', 'key3': 'value3'}
+ req_metadata = {'os_version': 'alt1', 'architecture': 'value3'}
self.client.update_image_metadata(self.image_id,
req_metadata)
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'alt1', 'key2': 'value2', 'key3': 'value3'}
+ expected = {'os_version': 'alt1',
+ 'os_distro': 'value2',
+ 'architecture': 'value3'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_get_image_metadata_item(self):
# The value for a specific metadata key should be returned
meta = self.client.get_image_metadata_item(self.image_id,
- 'key2')
- self.assertEqual('value2', meta['key2'])
+ 'os_distro')
+ self.assertEqual('value2', meta['os_distro'])
@test.attr(type='gate')
def test_set_image_metadata_item(self):
# The value provided for the given meta item should be set for
# the image
- meta = {'key1': 'alt'}
+ meta = {'os_version': 'alt'}
self.client.set_image_metadata_item(self.image_id,
- 'key1', meta)
+ 'os_version', meta)
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'alt', 'key2': 'value2'}
+ expected = {'os_version': 'alt', 'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_delete_image_metadata_item(self):
# The metadata value/key pair should be deleted from the image
self.client.delete_image_metadata_item(self.image_id,
- 'key1')
+ 'os_version')
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key2': 'value2'}
+ expected = {'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
diff --git a/tempest/api/compute/images/test_image_metadata_negative.py b/tempest/api/compute/images/test_image_metadata_negative.py
index 615b5d0..73412ff 100644
--- a/tempest/api/compute/images/test_image_metadata_negative.py
+++ b/tempest/api/compute/images/test_image_metadata_negative.py
@@ -36,7 +36,7 @@
@test.attr(type=['negative', 'gate'])
def test_update_nonexistent_image_metadata(self):
# Negative test:An update should not happen for a non-existent image
- meta = {'key1': 'alt1', 'key2': 'alt2'}
+ meta = {'os_distro': 'alt1', 'os_version': 'alt2'}
self.assertRaises(exceptions.NotFound,
self.client.update_image_metadata,
data_utils.rand_uuid(), meta)
@@ -46,12 +46,12 @@
# Negative test: Get on non-existent image should not happen
self.assertRaises(exceptions.NotFound,
self.client.get_image_metadata_item,
- data_utils.rand_uuid(), 'key2')
+ data_utils.rand_uuid(), 'os_version')
@test.attr(type=['negative', 'gate'])
def test_set_nonexistent_image_metadata(self):
# Negative test: Metadata should not be set to a non-existent image
- meta = {'key1': 'alt1', 'key2': 'alt2'}
+ meta = {'os_distro': 'alt1', 'os_version': 'alt2'}
self.assertRaises(exceptions.NotFound, self.client.set_image_metadata,
data_utils.rand_uuid(), meta)
@@ -59,10 +59,10 @@
def test_set_nonexistent_image_metadata_item(self):
# Negative test: Metadata item should not be set to a
# nonexistent image
- meta = {'key1': 'alt'}
+ meta = {'os_distro': 'alt'}
self.assertRaises(exceptions.NotFound,
self.client.set_image_metadata_item,
- data_utils.rand_uuid(), 'key1',
+ data_utils.rand_uuid(), 'os_distro',
meta)
@test.attr(type=['negative', 'gate'])
@@ -71,4 +71,4 @@
# item from non-existent image
self.assertRaises(exceptions.NotFound,
self.client.delete_image_metadata_item,
- data_utils.rand_uuid(), 'key1')
+ data_utils.rand_uuid(), 'os_distro')