diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-02 20:09:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-02 20:09:03 +0000 |
| commit | ed516883faca1976acd6e5a9476d447d39e11ab9 (patch) | |
| tree | 0dbcc91d8abe0e8b26a38915b726c855f41fc0cf | |
| parent | 2494b2d925a8fd161999b4d59b6831498c7ae62f (diff) | |
| parent | 3b741bad7a961ad8f2ec9e52614d49fdf961bdb6 (diff) | |
| download | nova-ed516883faca1976acd6e5a9476d447d39e11ab9.tar.gz nova-ed516883faca1976acd6e5a9476d447d39e11ab9.tar.xz nova-ed516883faca1976acd6e5a9476d447d39e11ab9.zip | |
Merge "Capture bandwidth usage data before resize."
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_compute.py | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 8fc4f16a1..57026d635 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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 diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 54137a55c..400e6949f 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1036,12 +1036,15 @@ 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') payload = msg['payload'] |