diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-14 20:26:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-14 20:26:09 +0000 |
| commit | c40c5125344028b18401f2dca409b06ef60aee89 (patch) | |
| tree | 1c388e9b55ca2eef269507be1ef94e91d60ab817 /nova/tests | |
| parent | 9fdf7552779d518af9cda4e366bf81fddb0cb6f2 (diff) | |
| parent | ca1282ad7c577398b8a4c47481fa0c94b62893b4 (diff) | |
Merge "Fixes usage of migrate_instance_start"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network/test_api.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py index bfc9dc878..15ead5337 100644 --- a/nova/tests/network/test_api.py +++ b/nova/tests/network/test_api.py @@ -117,7 +117,6 @@ class ApiTestCase(test.TestCase): 'project_id': 'fake_project_id', 'floating_addresses': None} if multi_host: - expected['host'] = 'fake_compute_dest' expected['floating_addresses'] = ['fake_float1', 'fake_float2'] return fake_instance, fake_migration, expected @@ -125,6 +124,7 @@ class ApiTestCase(test.TestCase): info = {'kwargs': {}} arg1, arg2, expected = self._stub_migrate_instance_calls( 'migrate_instance_start', True, info) + expected['host'] = 'fake_compute_source' self.network_api.migrate_instance_start(self.context, arg1, arg2) self.assertEqual(info['kwargs'], expected) @@ -139,6 +139,7 @@ class ApiTestCase(test.TestCase): info = {'kwargs': {}} arg1, arg2, expected = self._stub_migrate_instance_calls( 'migrate_instance_finish', True, info) + expected['host'] = 'fake_compute_dest' self.network_api.migrate_instance_finish(self.context, arg1, arg2) self.assertEqual(info['kwargs'], expected) |
