diff --git a/cinder/tests/unit/volume/drivers/nec/test_volume.py b/cinder/tests/unit/volume/drivers/nec/test_volume.py index e310bf91913..b8320f9f184 100644 --- a/cinder/tests/unit/volume/drivers/nec/test_volume.py +++ b/cinder/tests/unit/volume/drivers/nec/test_volume.py @@ -742,6 +742,13 @@ class BindLDTest(volume_helper.MStorageDSVDriver, test.TestCase): vol, 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(vol, src) def test_bindld_CreateCloneWaitingInterval(self): self.assertEqual(10, cli.get_sleep_time_for_clone(0)) diff --git a/cinder/volume/drivers/nec/volume_helper.py b/cinder/volume/drivers/nec/volume_helper.py index 38fcb02972e..207d8b506a8 100644 --- a/cinder/volume/drivers/nec/volume_helper.py +++ b/cinder/volume/drivers/nec/volume_helper.py @@ -471,8 +471,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)