x/cloudroast
Code Issues Proposed changes

Modified image metadata keys for Protected Property changes

Browse Source 
* Added "user_" to the start of all image meta keys to avoid
  failures related to Glance protected properties

Change-Id: I11bf87c68a668b41dc7d6a6a872b17f502f9b07f
This commit is contained in:
Daryl Walleck
2013-11-07 22:27:56 -06:00
parent 2261555060
commit 8b6f7e98c6
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cloudroast/compute/functional/images/test_create_image.py
View File

@@ -28,8 +28,8 @@ class CreateImageTest(ComputeFixture):
cls.server = cls.server_behaviors.create_active_server().entity
cls.image_name = rand_name('image')
cls.metadata = {'key1': 'value1',
'key2': 'value2'}
cls.metadata = {'user_key1': 'value1',
'user_key2': 'value2'}
server_id = cls.server.id
cls.image_response = cls.servers_client.create_image(
server_id, cls.image_name, metadata=cls.metadata)

27
cloudroast/compute/functional/images/test_images_metadata.py
View File

@@ -29,7 +29,7 @@ class ImagesMetadataTest(ComputeFixture):
cls.server_resp = cls.server_behaviors.create_active_server()
cls.server_id = cls.server_resp.entity.id
cls.resources.add(cls.server_id, cls.servers_client.delete_server)
meta = {'key1': 'value1', 'key2': 'value2'}
meta = {'user_key1': 'value1', 'user_key2': 'value2'}
name = rand_name('testimage')
image_resp = cls.servers_client.create_image(cls.server_id, name, meta)
cls.image_id = cls.parse_image_id(image_resp)
@@ -41,7 +41,7 @@ class ImagesMetadataTest(ComputeFixture):
def setUp(self):
super(ImagesMetadataTest, self).setUp()
meta = {'key1': 'value1', 'key2': 'value2'}
meta = {'user_key1': 'value1', 'user_key2': 'value2'}
self.images_client.set_image_metadata(self.image.id, meta)
@tags(type='negative', net='no')
@@ -63,35 +63,36 @@ class ImagesMetadataTest(ComputeFixture):
"""All metadata key/value pairs for an image should be returned"""
image_metadata = self.images_client.list_image_metadata(
self.image_id).entity
self.assertEqual(image_metadata.get('key1'), 'value1')
self.assertEqual(image_metadata.get('key2'), 'value2')
self.assertEqual(image_metadata.get('user_key1'), 'value1')
self.assertEqual(image_metadata.get('user_key2'), 'value2')
@tags(type='positive', net='no')
def test_set_image_metadata(self):
"""Test user should be able to set the metadata of an image"""
meta = {'key3': 'meta3', 'key4': 'meta4'}
meta = {'user_key3': 'meta3', 'user_key4': 'meta4'}
self.images_client.set_image_metadata(self.image_id, meta)
image_metadata = self.images_client.list_image_metadata(
self.image_id).entity
self.assertEqual(image_metadata.get('key3'), 'meta3')
self.assertEqual(image_metadata.get('key4'), 'meta4')
self.assertNotIn('key1', image_metadata)
self.assertNotIn('key2', image_metadata)
self.assertEqual(image_metadata.get('user_key3'), 'meta3')
self.assertEqual(image_metadata.get('user_key4'), 'meta4')
self.assertNotIn('user_key1', image_metadata)
self.assertNotIn('user_key2', image_metadata)
@tags(type='positive', net='no')
def test_get_image_metadata_item(self):
"""The value for a specific metadata key should be returned"""
meta_resp = self.images_client.get_image_metadata_item(
self.image_id, 'key2')
self.image_id, 'user_key2')
meta_item = meta_resp.entity
self.assertEqual(meta_item.get('key2'), 'value2')
self.assertEqual(meta_item.get('user_key2'), 'value2')
@tags(type='positive', net='no')
def test_delete_image_metadata_item(self):
"""The metadata value/key pair should be deleted from the image"""
self.images_client.delete_image_metadata_item(self.image_id, 'key1')
self.images_client.delete_image_metadata_item(
self.image_id, 'user_key1')
metadata_resp = self.images_client.list_image_metadata(self.image_id)
metadata = metadata_resp.entity
self.assertNotIn('key1', metadata)
self.assertNotIn('user_key1', metadata)

12
cloudroast/compute/integration/identity/test_authentication_required.py
View File

@@ -34,7 +34,7 @@ class TokenRequiredTests(ComputeFixture):
cls.resources.add(cls.server.id, cls.servers_client.delete_server)
image_name = rand_name('testimage')
cls.image_meta = {'key1': 'value1', 'key2': 'value2'}
cls.image_meta = {'user_key1': 'value1', 'user_key2': 'value2'}
image_resp = cls.servers_client.create_image(cls.server.id,
image_name,
cls.image_meta)
@@ -224,7 +224,7 @@ class TokenRequiredTests(ComputeFixture):
@tags(type='negative', net='no')
def test_set_image_metadata_with_invalid_token(self):
with self.assertRaises(Unauthorized):
new_meta = {'meta2': 'data2', 'meta3': 'data3'}
new_meta = {'user_meta2': 'data2', 'user_meta3': 'data3'}
self.images_client.set_image_metadata(
self.image_id, new_meta,
requestslib_kwargs=self.auth_token)
@@ -232,7 +232,7 @@ class TokenRequiredTests(ComputeFixture):
@tags(type='negative', net='no')
def test_update_image_metadata_with_invalid_token(self):
with self.assertRaises(Unauthorized):
new_meta = {'meta2': 'data2', 'meta3': 'data3'}
new_meta = {'user_meta2': 'data2', 'user_meta3': 'data3'}
self.images_client.update_image_metadata(
self.image_id, new_meta,
requestslib_kwargs=self.auth_token)
@@ -241,21 +241,21 @@ class TokenRequiredTests(ComputeFixture):
def test_get_image_metadata_item_with_invalid_token(self):
with self.assertRaises(Unauthorized):
self.images_client.get_image_metadata_item(
self.image_id, 'key1',
self.image_id, 'user_key1',
requestslib_kwargs=self.auth_token)
@tags(type='negative', net='no')
def test_delete_image_metadata_item_with_invalid_token(self):
with self.assertRaises(Unauthorized):
self.images_client.delete_image_metadata_item(
self.image_id, 'key1',
self.image_id, 'user_key1',
requestslib_kwargs=self.auth_token)
@tags(type='negative', net='no')
def test_set_image_metadata_item_with_invalid_token(self):
with self.assertRaises(Unauthorized):
self.images_client.set_image_metadata_item(
self.image_id, 'key1', 'newvalue',
self.image_id, 'user_key1', 'newvalue',
requestslib_kwargs=self.auth_token)

12
cloudroast/compute/integration/identity/test_authorization.py
View File

@@ -40,7 +40,7 @@ class AuthorizationTests(ComputeFixture):
cls.resources.add(cls.server.id, cls.servers_client.delete_server)
image_name = rand_name('testimage')
cls.image_meta = {'key1': 'value1', 'key2': 'value2'}
cls.image_meta = {'user_key1': 'value1', 'user_key2': 'value2'}
image_resp = cls.servers_client.create_image(cls.server.id,
image_name,
cls.image_meta)
@@ -169,29 +169,29 @@ class AuthorizationTests(ComputeFixture):
@tags(type='negative', net='no')
def test_set_image_metadata_unauthorized(self):
with self.assertRaises(ItemNotFound):
new_meta = {'meta2': 'data2', 'meta3': 'data3'}
new_meta = {'user_meta2': 'data2', 'user_meta3': 'data3'}
self.images_client.set_image_metadata(self.image_id, new_meta)
@tags(type='negative', net='no')
def test_update_image_metadata_unauthorized(self):
with self.assertRaises(ItemNotFound):
new_meta = {'meta2': 'data2', 'meta3': 'data3'}
new_meta = {'user_meta2': 'data2', 'user_meta3': 'data3'}
self.images_client.update_image_metadata(self.image_id, new_meta)
@tags(type='negative', net='no')
def test_get_image_metadata_item_unauthorized(self):
with self.assertRaises(ItemNotFound):
self.images_client.get_image_metadata_item(
self.image_id, 'key1')
self.image_id, 'user_key1')
@tags(type='negative', net='no')
def test_delete_image_metadata_item_unauthorized(self):
with self.assertRaises(ItemNotFound):
self.images_client.delete_image_metadata_item(
self.image_id, 'key1')
self.image_id, 'user_key1')
@tags(type='negative', net='no')
def test_set_image_metadata_item_unauthorized(self):
with self.assertRaises(ItemNotFound):
self.images_client.set_image_metadata_item(
self.image_id, 'key1', 'newvalue')
self.image_id, 'user_key1', 'newvalue')