From aac07e1f01ffd8fe8c31bbd4c43bb3167fdeed8d Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 3 Apr 2017 17:18:04 -0400 Subject: [PATCH] Remove unused migrate_data kwarg from virt driver destroy() method The migrate_data kwarg was added to the virt driver destroy() method in change bc45c56f102cdef58840e02b609a89f5278e8cce but was never actually used, i.e. nothing passes migrate_data to the destroy() method. The compute manager passes migrate_data to the cleanup() method. This change just removes the unused kwarg so it's not confusing for new virt drivers like powervm. Change-Id: I6cca3b5ddd387dac86750be70f49c764a1be2fca --- nova/tests/unit/virt/hyperv/test_driver.py | 2 +- nova/tests/unit/virt/libvirt/test_driver.py | 6 ++---- nova/virt/driver.py | 3 +-- nova/virt/fake.py | 2 +- nova/virt/hyperv/driver.py | 2 +- nova/virt/ironic/driver.py | 4 +--- nova/virt/libvirt/driver.py | 4 ++-- nova/virt/powervm/driver.py | 3 +-- nova/virt/vmwareapi/driver.py | 2 +- nova/virt/xenapi/driver.py | 2 +- 10 files changed, 12 insertions(+), 18 deletions(-) diff --git a/nova/tests/unit/virt/hyperv/test_driver.py b/nova/tests/unit/virt/hyperv/test_driver.py index c1f1dfb7ab4d..f0db623b51f4 100644 --- a/nova/tests/unit/virt/hyperv/test_driver.py +++ b/nova/tests/unit/virt/hyperv/test_driver.py @@ -162,7 +162,7 @@ class HyperVDriverTestCase(test_base.HyperVBaseTestCase): self.driver.destroy( mock.sentinel.context, mock.sentinel.instance, mock.sentinel.network_info, mock.sentinel.block_device_info, - mock.sentinel.destroy_disks, mock.sentinel.migrate_data) + mock.sentinel.destroy_disks) self.driver._vmops.destroy.assert_called_once_with( mock.sentinel.instance, mock.sentinel.network_info, diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 261f73d61d0e..74d3d25681ea 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -11430,8 +11430,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): mock_domain_destroy.assert_called_once_with() mock_teardown_container.assert_called_once_with(instance) mock_cleanup.assert_called_once_with(self.context, instance, - network_info, None, False, - None) + network_info, None, False) @mock.patch.object(libvirt_driver.LibvirtDriver, 'cleanup') @mock.patch.object(libvirt_driver.LibvirtDriver, '_teardown_container') @@ -11451,8 +11450,7 @@ class LibvirtConnTestCase(test.NoDBTestCase): mock.call(instance)]) mock_teardown_container.assert_called_once_with(instance) mock_cleanup.assert_called_once_with(self.context, instance, - network_info, None, False, - None) + network_info, None, False) def test_reboot_different_ids(self): class FakeLoopingCall(object): diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 07d0b941e660..437e1ab32d93 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -288,7 +288,7 @@ class ComputeDriver(object): raise NotImplementedError() def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): """Destroy the specified instance from the Hypervisor. If the instance is not found (for example if networking failed), this @@ -301,7 +301,6 @@ class ComputeDriver(object): :param block_device_info: Information about block devices that should be detached from the instance. :param destroy_disks: Indicates if disks should be destroyed - :param migrate_data: implementation specific params """ raise NotImplementedError() diff --git a/nova/virt/fake.py b/nova/virt/fake.py index 1a4d5bec6852..00a10d80ab8e 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -264,7 +264,7 @@ class FakeDriver(driver.ComputeDriver): pass def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): key = instance.uuid if key in self.instances: flavor = instance.flavor diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py index 452481ea9813..62ff6e6e4946 100644 --- a/nova/virt/hyperv/driver.py +++ b/nova/virt/hyperv/driver.py @@ -158,7 +158,7 @@ class HyperVDriver(driver.ComputeDriver): self._vmops.reboot(instance, network_info, reboot_type) def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): self._vmops.destroy(instance, network_info, block_device_info, destroy_disks) diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 52603de9e615..79585d2b07f3 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -1024,7 +1024,7 @@ class IronicDriver(virt_driver.ComputeDriver): timer.start(interval=CONF.ironic.api_retry_interval).wait() def destroy(self, context, instance, network_info, - block_device_info=None, destroy_disks=True, migrate_data=None): + block_device_info=None, destroy_disks=True): """Destroy the specified instance, if it can be found. :param context: The security context. @@ -1034,8 +1034,6 @@ class IronicDriver(virt_driver.ComputeDriver): information. Ignored by this driver. :param destroy_disks: Indicates if disks should be destroyed. Ignored by this driver. - :param migrate_data: implementation specific params. - Ignored by this driver. """ LOG.debug('Destroy called for instance', instance=instance) try: diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index bd0f8c27706e..3229270a4459 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -900,10 +900,10 @@ class LibvirtDriver(driver.ComputeDriver): self._teardown_container(instance) def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): self._destroy(instance) self.cleanup(context, instance, network_info, block_device_info, - destroy_disks, migrate_data) + destroy_disks) def _undefine_domain(self, instance): try: diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index ce19e46c7f84..a9d703b87db7 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -167,7 +167,7 @@ class PowerVMDriver(driver.ComputeDriver): tf_base.run(flow_spawn, instance=instance) def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): """Destroy the specified instance from the Hypervisor. If the instance is not found (for example if networking failed), this @@ -180,7 +180,6 @@ class PowerVMDriver(driver.ComputeDriver): :param block_device_info: Information about block devices that should be detached from the instance. :param destroy_disks: Indicates if disks should be destroyed - :param migrate_data: implementation specific params """ # TODO(thorst, efried) Add resize checks for destroy self._log_operation('destroy', instance) diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 5b0e1bce0c63..06ade4e4ac76 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -377,7 +377,7 @@ class VMwareVCDriver(driver.ComputeDriver): instance=instance) def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): """Destroy VM instance.""" # Destroy gets triggered when Resource Claim in resource_tracker diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 037620f27e09..5403a69f0ce1 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -222,7 +222,7 @@ class XenAPIDriver(driver.ComputeDriver): self._vmops.change_instance_metadata(instance, diff) def destroy(self, context, instance, network_info, block_device_info=None, - destroy_disks=True, migrate_data=None): + destroy_disks=True): """Destroy VM instance.""" self._vmops.destroy(instance, network_info, block_device_info, destroy_disks)