diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-26 18:39:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-26 18:39:22 +0000 |
| commit | 9adc3a456a4a38fd9e372ddd7ee2fc6abeddbb0d (patch) | |
| tree | 60c6eb146b39c7dca39e9c9f884cc3d552b1ea0f /nova/tests | |
| parent | a6d8554fa3a0ab024c3d52696e02fd3db6e21006 (diff) | |
| parent | 7b39ef953a7157ab657329fc02075056e2d8a93a (diff) | |
Merge "Cleanup compute multi-node assignment of node"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 11 | ||||
| -rw-r--r-- | nova/tests/compute/test_resource_tracker.py | 1 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 3 | ||||
| -rw-r--r-- | nova/tests/scheduler/test_scheduler.py | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 206c5d694..a7e06cf92 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -511,6 +511,15 @@ class ComputeTestCase(BaseTestCase): self.compute.run_instance, self.context, instance=instance, filter_properties=filter_properties) + def test_create_instance_without_node_param(self): + instance = self._create_fake_instance({'node': None}) + + self.compute.run_instance(self.context, instance=instance) + instances = db.instance_get_all(self.context) + instance = instances[0] + + self.assertEqual(NODENAME, instance['node']) + def test_default_access_ip(self): self.flags(default_access_ip_network_name='test1') fake_network.unset_stub_network_methods(self.stubs) @@ -5838,7 +5847,7 @@ class ComputeRescheduleOrReraiseTestCase(BaseTestCase): self.mox.ReplayAll() self.compute._run_instance(self.context, None, {}, None, None, None, - False, self.instance) + False, None, self.instance) def test_deallocate_network_fail(self): """Test de-allocation of network failing before re-scheduling logic diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index b9fd738fa..85d6c3dd6 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -154,6 +154,7 @@ class BaseTestCase(test.TestCase): 'project_id': '123456', 'vcpus': 1, 'host': None, + 'node': None, 'instance_type_id': 1, 'launched_on': None, } diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index bef7a4d3d..d0796a27d 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -310,7 +310,8 @@ class ComputeRpcAPITestCase(test.TestCase): instance=self.fake_instance, host='fake_host', request_spec='fake_spec', filter_properties={}, requested_networks='networks', injected_files='files', - admin_password='pw', is_first_time=True) + admin_password='pw', is_first_time=True, node='node', + version='2.19') def test_set_admin_password(self): self._test_compute_api('set_admin_password', 'call', diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 78f2c7b9e..e17dae8bc 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -653,7 +653,7 @@ class SchedulerDriverModuleTestCase(test.TestCase): timeutils.utcnow().AndReturn('fake-now') db.instance_update(self.context, 'fake_uuid', - {'host': None, 'scheduled_at': 'fake-now'}) + {'host': None, 'node': None, 'scheduled_at': 'fake-now'}) rpc.queue_get_for(self.context, 'compute', host).AndReturn(queue) rpc.cast(self.context, queue, {'method': method, |