openstack
/
cinder
Code Issues Proposed changes

LinstorDrv : Fix wrong key using when getting device path. 

Using the "devicePath" key instead of "backingDevice" when getting
the device path corresponding to the volume

Change-Id: Id9f9c2acf0cf7ef8ebe58eeea75dc611cdce9dd1
Closes-Bug: #1811792
This commit is contained in:
Alexis RIES 2019-01-15 14:37:43 +01:00
parent 27304275d7
commit 64d4f717f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/test_linstordrv.py
View File

@ -600,7 +600,7 @@ class LinstorBaseDriverTestCase(test.TestCase):
m_rsc_list.return_value = self._fake_driver.fake_api_resource_list()
val = self.driver._get_rsc_path(VOLUME_NAMES['linstor'])
expected = '/dev/vg-35/f1_00000'
expected = '/dev/drbd1000'
self.assertEqual(expected, val)
@mock.patch(DRIVER + 'LinstorBaseDriver._get_api_resource_list')
@ -608,7 +608,7 @@ class LinstorBaseDriverTestCase(test.TestCase):
m_rsc_list.return_value = self._fake_driver.fake_api_resource_list()
val = self.driver._get_local_path(CINDER_VOLUME)
expected = '/dev/vg-35/f1_00000'
expected = '/dev/drbd1000'
self.assertEqual(expected, val)
@mock.patch(DRIVER + 'LinstorBaseDriver._get_api_storage_pool_dfn_list')

2
cinder/volume/drivers/linstordrv.py
View File

@ -371,7 +371,7 @@ class LinstorBaseDriver(driver.VolumeDriver):
if rsc['name'] == rsc_name and rsc['nodeName'] == self.host_name:
for volume in rsc['vlms']:
if volume['vlmNr'] == 0:
return volume['backingDisk']
return volume['devicePath']
def _get_local_path(self, volume):
try: