openstack
/
nova
Code Issues Proposed changes

Merge "[Trivial] Hyper-V: accept Glance vhdx images"

This commit is contained in:
Jenkins 2017-05-26 19:08:17 +00:00 committed by Gerrit Code Review
parent 68afc48b42 f022d431e1
commit 3f91e0c375
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/unit/virt/hyperv/test_block_device_manager.py
View File

@ -216,6 +216,9 @@ class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
def test_check_and_update_root_device_gen1(self):
self._test_check_and_update_root_device(disk_format='vhd')
def test_check_and_update_root_device_gen1_vhdx(self):
self._test_check_and_update_root_device(disk_format='vhdx')
def test_check_and_update_root_device_gen1_iso(self):
self._test_check_and_update_root_device(disk_format='iso')

1
nova/virt/hyperv/block_device_manager.py
View File

@ -41,6 +41,7 @@ class BlockDeviceInfoManager(object):
_DEFAULT_BUS = constants.CTRL_TYPE_SCSI
_TYPE_FOR_DISK_FORMAT = {'vhd': constants.DISK,
'vhdx': constants.DISK,
'iso': constants.DVD}
_DEFAULT_ROOT_DEVICE = '/dev/sda'