openstack/cinder
Code Issues Proposed changes

Merge "Add missing ws seperator between words"

Browse Source
This commit is contained in:
Zuul 2019-01-24 07:23:59 +00:00 committed by Gerrit Code Review
commit a8d995c2f2
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/image/image_utils.py
View File

@ -247,7 +247,7 @@ def _convert_image(prefix, source, dest, out_format,
while not os.path.ismount(conversion_dir): while not os.path.ismount(conversion_dir):
conversion_dir = os.path.dirname(conversion_dir) conversion_dir = os.path.dirname(conversion_dir)
message = _("Insufficient free space on %(location)s for image" message = _("Insufficient free space on %(location)s for image "
"conversion.") % {'location': conversion_dir} "conversion.") % {'location': conversion_dir}
LOG.error(message) LOG.error(message)

2
cinder/scheduler/host_manager.py
View File

@ -547,7 +547,7 @@ class HostManager(object):
cluster_msg = (('Cluster: %s - Host: ' % cluster_name) if cluster_name cluster_msg = (('Cluster: %s - Host: ' % cluster_name) if cluster_name
else '') else '')
LOG.debug("Received %(service_name)s service update from %(cluster)s" LOG.debug("Received %(service_name)s service update from %(cluster)s "
"%(host)s: %(cap)s%(cluster)s", "%(host)s: %(cap)s%(cluster)s",
{'service_name': service_name, 'host': host, {'service_name': service_name, 'host': host,
'cap': capabilities, 'cap': capabilities,

2
cinder/tests/unit/test_image_utils.py
View File

@ -313,7 +313,7 @@ class TestConvertImage(test.TestCase):
image_utils.convert_image, image_utils.convert_image,
source, dest, out_format) source, dest, out_format)
mock_log.assert_called_with('Insufficient free space on fakedir for' mock_log.assert_called_with('Insufficient free space on fakedir for'
' imageconversion.') ' image conversion.')
class TestResizeImage(test.TestCase): class TestResizeImage(test.TestCase):

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

@ -230,7 +230,7 @@ class DrbdManageBaseDriver(driver.VolumeDriver):
"""Any initialization the volume driver does while starting.""" """Any initialization the volume driver does while starting."""
super(DrbdManageBaseDriver, self).do_setup(context) super(DrbdManageBaseDriver, self).do_setup(context)
msg = _("The DRBD Manage driver is moving to maintenance mode" msg = _("The DRBD Manage driver is moving to maintenance mode "
"in the Stein release and will be removed in T release.") "in the Stein release and will be removed in T release.")
versionutils.report_deprecated_feature(LOG, msg) versionutils.report_deprecated_feature(LOG, msg)

6
cinder/volume/drivers/hedvig/hedvig_cinder.py
View File

@ -256,7 +256,7 @@ class HedvigISCSIDriver(driver.ISCSIDriver, san.SanDriver):
snapshotName, project, snapshotId) snapshotName, project, snapshotId)
self.hedvig_create_snapshot(volName, snapshotId) self.hedvig_create_snapshot(volName, snapshotId)
except exception.VolumeDriverException: except exception.VolumeDriverException:
msg = (_('Failed to create snapshot. snapshotName: %s' msg = (_('Failed to create snapshot. snapshotName: %s '
'Rest API failed') % snapshotName) 'Rest API failed') % snapshotName)
LOG.exception(msg) LOG.exception(msg)
raise exception.VolumeDriverException(msg) raise exception.VolumeDriverException(msg)
@ -277,7 +277,7 @@ class HedvigISCSIDriver(driver.ISCSIDriver, san.SanDriver):
"project: %s", volName, snapshotName, project) "project: %s", volName, snapshotName, project)
self.hrs.delete_snapshot(snapshotName, volName, snapshotId) self.hrs.delete_snapshot(snapshotName, volName, snapshotId)
except exception.VolumeDriverException: except exception.VolumeDriverException:
msg = _('Failed to delete snapshot: %s' msg = _('Failed to delete snapshot: %s, '
'Rest API failed') % snapshotName 'Rest API failed') % snapshotName
LOG.exception(msg) LOG.exception(msg)
raise exception.VolumeDriverException(msg) raise exception.VolumeDriverException(msg)
@ -430,7 +430,7 @@ class HedvigISCSIDriver(driver.ISCSIDriver, san.SanDriver):
LOG.debug("Found hedvig controller: %s, for host: %s", tgt, host) LOG.debug("Found hedvig controller: %s, for host: %s", tgt, host)
return tgt return tgt
except exception.VolumeDriverException: except exception.VolumeDriverException:
msg = _('Failed to get hedvig controller for compute %s' msg = _('Failed to get hedvig controller for compute %s '
'Rest API failed') % host 'Rest API failed') % host
LOG.exception(msg) LOG.exception(msg)
raise exception.VolumeDriverException(msg) raise exception.VolumeDriverException(msg)

4
cinder/volume/drivers/rbd.py
View File

@ -123,7 +123,7 @@ RBD_OPTS = [
'for permanent removal after being tagged for deferred ' 'for permanent removal after being tagged for deferred '
'deletion.'), 'deletion.'),
cfg.IntOpt('deferred_deletion_purge_interval', default=60, cfg.IntOpt('deferred_deletion_purge_interval', default=60,
help='Number of seconds between runs of the periodic task' help='Number of seconds between runs of the periodic task '
'to purge volumes tagged for deletion.'), 'to purge volumes tagged for deletion.'),
] ]
@ -788,7 +788,7 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD,
raise exception.VolumeDriverException(message=message) raise exception.VolumeDriverException(message=message)
if 'cipher' not in encryption or 'key_size' not in encryption: if 'cipher' not in encryption or 'key_size' not in encryption:
msg = _('encryption spec must contain "cipher" and' msg = _('encryption spec must contain "cipher" and '
'"key_size"') '"key_size"')
raise exception.VolumeDriverException(message=msg) raise exception.VolumeDriverException(message=msg)

20
cinder/volume/drivers/zfssa/zfssarest.py
View File

@ -510,7 +510,7 @@ class ZFSSAApi(object):
ret = self.rclient.post(svc, arg) ret = self.rclient.post(svc, arg)
if ret.status != restclient.Status.CREATED: if ret.status != restclient.Status.CREATED:
exception_msg = (_('Error Adding Initiator: ' exception_msg = (_('Error Adding Initiator: '
'%(initiator)s on group' '%(initiator)s on group '
'InitiatorGroup: %(initiatorgroup)s ' 'InitiatorGroup: %(initiatorgroup)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s .') 'Message: %(ret.data)s .')
@ -545,7 +545,7 @@ class ZFSSAApi(object):
ret = self.rclient.put(svc, arg) ret = self.rclient.put(svc, arg)
if ret.status != restclient.Status.ACCEPTED: if ret.status != restclient.Status.ACCEPTED:
exception_msg = (_('Error Adding Initiator: ' exception_msg = (_('Error Adding Initiator: '
'%(initiator)s on group' '%(initiator)s on group '
'InitiatorGroup: %(initiatorgroup)s ' 'InitiatorGroup: %(initiatorgroup)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s .') 'Message: %(ret.data)s .')
@ -584,7 +584,7 @@ class ZFSSAApi(object):
ret = self.rclient.post(svc, arg) ret = self.rclient.post(svc, arg)
if ret.status != restclient.Status.CREATED: if ret.status != restclient.Status.CREATED:
exception_msg = (_('Error Creating Target: ' exception_msg = (_('Error Creating Target: '
'%(alias)s' '%(alias)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s .') 'Message: %(ret.data)s .')
% {'alias': alias, % {'alias': alias,
@ -602,7 +602,7 @@ class ZFSSAApi(object):
ret = self.rclient.get(svc) ret = self.rclient.get(svc)
if ret.status != restclient.Status.OK: if ret.status != restclient.Status.OK:
exception_msg = (_('Error Getting Target: ' exception_msg = (_('Error Getting Target: '
'%(alias)s' '%(alias)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s .') 'Message: %(ret.data)s .')
% {'alias': alias, % {'alias': alias,
@ -628,8 +628,8 @@ class ZFSSAApi(object):
ret = self.rclient.post(svccrt, arg) ret = self.rclient.post(svccrt, arg)
if ret.status != restclient.Status.CREATED: if ret.status != restclient.Status.CREATED:
exception_msg = (_('Error Creating TargetGroup: ' exception_msg = (_('Error Creating TargetGroup: '
'%(targetgroup)s with' '%(targetgroup)s with '
'IQN: %(iqn)s' 'IQN: %(iqn)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s .') 'Message: %(ret.data)s .')
% {'targetgroup': targetgroup, % {'targetgroup': targetgroup,
@ -648,8 +648,8 @@ class ZFSSAApi(object):
ret = self.rclient.put(svc, arg) ret = self.rclient.put(svc, arg)
if ret.status != restclient.Status.ACCEPTED: if ret.status != restclient.Status.ACCEPTED:
exception_msg = (_('Error Adding to TargetGroup: ' exception_msg = (_('Error Adding to TargetGroup: '
'%(targetgroup)s with' '%(targetgroup)s with '
'IQN: %(iqn)s' 'IQN: %(iqn)s '
'Return code: %(ret.status)d ' 'Return code: %(ret.status)d '
'Message: %(ret.data)s.') 'Message: %(ret.data)s.')
% {'targetgroup': targetgroup, % {'targetgroup': targetgroup,
@ -952,7 +952,7 @@ class ZFSSAApi(object):
ret = self.rclient.post(svc, arg) ret = self.rclient.post(svc, arg)
if ret.status != restclient.Status.CREATED: if ret.status != restclient.Status.CREATED:
exception_msg = (_('Error Creating ' exception_msg = (_('Error Creating '
'Snapshot: %(snapshot)s on' 'Snapshot: %(snapshot)s on '
'Volume: %(lun)s to ' 'Volume: %(lun)s to '
'Pool: %(pool)s ' 'Pool: %(pool)s '
'Project: %(project)s ' 'Project: %(project)s '
@ -1153,7 +1153,7 @@ class ZFSSANfsApi(ZFSSAApi):
ret = self.rclient.post(svc, arg) ret = self.rclient.post(svc, arg)
if ret.status != restclient.Status.CREATED: if ret.status != restclient.Status.CREATED:
exception_msg = (_('Error Creating ' exception_msg = (_('Error Creating '
'Snapshot: %(snapshot)s on' 'Snapshot: %(snapshot)s on '
'share: %(share)s to ' 'share: %(share)s to '
'Pool: %(pool)s ' 'Pool: %(pool)s '
'Project: %(project)s ' 'Project: %(project)s '