openstack/nova
Code Issues Proposed changes

Merge "Hyper-V: Fix volume attach issue caused by wrong constant name"

Browse Source
This commit is contained in:
Jenkins 2015-01-14 18:41:58 +00:00 committed by Gerrit Code Review
commit 1b2fb031f3
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nova/tests/unit/virt/hyperv/test_vmutils.py
View File

@ -714,3 +714,25 @@ class VMUtilsTestCase(test.NoDBTestCase):
self.assertEqual(mock.sentinel.fake_value,
compare.Properties_.Item().Value)
self.assertEqual(compare, response)
def test_get_attached_disks(self):
mock_scsi_ctrl_path = mock.MagicMock()
expected_query = ("SELECT * FROM %(class_name)s "
"WHERE (ResourceSubType = "
"'%(res_sub_type)s' OR "
"ResourceSubType='%(res_sub_type_virt)s')"
" AND Parent = '%(parent)s'" %
{"class_name":
self._vmutils._RESOURCE_ALLOC_SETTING_DATA_CLASS,
"res_sub_type":
self._vmutils._PHYS_DISK_RES_SUB_TYPE,
"res_sub_type_virt":
self._vmutils._DISK_DRIVE_RES_SUB_TYPE,
"parent":
mock_scsi_ctrl_path.replace("'", "''")})
expected_disks = self._vmutils._conn.query.return_value
ret_disks = self._vmutils.get_attached_disks(mock_scsi_ctrl_path)
self._vmutils._conn.query.assert_called_once_with(expected_query)
self.assertEqual(expected_disks, ret_disks)

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

@ -325,7 +325,7 @@ class VMUtils(object):
'res_sub_type':
self._PHYS_DISK_RES_SUB_TYPE,
'res_sub_type_virt':
self._DISK_RES_SUB_TYPE,
self._DISK_DRIVE_RES_SUB_TYPE,
'parent':
scsi_controller_path.replace("'", "''")})
return volumes