summaryrefslogtreecommitdiff
path: root/nova/tests/unit/conductor
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-02 18:07:06 +0000
committerGerrit Code Review <review@openstack.org>2019-09-02 18:07:06 +0000
commit375e80f9a50c53ca262109fe4448e25a1875fdf2 (patch)
tree89e9e7d16fe10ad398fed4483821cffae0d84911 /nova/tests/unit/conductor
parent7bc8f24dc9317297b53ec9e4517d4997c8083fcd (diff)
parenta413150b201dbc83865d3429c172600c1007674a (diff)
downloadnova-375e80f9a50c53ca262109fe4448e25a1875fdf2.tar.gz
Merge "Pass network API to the conducor's MigrationTask"
Diffstat (limited to 'nova/tests/unit/conductor')
-rw-r--r--nova/tests/unit/conductor/tasks/test_migrate.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/tests/unit/conductor/tasks/test_migrate.py b/nova/tests/unit/conductor/tasks/test_migrate.py
index bab53361a9..0e6aae11db 100644
--- a/nova/tests/unit/conductor/tasks/test_migrate.py
+++ b/nova/tests/unit/conductor/tasks/test_migrate.py
@@ -60,6 +60,8 @@ class MigrationTaskTestCase(test.NoDBTestCase):
self.ensure_network_metadata_mock = _p.start()
self.addCleanup(_p.stop)
+ self.mock_network_api = mock.Mock()
+
def _generate_task(self):
return migrate.MigrationTask(self.context, self.instance, self.flavor,
self.request_spec,
@@ -67,7 +69,8 @@ class MigrationTaskTestCase(test.NoDBTestCase):
compute_rpcapi.ComputeAPI(),
query.SchedulerQueryClient(),
report.SchedulerReportClient(),
- host_list=None)
+ host_list=None,
+ network_api=self.mock_network_api)
@mock.patch.object(objects.MigrationList, 'get_by_filters')
@mock.patch('nova.scheduler.client.report.SchedulerReportClient')