Merge "[Trivial] Hyper-V: accept Glance vhdx images" into stable/ocata

This commit is contained in:
Jenkins 2017-06-12 14:51:17 +00:00 committed by Gerrit Code Review
commit 4b3424616f
2 changed files with 4 additions and 0 deletions

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')

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'