openstack
/
compute-hyperv
Code Issues Proposed changes

Pass missing arg to "migrate_instance_finish" 

This method now accepts a mapping between port ids and resource
providers as per I220fa02ee916728e241503084b14984bab4b0c3b.

We'll need to figure how exactly should this dict look like.
Meanwhile, we'll just pass "None", which Nova seems to accept
for backwards compatibility reasons.

This is a temporary workaround meant to unblock the gate. It will
have to be properly handled by the time we release Ussuri, otherwise
we won't be able to support port QoS.

Change-Id: I878eab9615a76edab0f8ae5bb0d16652baae473a
Partial-Bug: #1845480
(cherry picked from commit 40bd35fcc2)
This commit is contained in:
Lucian Petrut 2019-09-26 13:33:23 +03:00
parent bf39a47dbe
commit 9b8ebe053b
2 changed files with 5 additions and 2 deletions
Show Stats 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):