openstack
/
cinder
Code Issues Proposed changes

Merge "NEC driver: fix an undefined variable" into stable/rocky

This commit is contained in:
Zuul 2020-04-16 23:01:11 +00:00 committed by Gerrit Code Review
parent 917e0b0cef d0e9c22bee
commit b520c781a1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/tests/unit/volume/drivers/nec/test_volume.py
View File

@ -671,6 +671,13 @@ class BindLDTest(volume_helper.MStorageDSVDriver, test.TestCase):
self.vol, self.vol.size, None, self.vol, self.vol.size, None,
self._convert_id2name, self._convert_id2name,
self._select_leastused_poolnumber) self._select_leastused_poolnumber)
self.mock_object(self._cli, 'get_pair_lds',
return_value={'lds1', 'lds2', 'lds3'})
with self.assertRaisesRegex(exception.VolumeBackendAPIException,
'Cannot create clone volume. '
'number of pairs reached 3. '
'ldname=LX:287RbQoP7VdwR1WsPC2fZT'):
self.create_cloned_volume(self.vol, self.src)
def test_bindld_CreateCloneWaitingInterval(self): def test_bindld_CreateCloneWaitingInterval(self):
self.assertEqual(10, cli.get_sleep_time_for_clone(0)) self.assertEqual(10, cli.get_sleep_time_for_clone(0))

3
cinder/volume/drivers/nec/volume_helper.py
View File

@ -475,8 +475,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
if len(pair_lds) == 3: if len(pair_lds) == 3:
msg = (_('Cannot create clone volume. ' msg = (_('Cannot create clone volume. '
'number of pairs reached 3. ' 'number of pairs reached 3. '
'%(msg)s. ldname=%(ldname)s') % 'ldname=%s') % source_name)
{'msg': msg, 'ldname': source_name})
LOG.error(msg) LOG.error(msg)
raise exception.VolumeBackendAPIException(data=msg) raise exception.VolumeBackendAPIException(data=msg)