openstack
/
compute-hyperv
Code Issues Proposed changes

Merge "hyperv: Fixes Generation 2 VMs volume boot order" into stable/ocata

This commit is contained in:
Jenkins 2017-05-02 10:54:36 +00:00 committed by Gerrit Code Review
parent 3c70042cb3 75972a942e
commit 7f925601e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hyperv/nova/block_device_manager.py
View File

@ -258,7 +258,7 @@ class BlockDeviceInfoManager(object):
boot_order = []
for dev in devices:
if dev.get('connection_info'):
dev_path = self._volops.get_mounted_disk_path_from_volume(
dev_path = self._volops.get_disk_resource_path(
dev['connection_info'])
boot_order.append(dev_path)
else:

2
hyperv/tests/unit/test_block_device_manager.py
View File

@ -418,7 +418,7 @@ class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
fake_eph2],
'block_device_mapping': [fake_bdm]}
self._bdman._volops.get_mounted_disk_path_from_volume = (
self._bdman._volops.get_disk_resource_path = (
mock.MagicMock(return_value=fake_bdm['connection_info']))
expected_res = [mock.sentinel.FAKE_ROOT_PATH,