Renamed the virt driver resize methods to migration for marginally more understandable code

6 files changed, 27 insertions, 25 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 01a7d195f..78d7f6479 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -723,7 +723,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 local_gb=instance_type['local_gb'],
                 instance_type_id=instance_type['id']))
 
-        self.driver.revert_resize(instance_ref)
+        self.driver.revert_migration(instance_ref)
         self.db.migration_update(context, migration_id,
                 {'status': 'reverted'})
         usage_info = utils.usage_from_instance(instance_ref)
@@ -836,7 +836,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance = self.db.instance_get(context, instance_id)
         network_info = self.network_api.get_instance_nw_info(context,
                                                              instance)
-        self.driver.finish_resize(instance, disk_info, network_info,
+        self.driver.finish_migration(instance, disk_info, network_info,
                                   resize_instance)
 
         self.db.migration_update(context, migration_id,
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index dc3f0596d..352011e52 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -420,7 +420,7 @@ class ComputeTestCase(test.TestCase):
         def fake(*args, **kwargs):
             pass
 
-        self.stubs.Set(self.compute.driver, 'finish_resize', fake)
+        self.stubs.Set(self.compute.driver, 'finish_migration', fake)
         self.stubs.Set(self.compute.network_api, 'get_instance_nw_info', fake)
         context = self.context.elevated()
         instance_id = self._create_instance()
@@ -527,8 +527,8 @@ class ComputeTestCase(test.TestCase):
         def fake(*args, **kwargs):
             pass
 
-        self.stubs.Set(self.compute.driver, 'finish_resize', fake)
-        self.stubs.Set(self.compute.driver, 'revert_resize', fake)
+        self.stubs.Set(self.compute.driver, 'finish_migration', fake)
+        self.stubs.Set(self.compute.driver, 'revert_migration', fake)
         self.stubs.Set(self.compute.network_api, 'get_instance_nw_info', fake)
 
         self.compute.run_instance(self.context, instance_id)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index be263d17c..9f203c477 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -783,7 +783,7 @@ class XenAPIMigrateInstance(test.TestCase):
         conn = xenapi_conn.get_connection(False)
         conn.migrate_disk_and_power_off(instance, '127.0.0.1')
 
-    def test_finish_resize(self):
+    def test_finish_migrate(self):
         instance = db.instance_create(self.context, self.values)
         self.called = False
 
@@ -809,7 +809,7 @@ class XenAPIMigrateInstance(test.TestCase):
                            'label': 'fake',
                            'mac': 'DE:AD:BE:EF:00:00',
                            'rxtx_cap': 3})]
-        conn.finish_resize(instance, dict(base_copy='hurr', cow='durr'),
+        conn.finish_migration(instance, dict(base_copy='hurr', cow='durr'),
                            network_info, resize_instance=True)
         self.assertEqual(self.called, True)
 
@@ -841,7 +841,7 @@ class XenAPIMigrateInstance(test.TestCase):
                            'label': 'fake',
                            'mac': 'DE:AD:BE:EF:00:00',
                            'rxtx_cap': 3})]
-        conn.finish_resize(instance, dict(base_copy='hurr', cow='durr'),
+        conn.finish_migration(instance, dict(base_copy='hurr', cow='durr'),
                            network_info, resize_instance=True)
 
     def test_finish_migrate_no_resize_vdi(self):
@@ -871,7 +871,7 @@ class XenAPIMigrateInstance(test.TestCase):
                            'rxtx_cap': 3})]
 
         # Resize instance would be determined by the compute call
-        conn.finish_resize(instance, dict(base_copy='hurr', cow='durr'),
+        conn.finish_migration(instance, dict(base_copy='hurr', cow='durr'),
                            network_info, resize_instance=False)
 
 
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 178279d31..59582d253 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -122,11 +122,11 @@ class ComputeDriver(object):
         """Create snapshot from a running VM instance."""
         raise NotImplementedError()
 
-    def finish_resize(self, instance, disk_info):
+    def finish_migration(self, instance, disk_info):
         """Completes a resize, turning on the migrated instance"""
         raise NotImplementedError()
 
-    def revert_resize(self, instance):
+    def revert_migration(self, instance):
         """Reverts a resize, powering back on the instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index aec14f880..008feea0a 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -106,18 +106,19 @@ class VMOps(object):
                 instance_infos.append(instance_info)
         return instance_infos
 
-    def revert_resize(self, instance):
+    def revert_migration(self, instance):
         vm_ref = VMHelper.lookup(self._session, instance.name)
         self._start(instance, vm_ref)
 
-    def finish_resize(self, instance, disk_info, network_info,
+    def finish_migration(self, instance, disk_info, network_info,
                       resize_instance):
         vdi_uuid = self.link_disks(instance, disk_info['base_copy'],
                 disk_info['cow'])
         vm_ref = self._create_vm(instance,
                                  [dict(vdi_type='os', vdi_uuid=vdi_uuid)],
                                  network_info)
-        self.resize_instance(instance, vdi_uuid, resize_instance)
+        if resize_instance:
+            self.resize_instance(instance, vdi_uuid, resize_instance)
         self._spawn(instance, vm_ref)
 
     def _start(self, instance, vm_ref=None):
@@ -572,16 +573,17 @@ class VMOps(object):
         #The new disk size must be in bytes
 
         new_disk_size = instance.local_gb * 1024 * 1024 * 1024
-        instance_name = instance.name
-        instance_local_gb = instance.local_gb
-        LOG.debug(_("Resizing VDI %(vdi_uuid)s for instance %(instance_name)s."
-                " Expanding to %(instance_local_gb)d GB") % locals())
-        vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
-        # for an instance with no local storage
-        if resize_instance and new_disk_size > 0:
+        if new_disk_size > 0:
+            instance_name = instance.name
+            instance_local_gb = instance.local_gb
+            LOG.debug(_("Resizing VDI %(vdi_uuid)s for instance"
+                        "%(instance_name)s. Expanding to %(instance_local_gb)d"
+                        " GB") % locals())
+            vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
+            # for an instance with no local storage
             self._session.call_xenapi('VDI.resize_online', vdi_ref,
                     str(new_disk_size))
-        LOG.debug(_("Resize instance %s complete") % (instance.name))
+            LOG.debug(_("Resize instance %s complete") % (instance.name))
 
     def reboot(self, instance):
         """Reboot VM instance."""
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 18654d7e5..0e86d9e76 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -198,14 +198,14 @@ class XenAPIConnection(driver.ComputeDriver):
         """Create VM instance"""
         self._vmops.spawn(instance, network_info)
 
-    def revert_resize(self, instance):
+    def revert_migration(self, instance):
         """Reverts a resize, powering back on the instance"""
         self._vmops.revert_resize(instance)
 
-    def finish_resize(self, instance, disk_info, network_info,
+    def finish_migration(self, instance, disk_info, network_info,
                       resize_instance=False):
         """Completes a resize, turning on the migrated instance"""
-        self._vmops.finish_resize(instance, disk_info, network_info,
+        self._vmops.finish_migration(instance, disk_info, network_info,
                                   resize_instance)
 
     def snapshot(self, instance, image_id):