openstack
/
nova
Code Issues Proposed changes

Merge "hyperv: Fixes Generation 2 VMs volume boot order"

This commit is contained in:
Jenkins 2017-07-01 14:00:42 +00:00 committed by Gerrit Code Review
parent 1bf3630792 f842f11630
commit 768d7cc0a6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,7 +411,8 @@ class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
res = self._bdman._get_boot_order_gen1(fake_bdi)
self.assertEqual(expected, res)
def test_get_boot_order_gen2(self):
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps.get_disk_resource_path')
def test_get_boot_order_gen2(self, mock_get_disk_path):
fake_root_disk = {'boot_index': 0,
'path': mock.sentinel.FAKE_ROOT_PATH}
fake_eph1 = {'boot_index': 2,
@ -425,8 +426,7 @@ class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
fake_eph2],
'block_device_mapping': [fake_bdm]}
self._bdman._volops.get_mounted_disk_path_from_volume = (
mock.MagicMock(return_value=fake_bdm['connection_info']))
mock_get_disk_path.return_value = fake_bdm['connection_info']
expected_res = [mock.sentinel.FAKE_ROOT_PATH,
mock.sentinel.FAKE_CONN_INFO,

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

@ -260,7 +260,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: