diff --git a/manila/api/v2/shares.py b/manila/api/v2/shares.py index be36a0771e..a50ed68064 100644 --- a/manila/api/v2/shares.py +++ b/manila/api/v2/shares.py @@ -140,7 +140,7 @@ class ShareController(shares.ShareMixin, 'state': constants.ACCESS_STATE_ACTIVE } msg = _("Snapshot %(snap_id)s belongs to a share " - "%(share_id)s which has access rules that are" + "%(share_id)s which has access rules that are " "not %(state)s.") raise exc.HTTPConflict(explanation=msg % msg_args) diff --git a/manila/scheduler/filters/driver.py b/manila/scheduler/filters/driver.py index 9b2bbe7746..6a20d0e005 100644 --- a/manila/scheduler/filters/driver.py +++ b/manila/scheduler/filters/driver.py @@ -59,7 +59,7 @@ class DriverFilter(base_host.BaseHostFilter): "Skipping share backend name check.") elif (extra_specs['share_backend_name'] != host_stats['share_backend_name']): - LOG.warning("Share backend names do not match: '%(target)s'" + LOG.warning("Share backend names do not match: '%(target)s' " "vs '%(current)s' :: Skipping.", {'target': extra_specs['share_backend_name'], 'current': host_stats['share_backend_name']}) diff --git a/manila/share/api.py b/manila/share/api.py index d811f2fcea..68692194e8 100644 --- a/manila/share/api.py +++ b/manila/share/api.py @@ -186,7 +186,7 @@ class API(base.Base): 'avail': constants.STATUS_AVAILABLE, 'status': share_group['status'], } - msg = _("Share group status must be %(avail)s, got" + msg = _("Share group status must be %(avail)s, got " "%(status)s.") % params raise exception.InvalidShareGroup(message=msg) diff --git a/manila/share/driver.py b/manila/share/driver.py index e577c57e3a..6eb5b52f49 100644 --- a/manila/share/driver.py +++ b/manila/share/driver.py @@ -49,7 +49,7 @@ share_opts = [ help="Name of the configuration group in the Manila conf file " "to look for network config options." "If not set, the share backend's config group will be used." - "If an option is not found within provided group, then" + "If an option is not found within provided group, then " "'DEFAULT' group will be used for search of option."), cfg.BoolOpt( 'driver_handles_share_servers', diff --git a/manila/share/drivers/dell_emc/plugins/isilon/isilon.py b/manila/share/drivers/dell_emc/plugins/isilon/isilon.py index 3043c330d7..7ca5f1400d 100644 --- a/manila/share/drivers/dell_emc/plugins/isilon/isilon.py +++ b/manila/share/drivers/dell_emc/plugins/isilon/isilon.py @@ -197,7 +197,7 @@ class IsilonStorageConnection(base.StorageConnection): """Allow access to nfs share.""" access_type = access['access_type'] if access_type != 'ip': - message = _('Only "ip" access type allowed for the NFS' + message = _('Only "ip" access type allowed for the NFS ' 'protocol.') LOG.error(message) raise exception.InvalidShareAccess(reason=message) diff --git a/manila/share/drivers/dell_emc/plugins/vmax/connection.py b/manila/share/drivers/dell_emc/plugins/vmax/connection.py index 11bd1eda08..3c05c34c85 100644 --- a/manila/share/drivers/dell_emc/plugins/vmax/connection.py +++ b/manila/share/drivers/dell_emc/plugins/vmax/connection.py @@ -320,7 +320,7 @@ class VMAXStorageConnection(driver.StorageConnection): # Delete file system self._get_context('FileSystem').delete(share_name) except exception.EMCVmaxXMLAPIError as e: - LOG.exception("File system %(share_name)s not found due to" + LOG.exception("File system %(share_name)s not found due to " "error %(err)s. Skip the deletion.", {'share_name': share_name, 'err': e.message}) diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py index fe11ebc730..949599ddc6 100644 --- a/manila/share/drivers/generic.py +++ b/manila/share/drivers/generic.py @@ -496,7 +496,7 @@ class GenericShareDriver(driver.ExecuteMixin, driver.ShareDriver): volume_snapshot = volume_snapshot_list[0] elif len(volume_snapshot_list) > 1: LOG.error( - "Expected only one volume snapshot in list with name" + "Expected only one volume snapshot in list with name " "'%(name)s', but got more than one in a result - " "'%(result)s'.", { 'name': volume_snapshot_name, diff --git a/manila/share/drivers/qnap/qnap.py b/manila/share/drivers/qnap/qnap.py index 567c69194e..ab056df137 100644 --- a/manila/share/drivers/qnap/qnap.py +++ b/manila/share/drivers/qnap/qnap.py @@ -782,7 +782,7 @@ class QnapShareDriver(driver.ShareDriver): """Manages a share that exists on backend.""" if share['share_proto'].lower() == 'nfs': # 10.0.0.1:/share/example - LOG.info("Share %(shr_path)s will be managed with ID" + LOG.info("Share %(shr_path)s will be managed with ID " "%(shr_id)s.", {'shr_path': share['export_locations'][0]['path'], 'shr_id': share['id']}) diff --git a/manila/share/drivers/veritas/veritas_isa.py b/manila/share/drivers/veritas/veritas_isa.py index 69d9223f35..26d1521ea8 100644 --- a/manila/share/drivers/veritas/veritas_isa.py +++ b/manila/share/drivers/veritas/veritas_isa.py @@ -50,7 +50,7 @@ va_share_opts = [ secret=True, help='Veritas Access server REST password.'), cfg.StrOpt('va_pool', - help='Veritas Access storage pool from which' + help='Veritas Access storage pool from which ' 'shares are served.'), cfg.StrOpt('va_fstype', default='simple', @@ -364,7 +364,7 @@ class ACCESSShareDriver(driver.ExecuteMixin, driver.ShareDriver): json.dumps(data), 'POST') if not result: - message = (('ACCESSShareDriver access failed sharepath %s' + message = (('ACCESSShareDriver access failed sharepath %s ' 'server %s'), va_sharepath, server) diff --git a/manila/share/drivers/zfssa/zfssarest.py b/manila/share/drivers/zfssa/zfssarest.py index 51867080b5..0d34ac9833 100644 --- a/manila/share/drivers/zfssa/zfssarest.py +++ b/manila/share/drivers/zfssa/zfssarest.py @@ -330,7 +330,7 @@ class ZFSSAApi(object): sharenfs = details['sharenfs'] if sharenfs == 'on' or sharenfs == 'rw': - LOG.debug('Share %s has read/write permission' + LOG.debug('Share %s has read/write permission ' 'open to all.', share) return if sharenfs == 'off':