diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-10 16:52:47 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-10 16:52:47 +0000 |
commit | e620925185088d49eb43a73d01df00ef76627a3c (patch) | |
tree | 67ded71facef4540735390f1ccb59fd2f3d25449 /nova/tests/unit/objects/test_image_meta.py | |
parent | 81f12b0fb680c45fb9102915fd787a3a19da2a9f (diff) | |
parent | b927c42eaffc12294da9e365bfaa587ca180fcb8 (diff) | |
download | nova-e620925185088d49eb43a73d01df00ef76627a3c.tar.gz |
Merge "Objects: update missing adapter types"
Diffstat (limited to 'nova/tests/unit/objects/test_image_meta.py')
-rw-r--r-- | nova/tests/unit/objects/test_image_meta.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/nova/tests/unit/objects/test_image_meta.py b/nova/tests/unit/objects/test_image_meta.py index 3d62e24eea..41d0929124 100644 --- a/nova/tests/unit/objects/test_image_meta.py +++ b/nova/tests/unit/objects/test_image_meta.py @@ -151,6 +151,28 @@ class TestImageMetaProps(test.NoDBTestCase): self.assertTrue(image_meta.img_bdm_v2) self.assertEqual("/dev/vda", image_meta.img_root_device_name) + def test_legacy_compat_vmware_adapter_types(self): + legacy_types = ['lsiLogic', 'busLogic', 'ide', 'lsiLogicsas', + 'paraVirtual'] + + for legacy_type in legacy_types: + legacy_props = { + 'vmware_adaptertype': legacy_type, + } + + image_meta = objects.ImageMetaProps.from_dict(legacy_props) + if legacy_type == 'ide': + self.assertEqual('ide', image_meta.hw_disk_bus) + else: + self.assertEqual('scsi', image_meta.hw_disk_bus) + if legacy_type == 'lsiLogicsas': + expected = 'lsisas1068' + elif legacy_type == 'paraVirtual': + expected = 'vmpvscsi' + else: + expected = legacy_type.lower() + self.assertEqual(expected, image_meta.hw_scsi_model) + def test_duplicate_legacy_and_normal_props(self): # Both keys are referring to the same object field props = {'hw_scsi_model': 'virtio-scsi', |