summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatt.dietz@rackspace.com <>2011-07-27 11:10:35 -0700
committermatt.dietz@rackspace.com <>2011-07-27 11:10:35 -0700
commit66cf558f1497a1b917fb3db7a61826aefbd6af2e (patch)
tree5a78d3ee2f6ded47c341e5a23e3a97351be98a4e
parentf67ffed5fc42a1234ccbf0909bd7326c5a06307e (diff)
Fixed the virt driver base
-rw-r--r--nova/virt/driver.py3
-rw-r--r--nova/virt/xenapi_conn.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 59582d253..87d73150f 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -122,7 +122,8 @@ class ComputeDriver(object):
"""Create snapshot from a running VM instance."""
raise NotImplementedError()
- def finish_migration(self, instance, disk_info):
+ def finish_migration(self, instance, disk_info, network_info,
+ resize_instance):
"""Completes a resize, turning on the migrated instance"""
raise NotImplementedError()
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 0e86d9e76..c6b34864b 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -203,7 +203,7 @@ class XenAPIConnection(driver.ComputeDriver):
self._vmops.revert_resize(instance)
def finish_migration(self, instance, disk_info, network_info,
- resize_instance=False):
+ resize_instance=False):
"""Completes a resize, turning on the migrated instance"""
self._vmops.finish_migration(instance, disk_info, network_info,
resize_instance)