openstack/deb-ceilometer
Code Issues Proposed changes

fix typo in instance properties list

Browse Source 
Change-Id: Ib09f4ab8db06d024ff863b54702a36f6ef77698b
This commit is contained in:
Doug Hellmann 2012-06-26 16:36:58 -04:00
parent 77958016aa
commit 158ed6b568
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/compute/instance.py
View File

@ -23,7 +23,7 @@ INSTANCE_PROPERTIES = [
'display_name', 'display_name',
'reservation_id', 'reservation_id',
# Type properties # Type properties
'architecture' 'architecture',
# Location properties # Location properties
'availability_zone', 'availability_zone',
# Image properties # Image properties

22
tests/compute/test_instance.py
View File

@ -29,13 +29,29 @@ from ceilometer.agent import manager
class TestLocationMetadata(test.TestCase): class TestLocationMetadata(test.TestCase):
INSTANCE_PROPERTIES = {'display_name': 'display name',
'reservation_id': 'reservation id',
'architecture': 'x86_64',
'availability_zone': 'zone1',
'image_ref': 'image ref',
'image_ref_url': 'image ref url',
'kernel_id': 'kernel id',
'os_type': 'linux',
'ramdisk_id': 'ramdisk id',
'disk_gb': 10,
'ephemeral_gb': 7,
'memory_mb': 2048,
'root_gb': 3,
'vcpus': 1,
}
def setUp(self): def setUp(self):
self.context = context.RequestContext('admin', 'admin', is_admin=True) self.context = context.RequestContext('admin', 'admin', is_admin=True)
self.manager = manager.AgentManager() self.manager = manager.AgentManager()
super(TestLocationMetadata, self).setUp() super(TestLocationMetadata, self).setUp()
self.instance = db.instance_create(self.context, {}) self.instance = db.instance_create(self.context, self.INSTANCE_PROPERTIES)
def test_metadata(self): def test_metadata(self):
md = instance.get_metadata_from_dbobject(self.instance) md = instance.get_metadata_from_dbobject(self.instance)
for name in instance.INSTANCE_PROPERTIES: for name in self.INSTANCE_PROPERTIES.keys():
assert name in md assert md[name] == self.INSTANCE_PROPERTIES[name]