Merge "NEC driver: fix an undefined variable" into stable/stein
This commit is contained in:
commit
294088cffc
|
@ -671,6 +671,13 @@ class BindLDTest(volume_helper.MStorageDSVDriver, test.TestCase):
|
|||
self.vol, self.vol.size, None,
|
||||
self._convert_id2name,
|
||||
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):
|
||||
self.assertEqual(10, cli.get_sleep_time_for_clone(0))
|
||||
|
|
|
@ -475,8 +475,7 @@ class MStorageDriver(volume_common.MStorageVolumeCommon):
|
|||
if len(pair_lds) == 3:
|
||||
msg = (_('Cannot create clone volume. '
|
||||
'number of pairs reached 3. '
|
||||
'%(msg)s. ldname=%(ldname)s') %
|
||||
{'msg': msg, 'ldname': source_name})
|
||||
'ldname=%s') % source_name)
|
||||
LOG.error(msg)
|
||||
raise exception.VolumeBackendAPIException(data=msg)
|
||||
|
||||
|
|
Loading…
Reference in New Issue