diff options
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 43 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 14 |
2 files changed, 53 insertions, 4 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 5c9ce9e5f..41554e79a 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -16,6 +16,7 @@ import mox +from nova.api.ec2 import ec2utils from nova.compute import instance_types from nova.compute import utils as compute_utils from nova.compute import vm_states @@ -241,6 +242,15 @@ class _BaseTestCase(object): aggregate, 'fake') + def test_aggregate_metadata_get_by_host(self): + self.mox.StubOutWithMock(db, 'aggregate_metadata_get_by_host') + db.aggregate_metadata_get_by_host(self.context, 'host', + 'key').AndReturn('result') + self.mox.ReplayAll() + result = self.conductor.aggregate_metadata_get_by_host(self.context, + 'host', 'key') + self.assertEqual(result, 'result') + def test_bw_usage_update(self): self.mox.StubOutWithMock(db, 'bw_usage_update') self.mox.StubOutWithMock(db, 'bw_usage_get') @@ -537,6 +547,39 @@ class _BaseTestCase(object): self.mox.ReplayAll() self.conductor.quota_rollback(self.context, 'reservations') + def test_get_ec2_ids(self): + expected = { + 'instance-id': 'ec2-inst-id', + 'ami-id': 'ec2-ami-id', + 'kernel-id': 'ami-kernel-ec2-kernelid', + 'ramdisk-id': 'ami-ramdisk-ec2-ramdiskid', + } + inst = { + 'uuid': 'fake-uuid', + 'kernel_id': 'ec2-kernelid', + 'ramdisk_id': 'ec2-ramdiskid', + 'image_ref': 'fake-image', + } + self.mox.StubOutWithMock(ec2utils, 'id_to_ec2_inst_id') + self.mox.StubOutWithMock(ec2utils, 'glance_id_to_ec2_id') + self.mox.StubOutWithMock(ec2utils, 'image_type') + + ec2utils.id_to_ec2_inst_id(inst['uuid']).AndReturn( + expected['instance-id']) + ec2utils.glance_id_to_ec2_id(self.context, + inst['image_ref']).AndReturn( + expected['ami-id']) + for image_type in ['kernel', 'ramdisk']: + image_id = inst['%s_id' % image_type] + ec2utils.image_type(image_type).AndReturn('ami-' + image_type) + ec2utils.glance_id_to_ec2_id(self.context, image_id, + 'ami-' + image_type).AndReturn( + 'ami-%s-ec2-%sid' % (image_type, image_type)) + + self.mox.ReplayAll() + result = self.conductor.get_ec2_ids(self.context, inst) + self.assertEqual(result, expected) + class ConductorTestCase(_BaseTestCase, test.TestCase): """Conductor Manager Tests.""" diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 827bfb398..95399e33d 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -31,6 +31,7 @@ from nova.api.metadata import base from nova.api.metadata import handler from nova.api.metadata import password from nova import block_device +from nova.conductor import api as conductor_api from nova import db from nova.db.sqlalchemy import api from nova import exception @@ -118,6 +119,7 @@ class MetadataTestCase(test.TestCase): def setUp(self): super(MetadataTestCase, self).setUp() self.instance = INSTANCES[0] + self.flags(use_local=True, group='conductor') fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs, spectacular=True) @@ -191,10 +193,11 @@ class MetadataTestCase(test.TestCase): 'swap': '/dev/sdc', 'ebs0': '/dev/sdh'} - self.assertEqual(base._format_instance_mapping(ctxt, instance_ref0), - block_device._DEFAULT_MAPPINGS) - self.assertEqual(base._format_instance_mapping(ctxt, instance_ref1), - expected) + capi = conductor_api.LocalAPI() + self.assertEqual(base._format_instance_mapping(capi, ctxt, + instance_ref0), block_device._DEFAULT_MAPPINGS) + self.assertEqual(base._format_instance_mapping(capi, ctxt, + instance_ref1), expected) def test_pubkey(self): md = fake_InstanceMetadata(self.stubs, copy.copy(self.instance)) @@ -247,6 +250,7 @@ class OpenStackMetadataTestCase(test.TestCase): def setUp(self): super(OpenStackMetadataTestCase, self).setUp() self.instance = INSTANCES[0] + self.flags(use_local=True, group='conductor') fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs, spectacular=True) @@ -382,6 +386,7 @@ class MetadataHandlerTestCase(test.TestCase): fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs, spectacular=True) self.instance = INSTANCES[0] + self.flags(use_local=True, group='conductor') self.mdinst = fake_InstanceMetadata(self.stubs, self.instance, address=None, sgroups=None) @@ -547,6 +552,7 @@ class MetadataPasswordTestCase(test.TestCase): fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs, spectacular=True) self.instance = copy.copy(INSTANCES[0]) + self.flags(use_local=True, group='conductor') self.mdinst = fake_InstanceMetadata(self.stubs, self.instance, address=None, sgroups=None) self.flags(use_local=True, group='conductor') |