diff --git a/nova_powervm/tests/virt/powervm/test_driver.py b/nova_powervm/tests/virt/powervm/test_driver.py index e87f993c..c08f23ba 100644 --- a/nova_powervm/tests/virt/powervm/test_driver.py +++ b/nova_powervm/tests/virt/powervm/test_driver.py @@ -2068,13 +2068,16 @@ class TestPowerVMDriver(test.NoDBTestCase): mock_power_off.assert_called_once_with( self.drv.adapter, self.inst, force_immediate=False, timeout=500) + @mock.patch('nova_powervm.virt.powervm.driver.' + 'PowerVMDriver._get_block_device_info') @mock.patch('nova_powervm.virt.powervm.driver.PowerVMDriver._destroy') - def test_confirm_migration_diff_host(self, mock_destroy): + def test_confirm_migration_diff_host(self, mock_destroy, + mock_block_device_info): mock_mig = mock.Mock(source_compute='host1', dest_compute='host2') self.drv.confirm_migration('context', mock_mig, self.lpm_inst, - 'network_info') + mock_block_device_info, 'network_info') mock_destroy.assert_called_once_with( - 'context', self.lpm_inst, block_device_info=None, + 'context', self.lpm_inst, mock_block_device_info, destroy_disks=False, shutdown=False) @mock.patch('nova_powervm.virt.powervm.vm.rename', autospec=True) diff --git a/nova_powervm/virt/powervm/driver.py b/nova_powervm/virt/powervm/driver.py index 55e62a16..2e2f1f60 100644 --- a/nova_powervm/virt/powervm/driver.py +++ b/nova_powervm/virt/powervm/driver.py @@ -1398,7 +1398,8 @@ class PowerVMDriver(driver.ComputeDriver): # Destroy the old VM. destroy_disks = not self.disk_dvr.capabilities['shared_storage'] - self._destroy(context, instance, block_device_info=None, + block_device_info = self._get_block_device_info(context, instance) + self._destroy(context, instance, block_device_info, destroy_disks=destroy_disks, shutdown=False) def finish_revert_migration(self, context, instance, network_info,