diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-15 17:50:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-15 17:50:32 +0000 |
| commit | 4dd21a3501d975b08fc650a033d84ef5c2e5eeef (patch) | |
| tree | ba7f54e6a968da23aaef7bbc40891bc38a0fa78e /nova | |
| parent | f2fc0929d29c5722aa479911706f2294d6876b91 (diff) | |
| parent | e105c53e67febefc0ae7e78baf53020d2b29c298 (diff) | |
| download | nova-4dd21a3501d975b08fc650a033d84ef5c2e5eeef.tar.gz nova-4dd21a3501d975b08fc650a033d84ef5c2e5eeef.tar.xz nova-4dd21a3501d975b08fc650a033d84ef5c2e5eeef.zip | |
Merge "Log the URL to an image_ref and not just the ID."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_compute.py | 9 | ||||
| -rw-r--r-- | nova/tests/test_compute_utils.py | 3 | ||||
| -rw-r--r-- | nova/utils.py | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 6ecf1a0f0..e003f96a0 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -426,7 +426,8 @@ class ComputeTestCase(BaseTestCase): self.assertTrue('created_at' in payload) self.assertTrue('launched_at' in payload) self.assertTrue(payload['launched_at']) - self.assertEquals(payload['image_ref'], '1') + image_ref_url = "%s/images/1" % utils.generate_glance_url() + self.assertEquals(payload['image_ref_url'], image_ref_url) self.compute.terminate_instance(self.context, instance_id) def test_terminate_usage_notification(self): @@ -455,7 +456,8 @@ class ComputeTestCase(BaseTestCase): self.assertTrue('display_name' in payload) self.assertTrue('created_at' in payload) self.assertTrue('launched_at' in payload) - self.assertEquals(payload['image_ref'], '1') + image_ref_url = "%s/images/1" % utils.generate_glance_url() + self.assertEquals(payload['image_ref_url'], image_ref_url) def test_run_instance_existing(self): """Ensure failure when running an instance that already exists""" @@ -582,7 +584,8 @@ class ComputeTestCase(BaseTestCase): self.assertTrue('display_name' in payload) self.assertTrue('created_at' in payload) self.assertTrue('launched_at' in payload) - self.assertEquals(payload['image_ref'], '1') + image_ref_url = "%s/images/1" % utils.generate_glance_url() + self.assertEquals(payload['image_ref_url'], image_ref_url) self.compute.terminate_instance(context, instance_id) def test_resize_instance(self): diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py index 12b98aa0b..a9c149108 100644 --- a/nova/tests/test_compute_utils.py +++ b/nova/tests/test_compute_utils.py @@ -91,5 +91,6 @@ class UsageInfoTestCase(test.TestCase): 'audit_period_ending'): self.assertTrue(attr in payload, msg="Key %s not in payload" % attr) - self.assertEquals(payload['image_ref'], '1') + image_ref_url = "%s/images/1" % utils.generate_glance_url() + self.assertEquals(payload['image_ref_url'], image_ref_url) self.compute.terminate_instance(self.context, instance_id) diff --git a/nova/utils.py b/nova/utils.py index ad0d5725d..7723837c9 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -337,6 +337,9 @@ def current_audit_period(unit=None): def usage_from_instance(instance_ref, **kw): + image_ref_url = "%s/images/%s" % (generate_glance_url(), + instance_ref['image_ref']) + usage_info = dict( tenant_id=instance_ref['project_id'], user_id=instance_ref['user_id'], @@ -347,7 +350,7 @@ def usage_from_instance(instance_ref, **kw): created_at=str(instance_ref['created_at']), launched_at=str(instance_ref['launched_at']) \ if instance_ref['launched_at'] else '', - image_ref=instance_ref['image_ref'], + image_ref_url=image_ref_url, state=instance_ref['vm_state'], state_description=instance_ref['task_state'] \ if instance_ref['task_state'] else '', |