diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-26 14:44:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-26 14:44:58 +0000 |
| commit | 05ab9d7beb97bfbc4689a2290730e2486eb2f228 (patch) | |
| tree | c046a72fe13d0c0daf61fa91bc796ef9c2411fcf /nova/tests | |
| parent | 50a0f3efb6cc4ae9c94439eea346828d35080d6c (diff) | |
| parent | 569df8b30f4b94e6287a971c0f41bf5bb2cfad15 (diff) | |
Merge "Send full migration to resize_instance."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 10 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index c56d0b1ae..d61d1182b 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1744,7 +1744,7 @@ class ComputeTestCase(BaseTestCase): instance['uuid'], 'pre-migrating') self.compute.resize_instance(context, instance=instance, - migration_id=migration_ref['id'], + migration=migration_ref, image={}) timeutils.set_time_override(cur_time) test_notifier.NOTIFICATIONS = [] @@ -1870,7 +1870,7 @@ class ComputeTestCase(BaseTestCase): #verify self.assertRaises(test.TestingException, self.compute.resize_instance, context, instance=instance, - migration_id=migration_ref['id'], image={}, + migration=migration_ref, image={}, reservations=reservations) instance = db.instance_get_by_uuid(context, instance['uuid']) self.assertEqual(instance['vm_state'], vm_states.ERROR) @@ -1894,7 +1894,7 @@ class ComputeTestCase(BaseTestCase): db.instance_update(self.context, instance['uuid'], {"task_state": task_states.RESIZE_PREP}) self.compute.resize_instance(context, instance=instance, - migration_id=migration_ref['id'], + migration=migration_ref, image={}) inst = db.instance_get_by_uuid(context, instance['uuid']) self.assertEqual(migration_ref['dest_compute'], inst['host']) @@ -1940,7 +1940,7 @@ class ComputeTestCase(BaseTestCase): db.instance_update(self.context, instance["uuid"], {"task_state": task_states.RESIZE_PREP}) self.compute.resize_instance(context, instance=instance, - migration_id=migration_ref['id'], + migration=migration_ref, image={}) self.compute.finish_resize(context, migration_id=int(migration_ref['id']), disk_info={}, @@ -2029,7 +2029,7 @@ class ComputeTestCase(BaseTestCase): {"task_state": task_states.RESIZE_PREP}) self.assertRaises(test.TestingException, self.compute.resize_instance, context, instance=inst_ref, - migration_id=migration_ref['id'], image={}, + migration=migration_ref, image={}, reservations=reservations) inst_ref = db.instance_get_by_uuid(context, inst_ref['uuid']) self.assertEqual(inst_ref['vm_state'], vm_states.ERROR) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 2fa6bf9ee..dd374ac55 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -273,8 +273,8 @@ class ComputeRpcAPITestCase(test.TestCase): def test_resize_instance(self): self._test_compute_api('resize_instance', 'cast', - instance=self.fake_instance, migration_id='id', image='image', - reservations=list('fake_res')) + instance=self.fake_instance, migration={'id': 'fake_id'}, + image='image', reservations=list('fake_res'), version='2.6') def test_resume_instance(self): self._test_compute_api('resume_instance', 'cast', |