x/gantt
Code Issues Proposed changes

Fixes lp883279

Browse Source 
Nova sending instance_id in notifications instead of uuids

Change-Id: I411ea1a9aee53af4ee8cb4b1118dc41549c80227
This commit is contained in:
Matt Dietz
2011-10-28 16:40:54 -05:00
parent 514ccbbfbd
commit 7b503e30d3
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/test_compute.py
View File

@@ -496,13 +496,14 @@ class ComputeTestCase(test.TestCase):
instance_id = self._create_instance() instance_id = self._create_instance()
self.compute.run_instance(self.context, instance_id) self.compute.run_instance(self.context, instance_id)
self.assertEquals(len(test_notifier.NOTIFICATIONS), 1) self.assertEquals(len(test_notifier.NOTIFICATIONS), 1)
inst_ref = db.instance_get(self.context, instance_id)
msg = test_notifier.NOTIFICATIONS[0] msg = test_notifier.NOTIFICATIONS[0]
self.assertEquals(msg['priority'], 'INFO') self.assertEquals(msg['priority'], 'INFO')
self.assertEquals(msg['event_type'], 'compute.instance.create') self.assertEquals(msg['event_type'], 'compute.instance.create')
payload = msg['payload'] payload = msg['payload']
self.assertEquals(payload['tenant_id'], self.project_id) self.assertEquals(payload['tenant_id'], self.project_id)
self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['user_id'], self.user_id)
self.assertEquals(payload['instance_id'], instance_id) self.assertEquals(payload['instance_id'], inst_ref.uuid)
self.assertEquals(payload['instance_type'], 'm1.tiny') self.assertEquals(payload['instance_type'], 'm1.tiny')
type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertEquals(str(payload['instance_type_id']), str(type_id))
@@ -515,6 +516,7 @@ class ComputeTestCase(test.TestCase):
def test_terminate_usage_notification(self): def test_terminate_usage_notification(self):
"""Ensure terminate_instance generates apropriate usage notification""" """Ensure terminate_instance generates apropriate usage notification"""
instance_id = self._create_instance() instance_id = self._create_instance()
inst_ref = db.instance_get(self.context, instance_id)
self.compute.run_instance(self.context, instance_id) self.compute.run_instance(self.context, instance_id)
test_notifier.NOTIFICATIONS = [] test_notifier.NOTIFICATIONS = []
self.compute.terminate_instance(self.context, instance_id) self.compute.terminate_instance(self.context, instance_id)
@@ -530,7 +532,7 @@ class ComputeTestCase(test.TestCase):
payload = msg['payload'] payload = msg['payload']
self.assertEquals(payload['tenant_id'], self.project_id) self.assertEquals(payload['tenant_id'], self.project_id)
self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['user_id'], self.user_id)
self.assertEquals(payload['instance_id'], instance_id) self.assertEquals(payload['instance_id'], inst_ref.uuid)
self.assertEquals(payload['instance_type'], 'm1.tiny') self.assertEquals(payload['instance_type'], 'm1.tiny')
type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertEquals(str(payload['instance_type_id']), str(type_id))
@@ -613,7 +615,7 @@ class ComputeTestCase(test.TestCase):
payload = msg['payload'] payload = msg['payload']
self.assertEquals(payload['tenant_id'], self.project_id) self.assertEquals(payload['tenant_id'], self.project_id)
self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['user_id'], self.user_id)
self.assertEquals(payload['instance_id'], instance_id) self.assertEquals(payload['instance_id'], inst_ref.uuid)
self.assertEquals(payload['instance_type'], 'm1.tiny') self.assertEquals(payload['instance_type'], 'm1.tiny')
type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertEquals(str(payload['instance_type_id']), str(type_id))

2
nova/tests/test_compute_utils.py
View File

@@ -85,7 +85,7 @@ class UsageInfoTestCase(test.TestCase):
payload = msg['payload'] payload = msg['payload']
self.assertEquals(payload['tenant_id'], self.project_id) self.assertEquals(payload['tenant_id'], self.project_id)
self.assertEquals(payload['user_id'], self.user_id) self.assertEquals(payload['user_id'], self.user_id)
self.assertEquals(payload['instance_id'], instance_id) self.assertEquals(payload['instance_id'], instance.uuid)
self.assertEquals(payload['instance_type'], 'm1.tiny') self.assertEquals(payload['instance_type'], 'm1.tiny')
type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
self.assertEquals(str(payload['instance_type_id']), str(type_id)) self.assertEquals(str(payload['instance_type_id']), str(type_id))

2
nova/utils.py
View File

@@ -339,7 +339,7 @@ def usage_from_instance(instance_ref, **kw):
usage_info = dict( usage_info = dict(
tenant_id=instance_ref['project_id'], tenant_id=instance_ref['project_id'],
user_id=instance_ref['user_id'], user_id=instance_ref['user_id'],
instance_id=instance_ref['id'], instance_id=instance_ref['uuid'],
instance_type=instance_ref['instance_type']['name'], instance_type=instance_ref['instance_type']['name'],
instance_type_id=instance_ref['instance_type_id'], instance_type_id=instance_ref['instance_type_id'],
display_name=instance_ref['display_name'], display_name=instance_ref['display_name'],