diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-07 01:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-07 01:03:24 +0000 |
| commit | 8e04eea21ba45ffcd6ea28ecd85586133a6317d7 (patch) | |
| tree | f2fe69bd504048b5001f2684663d236eb453cd8a /nova/tests | |
| parent | 7015ad6fa93546a69600a354fa2080d9c0965b7d (diff) | |
| parent | 98f753d4c5e8bdf31716a7452f89930a51b3edf5 (diff) | |
Merge "Send full instance to scheduler live_migration."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_admin_actions.py | 7 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_rpcapi.py | 3 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_scheduler.py | 12 |
3 files changed, 9 insertions, 13 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index 89ac3d9a0..8da846125 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -62,9 +62,10 @@ def fake_compute_api_get(self, context, instance_id): 'task_state': None} -def fake_scheduler_api_live_migration(self, context, block_migration, - disk_over_commit, instance_id, - dest, topic): +def fake_scheduler_api_live_migration(self, context, dest, + block_migration=False, + disk_over_commit=False, instance=None, + instance_id=None): return None diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index 20874c365..ff17d9183 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -95,7 +95,8 @@ class SchedulerRpcAPITestCase(test.TestCase): self._test_scheduler_api('live_migration', rpc_method='call', block_migration='fake_block_migration', disk_over_commit='fake_disk_over_commit', - instance_id='fake_id', dest='fake_dest', topic='fake_topic') + instance='fake_instance', dest='fake_dest', topic='fake_topic', + version='1.3') def test_update_service_capabilities(self): self._test_scheduler_api('update_service_capabilities', diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 0c416dc72..3950d1ef6 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -403,7 +403,6 @@ class SchedulerTestCase(test.TestCase): def test_live_migration_basic(self): """Test basic schedule_live_migration functionality""" - self.mox.StubOutWithMock(db, 'instance_get') self.mox.StubOutWithMock(self.driver, '_live_migration_src_check') self.mox.StubOutWithMock(self.driver, '_live_migration_dest_check') self.mox.StubOutWithMock(self.driver, '_live_migration_common_check') @@ -416,11 +415,9 @@ class SchedulerTestCase(test.TestCase): dest = 'fake_host2' block_migration = False disk_over_commit = False - instance = self._live_migration_instance() + instance = jsonutils.to_primitive(self._live_migration_instance()) instance_id = instance['id'] instance_uuid = instance['uuid'] - db.instance_get(self.context, - instance_id).AndReturn(instance) self.driver._live_migration_src_check(self.context, instance) self.driver._live_migration_dest_check(self.context, instance, dest) @@ -441,14 +438,13 @@ class SchedulerTestCase(test.TestCase): self.mox.ReplayAll() self.driver.schedule_live_migration(self.context, - instance_id=instance['id'], dest=dest, + instance=instance, dest=dest, block_migration=block_migration, disk_over_commit=disk_over_commit) def test_live_migration_all_checks_pass(self): """Test live migration when all checks pass.""" - self.mox.StubOutWithMock(db, 'instance_get') self.mox.StubOutWithMock(utils, 'service_is_up') self.mox.StubOutWithMock(db, 'service_get_all_compute_by_host') self.mox.StubOutWithMock(db, 'instance_get_all_by_host') @@ -463,8 +459,6 @@ class SchedulerTestCase(test.TestCase): instance = jsonutils.to_primitive(self._live_migration_instance()) instance_id = instance['id'] instance_uuid = instance['uuid'] - db.instance_get(self.context, - instance_id).AndReturn(instance) # Source checks db.service_get_all_compute_by_host(self.context, @@ -511,7 +505,7 @@ class SchedulerTestCase(test.TestCase): self.mox.ReplayAll() result = self.driver.schedule_live_migration(self.context, - instance_id=instance_id, dest=dest, + instance=instance, dest=dest, block_migration=block_migration, disk_over_commit=disk_over_commit) self.assertEqual(result, None) |