openstack
/
nova
Code Issues Proposed changes

Merge "Hyper-V: Removes old instance dirs after live migration"

This commit is contained in:
Jenkins 2015-07-20 09:12:05 +00:00 committed by Gerrit Code Review
parent 76a97a8d7a 6df24c0f50
commit cd5d2c6268
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/unit/virt/hyperv/test_livemigrationops.py
View File

@ -32,6 +32,7 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
self.context = 'fake_context'
self._livemigrops = livemigrationops.LiveMigrationOps()
self._livemigrops._livemigrutils = mock.MagicMock()
self._livemigrops._pathutils = mock.MagicMock()
@mock.patch('nova.virt.hyperv.vmops.VMOps.copy_vm_console_logs')
@mock.patch('nova.virt.hyperv.vmops.VMOps.copy_vm_dvd_disks')
@ -114,6 +115,8 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
mock.sentinel.block_device_info)
mock_disconnect_volumes.assert_called_once_with(
mock.sentinel.block_device_info)
self._livemigrops._pathutils.get_instance_dir.assert_called_once_with(
mock.sentinel.instance.name, create_dir=False, remove_dir=True)
@mock.patch('nova.virt.hyperv.vmops.VMOps.log_vm_serial_output')
def test_post_live_migration_at_destination(self, mock_log_vm):

3
nova/virt/hyperv/livemigrationops.py
View File

@ -98,6 +98,9 @@ class LiveMigrationOps(object):
@check_os_version_requirement
def post_live_migration(self, context, instance, block_device_info):
self._volumeops.disconnect_volumes(block_device_info)
self._pathutils.get_instance_dir(instance.name,
create_dir=False,
remove_dir=True)
@check_os_version_requirement
def post_live_migration_at_destination(self, ctxt, instance_ref,