summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-15 11:29:07 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-15 11:29:07 -0500
commitd632e9883ef2fecb74b3bfdc62b8871a2c74ff93 (patch)
tree042f377a08b8b6d1ca7010d94d146e684c780e77 /nova/compute
parent2d4fbd7810f2de97ecf6fcbebb8ead0c52626038 (diff)
updated finish_resize to accept network_info, updated compute and tests in accordance
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index cf9a97b4c..d29c4348c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -597,7 +597,9 @@ class ComputeManager(manager.SchedulerDependentManager):
# reload the updated instance ref
# FIXME(mdietz): is there reload functionality?
instance_ref = self.db.instance_get(context, instance_id)
- self.driver.finish_resize(instance_ref, disk_info)
+ network_info = self.network_api.get_instance_nw_info(context,
+ instance)
+ self.driver.finish_resize(instance_ref, disk_info, network_info)
self.db.migration_update(context, migration_id,
{'status': 'finished', })