openstack/cinder
Code Issues Proposed changes

Merge "NEC driver: fix an undefined variable"

Browse Source
This commit is contained in:
Zuul 2019-11-27 18:43:33 +00:00 committed by Gerrit Code Review
commit 295598ab33
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

@ -742,6 +742,13 @@ class BindLDTest(volume_helper.MStorageDSVDriver, test.TestCase):
vol, vol.size, None, vol, 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(vol, 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

@ -471,8 +471,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)