x/gantt
Code Issues Proposed changes

Log the URL to an image_ref and not just the ID.

Browse Source 
Change-Id: Iaae6b969d9ef3cd0f50dd3297d4b0bb51f61f5c9
This commit is contained in:
Josh Kearney
2011-11-14 15:30:14 -06:00
parent edb63909ae
commit 195759ab60
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_compute.py
View File

@@ -426,7 +426,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload) self.assertTrue('launched_at' in payload)
self.assertTrue(payload['launched_at']) 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) self.compute.terminate_instance(self.context, instance_id)
def test_terminate_usage_notification(self): def test_terminate_usage_notification(self):
@@ -455,7 +456,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload) self.assertTrue('display_name' in payload)
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_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): def test_run_instance_existing(self):
"""Ensure failure when running an instance that already exists""" """Ensure failure when running an instance that already exists"""
@@ -582,7 +584,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload) self.assertTrue('display_name' in payload)
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_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) self.compute.terminate_instance(context, instance_id)
def test_resize_instance(self): def test_resize_instance(self):

3
nova/tests/test_compute_utils.py
View File

@@ -91,5 +91,6 @@ class UsageInfoTestCase(test.TestCase):
'audit_period_ending'): 'audit_period_ending'):
self.assertTrue(attr in payload, self.assertTrue(attr in payload,
msg="Key %s not in payload" % attr) 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) self.compute.terminate_instance(self.context, instance_id)

5
nova/utils.py
View File

@@ -337,6 +337,9 @@ def current_audit_period(unit=None):
def usage_from_instance(instance_ref, **kw): def usage_from_instance(instance_ref, **kw):
image_ref_url = "%s/images/%s" % (generate_glance_url(),
instance_ref['image_ref'])
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'],
@@ -347,7 +350,7 @@ def usage_from_instance(instance_ref, **kw):
created_at=str(instance_ref['created_at']), created_at=str(instance_ref['created_at']),
launched_at=str(instance_ref['launched_at']) \ launched_at=str(instance_ref['launched_at']) \
if instance_ref['launched_at'] else '', if instance_ref['launched_at'] else '',
image_ref=instance_ref['image_ref'], image_ref_url=image_ref_url,
state=instance_ref['vm_state'], state=instance_ref['vm_state'],
state_description=instance_ref['task_state'] \ state_description=instance_ref['task_state'] \
if instance_ref['task_state'] else '', if instance_ref['task_state'] else '',