openstack/aodh
Code Issues Proposed changes

Merge "Fix image_id in instance resource metadata"

Browse Source
This commit is contained in:
Jenkins 2012-12-20 10:15:18 +00:00 committed by Gerrit Code Review
commit 26a3886f6a
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/compute/instance.py
View File

@ -25,9 +25,6 @@ INSTANCE_PROPERTIES = [
'architecture', 'architecture',
# Location properties # Location properties
'availability_zone', 'availability_zone',
# Image properties
'image_ref',
'image_ref_url',
'kernel_id', 'kernel_id',
'os_type', 'os_type',
'ramdisk_id', 'ramdisk_id',
@ -48,6 +45,10 @@ def get_metadata_from_object(instance):
'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''), 'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''),
'instance_type': (instance.flavor['id'] if instance.flavor else None), 'instance_type': (instance.flavor['id'] if instance.flavor else None),
'host': instance.hostId, 'host': instance.hostId,
# Image properties
'image_ref': (instance.image['id'] if instance.image else None),
'image_ref_url': (instance.image['links'][0]['href']
if instance.image else None),
} }
for name in INSTANCE_PROPERTIES: for name in INSTANCE_PROPERTIES:

28
tests/compute/test_instance.py
View File

@ -44,14 +44,16 @@ class FauxInstance(object):
class TestLocationMetadata(unittest.TestCase): class TestLocationMetadata(unittest.TestCase):
def setUp(self):
self.manager = manager.AgentManager()
super(TestLocationMetadata, self).setUp()
# Mimics an instance returned from nova api call # Mimics an instance returned from nova api call
INSTANCE_PROPERTIES = {'name': 'display name', self.INSTANCE_PROPERTIES = {'name': 'display name',
'OS-EXT-SRV-ATTR:instance_name': 'instance-000001', 'OS-EXT-SRV-ATTR:instance_name': 'instance-000001',
'reservation_id': 'reservation id', 'reservation_id': 'reservation id',
'architecture': 'x86_64', 'architecture': 'x86_64',
'availability_zone': 'zone1', 'availability_zone': 'zone1',
'image_ref': 'image ref',
'image_ref_url': 'image ref url',
'kernel_id': 'kernel id', 'kernel_id': 'kernel id',
'os_type': 'linux', 'os_type': 'linux',
'ramdisk_id': 'ramdisk id', 'ramdisk_id': 'ramdisk id',
@ -60,13 +62,14 @@ class TestLocationMetadata(unittest.TestCase):
'memory_mb': 2048, 'memory_mb': 2048,
'root_gb': 3, 'root_gb': 3,
'vcpus': 1, 'vcpus': 1,
'image': {'id': 1,
'links': [{"rel": "bookmark",
'href': 2}],
},
'flavor': {'id': 1}, 'flavor': {'id': 1},
'hostId': '1234-5678' 'hostId': '1234-5678',
} }
def setUp(self):
self.manager = manager.AgentManager()
super(TestLocationMetadata, self).setUp()
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES) self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
self.instance.host = 'made-up-hostname' self.instance.host = 'made-up-hostname'
m = mock.MagicMock() m = mock.MagicMock()
@ -87,5 +90,16 @@ class TestLocationMetadata(unittest.TestCase):
assert actual == iprops['name'] assert actual == iprops['name']
elif name == 'instance_type': elif name == 'instance_type':
assert actual == iprops['flavor']['id'] assert actual == iprops['flavor']['id']
elif name == 'image_ref':
assert actual == iprops['image']['id']
elif name == 'image_ref_url':
assert actual == iprops['image']['links'][0]['href']
else: else:
assert actual == iprops[name] assert actual == iprops[name]
def test_metadata_empty_image(self):
self.INSTANCE_PROPERTIES['image'] = ''
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
md = instance.get_metadata_from_object(self.instance)
assert md['image_ref'] == None
assert md['image_ref_url'] == None