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
This commit is contained in:
parent
bf39a47dbe
commit
40bd35fcc2
|
@ -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(
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue