openstack/nova
Code Issues Proposed changes

Merge "Image meta: treat legacy vmware adapter type values" into stable/liberty

Browse Source
This commit is contained in:
Jenkins 2015-11-08 13:57:18 +00:00 committed by Gerrit Code Review
commit 0871729c21
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/image_meta.py
View File

@ -389,7 +389,7 @@ class ImageMetaProps(base.NovaObject):
vmware_adaptertype = image_props.get("vmware_adaptertype")
if vmware_adaptertype == "ide":
setattr(self, "hw_disk_bus", "ide")
elif vmware_adaptertype is not None:
elif vmware_adaptertype:
setattr(self, "hw_disk_bus", "scsi")
setattr(self, "hw_scsi_model", vmware_adaptertype)

5
nova/tests/unit/objects/test_image_meta.py
View File

@ -185,7 +185,7 @@ class TestImageMetaProps(test.NoDBTestCase):
def test_legacy_compat_vmware_adapter_types(self):
legacy_types = ['lsiLogic', 'busLogic', 'ide', 'lsiLogicsas',
'paraVirtual']
'paraVirtual', None, '']
for legacy_type in legacy_types:
legacy_props = {
@ -195,6 +195,9 @@ class TestImageMetaProps(test.NoDBTestCase):
image_meta = objects.ImageMetaProps.from_dict(legacy_props)
if legacy_type == 'ide':
self.assertEqual('ide', image_meta.hw_disk_bus)
elif not legacy_type:
self.assertFalse(image_meta.obj_attr_is_set('hw_disk_bus'))
self.assertFalse(image_meta.obj_attr_is_set('hw_scsi_model'))
else:
self.assertEqual('scsi', image_meta.hw_disk_bus)
if legacy_type == 'lsiLogicsas':