openstack/compute-hyperv
Code Issues Proposed changes

Merge "Pass missing arg to "migrate_instance_finish""

Browse Source
This commit is contained in:
Zuul
2019-09-26 11:40:04 +00:00
committed by Gerrit Code Review
parent 65e1961ddb 40bd35fcc2
commit b9c1c04455
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compute_hyperv/nova/cluster/clusterops.py
View File

@@ -224,8 +224,10 @@ class ClusterOps(object):
self._context, instance, migration)
self._network_api.setup_networks_on_host(
self._context, instance, self._this_node)
# TODO(lpetrut): provide the actual port provider mappings.
self._network_api.migrate_instance_finish(
self._context, instance, migration)
self._context, instance, migration,
provider_mappings=None)
self._network_api.setup_networks_on_host(
self._context, instance, self._this_node)
self._network_api.setup_networks_on_host(

3
compute_hyperv/tests/unit/cluster/test_clusterops.py
View File

@@ -330,7 +330,8 @@ class ClusterOpsTestCase(test_base.HyperVBaseTestCase):
mock_network_api.migrate_instance_start.assert_called_once_with(
self.clusterops._context, mock_instance, fake_migration)
mock_network_api.migrate_instance_finish.assert_called_once_with(
self.clusterops._context, mock_instance, fake_migration)
self.clusterops._context, mock_instance, fake_migration,
provider_mappings=None)
@mock.patch.object(objects.Instance, 'get_by_uuid')
def test_get_instance_by_name(self, mock_get_by_uuid):