summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-12 14:51:17 +0000
committerGerrit Code Review <review@openstack.org>2017-06-12 14:51:17 +0000
commit4b3424616f3e0b253ea9fb2430950cc1b554df69 (patch)
treecdde4a55b6074e23756f80ea392f620cc1d806b1
parent05bf65d2c95a755c9bca7ab1711be6e7eb02451a (diff)
parent94a3ea56fad5e9890527ef6598bf3167f62bf6a6 (diff)
Merge "[Trivial] Hyper-V: accept Glance vhdx images" into stable/ocata
-rw-r--r--nova/tests/unit/virt/hyperv/test_block_device_manager.py3
-rw-r--r--nova/virt/hyperv/block_device_manager.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/tests/unit/virt/hyperv/test_block_device_manager.py b/nova/tests/unit/virt/hyperv/test_block_device_manager.py
index 939666e..cfeb669 100644
--- a/nova/tests/unit/virt/hyperv/test_block_device_manager.py
+++ b/nova/tests/unit/virt/hyperv/test_block_device_manager.py
@@ -216,6 +216,9 @@ class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
216 def test_check_and_update_root_device_gen1(self): 216 def test_check_and_update_root_device_gen1(self):
217 self._test_check_and_update_root_device(disk_format='vhd') 217 self._test_check_and_update_root_device(disk_format='vhd')
218 218
219 def test_check_and_update_root_device_gen1_vhdx(self):
220 self._test_check_and_update_root_device(disk_format='vhdx')
221
219 def test_check_and_update_root_device_gen1_iso(self): 222 def test_check_and_update_root_device_gen1_iso(self):
220 self._test_check_and_update_root_device(disk_format='iso') 223 self._test_check_and_update_root_device(disk_format='iso')
221 224
diff --git a/nova/virt/hyperv/block_device_manager.py b/nova/virt/hyperv/block_device_manager.py
index 3f2ff7d..9323da0 100644
--- a/nova/virt/hyperv/block_device_manager.py
+++ b/nova/virt/hyperv/block_device_manager.py
@@ -41,6 +41,7 @@ class BlockDeviceInfoManager(object):
41 _DEFAULT_BUS = constants.CTRL_TYPE_SCSI 41 _DEFAULT_BUS = constants.CTRL_TYPE_SCSI
42 42
43 _TYPE_FOR_DISK_FORMAT = {'vhd': constants.DISK, 43 _TYPE_FOR_DISK_FORMAT = {'vhd': constants.DISK,
44 'vhdx': constants.DISK,
44 'iso': constants.DVD} 45 'iso': constants.DVD}
45 46
46 _DEFAULT_ROOT_DEVICE = '/dev/sda' 47 _DEFAULT_ROOT_DEVICE = '/dev/sda'