openstack
/
nova
Code Issues Proposed changes

Merge "Capture bandwidth usage data before resize."

This commit is contained in:
Jenkins 2012-02-02 20:09:03 +00:00 committed by Gerrit Code Review
parent 2494b2d925 3b741bad7a
commit ed516883fa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/compute/manager.py
View File

@ -1181,6 +1181,7 @@ class ComputeManager(manager.SchedulerDependentManager):
instance_ref = self.db.instance_get_by_uuid(context, instance_uuid)
compute_utils.notify_usage_exists(instance_ref, current_period=True)
self._notify_about_instance_usage(instance_ref, "resize.prep.start")
same_host = instance_ref['host'] == FLAGS.host

7
nova/tests/test_compute.py
View File

@ -1036,11 +1036,14 @@ class ComputeTestCase(BaseTestCase):
instance_uuid,
'pre-migrating')
self.assertEquals(len(test_notifier.NOTIFICATIONS), 2)
self.assertEquals(len(test_notifier.NOTIFICATIONS), 3)
msg = test_notifier.NOTIFICATIONS[0]
self.assertEquals(msg['event_type'],
'compute.instance.resize.prep.start')
'compute.instance.exists')
msg = test_notifier.NOTIFICATIONS[1]
self.assertEquals(msg['event_type'],
'compute.instance.resize.prep.start')
msg = test_notifier.NOTIFICATIONS[2]
self.assertEquals(msg['event_type'],
'compute.instance.resize.prep.end')
self.assertEquals(msg['priority'], 'INFO')