diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-01 15:06:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-01 15:06:08 +0000 |
| commit | e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f (patch) | |
| tree | c72601aa0c8b7c8a57d0e1495ee010ac3839b554 | |
| parent | d4b0c0615f3c5d83d425619ceb400793524e5949 (diff) | |
| parent | b04d71f5418b7717cc7c55b0780108c8cef7c253 (diff) | |
| download | nova-e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f.tar.gz nova-e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f.tar.xz nova-e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f.zip | |
Merge "Fixes lp883279"
| -rw-r--r-- | nova/tests/test_compute.py | 8 | ||||
| -rw-r--r-- | nova/tests/test_compute_utils.py | 2 | ||||
| -rw-r--r-- | nova/utils.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 7faf81602..addb6084d 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -496,13 +496,14 @@ class ComputeTestCase(test.TestCase): instance_id = self._create_instance() self.compute.run_instance(self.context, instance_id) self.assertEquals(len(test_notifier.NOTIFICATIONS), 1) + inst_ref = db.instance_get(self.context, instance_id) msg = test_notifier.NOTIFICATIONS[0] self.assertEquals(msg['priority'], 'INFO') self.assertEquals(msg['event_type'], 'compute.instance.create') payload = msg['payload'] self.assertEquals(payload['tenant_id'], self.project_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') type_id = instance_types.get_instance_type_by_name('m1.tiny')['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): """Ensure terminate_instance generates apropriate usage notification""" instance_id = self._create_instance() + inst_ref = db.instance_get(self.context, instance_id) self.compute.run_instance(self.context, instance_id) test_notifier.NOTIFICATIONS = [] self.compute.terminate_instance(self.context, instance_id) @@ -530,7 +532,7 @@ class ComputeTestCase(test.TestCase): payload = msg['payload'] self.assertEquals(payload['tenant_id'], self.project_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') type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) @@ -613,7 +615,7 @@ class ComputeTestCase(test.TestCase): payload = msg['payload'] self.assertEquals(payload['tenant_id'], self.project_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') type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py index 0baa6ef87..a70e7f5b0 100644 --- a/nova/tests/test_compute_utils.py +++ b/nova/tests/test_compute_utils.py @@ -85,7 +85,7 @@ class UsageInfoTestCase(test.TestCase): payload = msg['payload'] self.assertEquals(payload['tenant_id'], self.project_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') type_id = instance_types.get_instance_type_by_name('m1.tiny')['id'] self.assertEquals(str(payload['instance_type_id']), str(type_id)) diff --git a/nova/utils.py b/nova/utils.py index ad585ba1c..9a01a6fb8 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -339,7 +339,7 @@ def usage_from_instance(instance_ref, **kw): usage_info = dict( tenant_id=instance_ref['project_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_id=instance_ref['instance_type_id'], display_name=instance_ref['display_name'], |