From 8545ba2af7476e0884b5e7fb90965bef92d605bc Mon Sep 17 00:00:00 2001 From: zhufl Date: Fri, 16 Nov 2018 16:37:21 +0800 Subject: [PATCH] Add missing ws seperator between words This is to add missing ws seperator between words, usually in log messages. Change-Id: I71bf4c5b5be4dbc89a28bf243b7d11cf1d612ab4 --- nova/api/openstack/placement/handlers/resource_class.py | 2 +- .../api/openstack/placement/objects/resource_provider.py | 2 +- nova/cmd/manage.py | 9 +++++---- nova/compute/provider_tree.py | 2 +- nova/conf/libvirt.py | 4 ++-- nova/conf/wsgi.py | 2 +- nova/network/neutronv2/api.py | 2 +- nova/virt/driver.py | 2 +- nova/virt/hyperv/serialproxy.py | 2 +- nova/virt/libvirt/firewall.py | 2 +- nova/virt/powervm/media.py | 2 +- nova/virt/xenapi/agent.py | 3 +-- nova/virt/xenapi/vif.py | 2 +- nova/virt/xenapi/vmops.py | 8 ++++---- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nova/api/openstack/placement/handlers/resource_class.py b/nova/api/openstack/placement/handlers/resource_class.py index be1371709898..b8b0324a9eb7 100644 --- a/nova/api/openstack/placement/handlers/resource_class.py +++ b/nova/api/openstack/placement/handlers/resource_class.py @@ -76,7 +76,7 @@ def create_resource_class(req): except exception.MaxDBRetriesExceeded: raise webob.exc.HTTPConflict( _('Max retries of DB transaction exceeded attempting ' - 'to create resource class: %(name)s, please' + 'to create resource class: %(name)s, please ' 'try again.') % {'name': data['name']}) diff --git a/nova/api/openstack/placement/objects/resource_provider.py b/nova/api/openstack/placement/objects/resource_provider.py index aaaa09c90448..87e75ec65305 100644 --- a/nova/api/openstack/placement/objects/resource_provider.py +++ b/nova/api/openstack/placement/objects/resource_provider.py @@ -3698,7 +3698,7 @@ def _get_traits_by_provider_tree(ctx, root_ids): :param root_ids: list of root resource provider IDs """ if not root_ids: - raise ValueError(_("Expected root_ids to be a list of root resource" + raise ValueError(_("Expected root_ids to be a list of root resource " "provider internal IDs, but got an empty list.")) rpt = sa.alias(_RP_TBL, name='rpt') diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 6889f1d4810c..1178197288d6 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -456,7 +456,7 @@ class DbCommands(object): @args('--version', metavar='', help=argparse.SUPPRESS) @args('--local_cell', action='store_true', - help='Only sync db in the local cell: do not attempt to fan-out' + help='Only sync db in the local cell: do not attempt to fan-out ' 'to all cells') @args('version2', metavar='VERSION', nargs='?', help='Database version') def sync(self, version=None, local_cell=False, version2=None): @@ -1413,9 +1413,10 @@ class CellV2Commands(object): if instance: say('The instance with uuid %s has been deleted.' % uuid) - say('Execute `nova-manage db archive_deleted_rows`' - 'command to archive this deleted instance and' - 'remove its instance_mapping.') + say('Execute ' + '`nova-manage db archive_deleted_rows` ' + 'command to archive this deleted ' + 'instance and remove its instance_mapping.') return 3 except exception.InstanceNotFound: # instance is archived diff --git a/nova/compute/provider_tree.py b/nova/compute/provider_tree.py index d101f65660b3..f1384853db55 100644 --- a/nova/compute/provider_tree.py +++ b/nova/compute/provider_tree.py @@ -317,7 +317,7 @@ class ProviderTree(object): # that don't wind up at the root, which means we can't have # cycles. But to quell the paranoia... raise ValueError( - _("Unexpectedly failed to find parents already in the" + _("Unexpectedly failed to find parents already in the " "tree for any of the following: %s") % ','.join(set(to_add_by_uuid))) diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 95c37d93ddbb..68bfc11abdf9 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -698,12 +698,12 @@ http://man7.org/linux/man-pages/man7/random.7.html. cfg.ListOpt('uid_maps', default=[], help='List of uid targets and ranges.' - 'Syntax is guest-uid:host-uid:count' + 'Syntax is guest-uid:host-uid:count. ' 'Maximum of 5 allowed.'), cfg.ListOpt('gid_maps', default=[], help='List of guid targets and ranges.' - 'Syntax is guest-gid:host-gid:count' + 'Syntax is guest-gid:host-gid:count. ' 'Maximum of 5 allowed.'), cfg.IntOpt('realtime_scheduler_priority', default=1, diff --git a/nova/conf/wsgi.py b/nova/conf/wsgi.py index 35a978b0fe12..6883b28f51ad 100644 --- a/nova/conf/wsgi.py +++ b/nova/conf/wsgi.py @@ -64,7 +64,7 @@ has no effect. Possible values: -* '%(client_ip)s "%(request_line)s" status: %(status_code)s' +* '%(client_ip)s "%(request_line)s" status: %(status_code)s ' 'len: %(body_length)s time: %(wall_seconds).7f' (default) * Any formatted string formed by specific values. """), diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 061f318236c5..f241846d3226 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -3018,7 +3018,7 @@ class API(base_api.NetworkAPI): self._get_pci_devices_from_migration_context(migration_context, migration) if old_pci_devices and new_pci_devices: - LOG.debug("Determining PCI devices mapping using migration" + LOG.debug("Determining PCI devices mapping using migration " "context: old_pci_devices: %(old)s, " "new_pci_devices: %(new)s", {'old': [dev for dev in old_pci_devices], diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 59340cbdaf2f..ff4748cc72c0 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -1779,7 +1779,7 @@ def load_compute_driver(virtapi, compute_driver=None): LOG.exception(_("Unable to load the virtualization driver")) sys.exit(1) except ValueError: - LOG.exception("Compute driver '%s' from 'nova.virt' is not of type" + LOG.exception("Compute driver '%s' from 'nova.virt' is not of type " "'%s'", compute_driver, str(ComputeDriver)) sys.exit(1) diff --git a/nova/virt/hyperv/serialproxy.py b/nova/virt/hyperv/serialproxy.py index 8f664a5bdba3..4f8a99dcf68b 100644 --- a/nova/virt/hyperv/serialproxy.py +++ b/nova/virt/hyperv/serialproxy.py @@ -69,7 +69,7 @@ class SerialProxy(threading.Thread): self._sock.listen(1) except socket.error as err: self._sock.close() - msg = (_('Failed to initialize serial proxy on' + msg = (_('Failed to initialize serial proxy on ' '%(addr)s:%(port)s, handling connections ' 'to instance %(instance_name)s. Error: %(error)s') % {'addr': self._addr, diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 12f136ae1099..564d8aa5e38c 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -305,7 +305,7 @@ class NWFilterFirewall(base_firewall.FirewallDriver): self._conn.nwfilterLookupByName(instance_filter_name) except libvirt.libvirtError: name = instance.name - LOG.debug('The nwfilter(%(instance_filter_name)s) for' + LOG.debug('The nwfilter(%(instance_filter_name)s) for ' '%(name)s is not found.', {'instance_filter_name': instance_filter_name, 'name': name}, diff --git a/nova/virt/powervm/media.py b/nova/virt/powervm/media.py index 16f3a4cd1558..03b820969223 100644 --- a/nova/virt/powervm/media.py +++ b/nova/virt/powervm/media.py @@ -77,7 +77,7 @@ class ConfigDrivePowerVM(object): # will default to generic vif. for vif in network_info: if vif.get('type') is not 'ovs': - LOG.debug('Changing vif type from %(type)s to vif for vif' + LOG.debug('Changing vif type from %(type)s to vif for vif ' '%(id)s.', {'type': vif.get('type'), 'id': vif.get('id')}) vif['type'] = 'vif' diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 9410f47c94c6..6abfbe168287 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -360,8 +360,7 @@ def find_guest_agent(base_dir): # required LOG.info('XenServer tools installed in this ' 'image are capable of network injection. ' - 'Networking files will not be' - 'manipulated') + 'Networking files will not be manipulated') return True xe_daemon_filename = os.path.join(base_dir, 'usr', 'sbin', 'xe-daemon') diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 766375043471..8b6377e95525 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -367,7 +367,7 @@ class XenAPIOpenVswitchDriver(XenVIFDriver): host_network.brctl_del_if(self._session, qbr_name, port_name) self._delete_net_dev(port_name) except Exception: - LOG.debug("Fail to delete linux port %(port_name)s on bridge" + LOG.debug("Fail to delete linux port %(port_name)s on bridge " "%(qbr_name)s", {'port_name': port_name, 'qbr_name': qbr_name}) diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index d456a1182d8a..80a1bb3c9e89 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -793,7 +793,7 @@ class VMOps(object): if rescue: if not image_meta.properties.obj_attr_is_set( "hw_auto_disk_config"): - LOG.debug("'hw_auto_disk_config' value not found in" + LOG.debug("'hw_auto_disk_config' value not found in " "rescue image_properties. Setting value to %s", auto_disk_config, instance=instance) else: @@ -1156,7 +1156,7 @@ class VMOps(object): undo_mgr, old_vdi_ref) transfer_vhd_to_dest(new_vdi_ref, new_vdi_uuid) except Exception as error: - LOG.exception(_("_migrate_disk_resizing_down failed. Restoring" + LOG.exception(_("_migrate_disk_resizing_down failed. Restoring " "orig vm"), instance=instance) undo_mgr._rollback() raise exception.InstanceFaultRollback(error) @@ -2369,8 +2369,8 @@ class VMOps(object): # passed from admin user, so we need this check until # block_migration flag is removed from API if not pooled_migrate: - reason = _("Destination host is not in the same shared storage" - "pool as source host %s.") % src + reason = _("Destination host is not in the same shared " + "storage pool as source host %s.") % src raise exception.MigrationPreCheckError(reason=reason) # TODO(johngarbutt) we currently assume # instance is on a SR shared with other destination