openstack
/
compute-hyperv
Code Issues Proposed changes

Remove block_migration from LM rollback 

(cherry-picked from commit 44e7f6e8d20730095b0bcd59c9d9a792754da588)

Change-Id: I5f247d733642464f4ede0430d4dfc8a27a02e7fd
This commit is contained in:
Claudiu Belu 2016-11-21 17:37:33 +02:00
parent 291dddea91
commit 2e2795f508
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hyperv/nova/livemigrationops.py
View File

@ -78,8 +78,7 @@ class LiveMigrationOps(object):
with excutils.save_and_reraise_exception():
LOG.debug("Calling live migration recover_method "
"for instance: %s", instance_name)
recover_method(context, instance_ref, dest, block_migration,
migrate_data)
recover_method(context, instance_ref, dest, migrate_data)
LOG.debug("Calling live migration post_method for instance: %s",
instance_name)

1
hyperv/tests/unit/test_livemigrationops.py
View File

@ -76,7 +76,6 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
migrate_data)
mock_recover.assert_called_once_with(self.context, mock_instance,
fake_dest,
mock.sentinel.block_migr,
migrate_data)
else:
self._livemigrops.live_migration(context=self.context,