diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-21 20:36:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-21 20:36:58 +0000 |
| commit | 1b46e583c3eefccdfe1102fa068611b8e0f004f5 (patch) | |
| tree | 603cc3ff4c5414f6501428dfbdb9cdee034cbd2b /nova/tests | |
| parent | b7659482c49a83631214ddd72f8377da32b48ec7 (diff) | |
| parent | a42adb28c9817b96178617bba9c42dac18bfec24 (diff) | |
Merge "Fix KeyError exception when scheduling to child cell."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/cells/test_cells_scheduler.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/cells/test_cells_scheduler.py index 600867f43..46be492cc 100644 --- a/nova/tests/cells/test_cells_scheduler.py +++ b/nova/tests/cells/test_cells_scheduler.py @@ -84,10 +84,9 @@ class CellsSchedulerTestCase(test.TestCase): 'block_device_mapping': 'fake_bdm'} self.build_inst_kwargs = { 'instances': self.instances, - 'instance_type': 'fake_type', 'image': 'fake_image', - 'filter_properties': {}, - 'security_group': 'fake_sec_groups', + 'filter_properties': {'instance_type': 'fake_type'}, + 'security_groups': 'fake_sec_groups', 'block_device_mapping': 'fake_bdm'} def test_create_instances_here(self): @@ -284,10 +283,11 @@ class CellsSchedulerTestCase(test.TestCase): self.assertEqual(self.instance_uuids, call_info['instance_uuids']) self.assertEqual(self.build_inst_kwargs['instances'][0], call_info['instance_properties']) - self.assertEqual(self.build_inst_kwargs['instance_type'], - call_info['instance_type']) + self.assertEqual( + self.build_inst_kwargs['filter_properties']['instance_type'], + call_info['instance_type']) self.assertEqual(self.build_inst_kwargs['image'], call_info['image']) - self.assertEqual(self.build_inst_kwargs['security_group'], + self.assertEqual(self.build_inst_kwargs['security_groups'], call_info['security_groups']) self.assertEqual(self.build_inst_kwargs['block_device_mapping'], call_info['block_device_mapping']) |