summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-26 19:44:21 +0000
committerGerrit Code Review <review@openstack.org>2012-10-26 19:44:21 +0000
commit1d8225bbb2d6c171ea5a393e0714a4f91ed6880d (patch)
tree5f02f263c7e2615c96df5ebb18537d9e2a80131d
parent833eb29705e8f52692c64cfb1af3725d3780fead (diff)
parentf46911966d69bf64065270f4e7e1049e7bbe05c4 (diff)
downloadnova-1d8225bbb2d6c171ea5a393e0714a4f91ed6880d.tar.gz
nova-1d8225bbb2d6c171ea5a393e0714a4f91ed6880d.tar.xz
nova-1d8225bbb2d6c171ea5a393e0714a4f91ed6880d.zip
Merge "Send usage event on revert_resize"
-rw-r--r--nova/compute/manager.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 17e11aa5e..030bace1e 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1474,6 +1474,12 @@ class ComputeManager(manager.SchedulerDependentManager):
"""
context = context.elevated()
migration_ref = self.db.migration_get(context, migration_id)
+
+ # NOTE(comstud): A revert_resize is essentially a resize back to
+ # the old size, so we need to send a usage event here.
+ compute_utils.notify_usage_exists(
+ context, instance, current_period=True)
+
with self._error_out_instance_on_exception(context, instance['uuid'],
reservations):
# NOTE(tr3buchet): tear down networks on destination host