From: Brian Bowen Date: Wed, 11 Mar 2015 20:41:19 +0000 (-0400) Subject: Fix missing spaces in strings split across lines X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2dab8a30e7a9b6f5b894414cae4dead56a296202;p=openstack-build%2Fneutron-build.git Fix missing spaces in strings split across lines Change-Id: Ib40614aaff78a1a2c5d7aa20679ee48f18441218 Closes-bug: #1430994 --- diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py index 7fb4a4409..c2b9b901b 100644 --- a/neutron/api/v2/attributes.py +++ b/neutron/api/v2/attributes.py @@ -53,7 +53,7 @@ def _verify_dict_keys(expected_keys, target_dict, strict=True): predicate = expected_keys.__eq__ if strict else expected_keys.issubset if not predicate(provided_keys): - msg = (_("Validation of dictionary's keys failed." + msg = (_("Validation of dictionary's keys failed. " "Expected keys: %(expected_keys)s " "Provided keys: %(provided_keys)s") % {'expected_keys': expected_keys, diff --git a/neutron/common/config.py b/neutron/common/config.py index 696f1c4f9..e12607afb 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -81,7 +81,7 @@ core_opts = [ cfg.BoolOpt('allow_overlapping_ips', default=False, help=_("Allow overlapping IP support in Neutron")), cfg.StrOpt('host', default=utils.get_hostname(), - help=_("Hostname to be used by the neutron server, agents and" + help=_("Hostname to be used by the neutron server, agents and " "services running on this machine. All the agents and " "services running on this machine must use the same " "host value.")), diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py index 48b909235..2f938e294 100644 --- a/neutron/common/exceptions.py +++ b/neutron/common/exceptions.py @@ -120,7 +120,7 @@ class SubnetInUse(InUse): class PortInUse(InUse): message = _("Unable to complete operation on port %(port_id)s " - "for network %(net_id)s. Port already has an attached" + "for network %(net_id)s. Port already has an attached " "device %(device_id)s.") @@ -225,7 +225,7 @@ class UnsupportedPortDeviceOwner(Conflict): class OverlappingAllocationPools(Conflict): - message = _("Found overlapping allocation pools:" + message = _("Found overlapping allocation pools: " "%(pool_1)s %(pool_2)s for subnet %(subnet_cidr)s.") diff --git a/neutron/plugins/embrane/agent/operations/router_operations.py b/neutron/plugins/embrane/agent/operations/router_operations.py index c5cdcbbb9..a7a1c6a73 100644 --- a/neutron/plugins/embrane/agent/operations/router_operations.py +++ b/neutron/plugins/embrane/agent/operations/router_operations.py @@ -93,7 +93,7 @@ def _delete_dva(api, tenant_id, neutron_router): try: api.delete_dva(tenant_id, neutron_router["id"]) except h_exc.DvaNotFound: - LOG.warning(_LW("The router %s had no physical representation," + LOG.warning(_LW("The router %s had no physical representation, " "likely already deleted"), neutron_router["id"]) return p_con.Status.DELETED @@ -122,7 +122,7 @@ def _shrink_dva_iface(api, tenant_id, neutron_router, port_id): dva = api.shrink_interface(tenant_id, neutron_router["id"], neutron_router["admin_state_up"], port_id) except h_exc.InterfaceNotFound: - LOG.warning(_LW("Interface %s not found in the heleos back-end," + LOG.warning(_LW("Interface %s not found in the heleos back-end, " "likely already deleted"), port_id) return (p_con.Status.ACTIVE if neutron_router["admin_state_up"] else p_con.Status.READY) diff --git a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py index 00e7adc83..04562dd4c 100644 --- a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py +++ b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py @@ -138,11 +138,11 @@ class SdnveNeutronAgent(object): new_controller = info.get('new_controller') out_of_band = info.get('out_of_band') if self.int_br and new_controller: - LOG.debug("info_update received. New controller" + LOG.debug("info_update received. New controller " "is to be set to: %s", new_controller) self.int_br.set_controller(["tcp:" + new_controller]) if out_of_band: - LOG.debug("info_update received. New controller" + LOG.debug("info_update received. New controller " "is set to be out of band") self.int_br.set_db_attribute("Controller", self.int_bridge_name, diff --git a/neutron/plugins/ibm/sdnve_api.py b/neutron/plugins/ibm/sdnve_api.py index e992d8dc5..fc3800651 100644 --- a/neutron/plugins/ibm/sdnve_api.py +++ b/neutron/plugins/ibm/sdnve_api.py @@ -168,8 +168,8 @@ class RequestHandler(object): 'body': body, 'header': self.headers}) resp, replybody = self.httpclient.request( myurl, method=method, body=body, headers=self.headers) - LOG.debug(("Response recd from SDN-VE. resp: %(resp)s" - "body: %(body)s"), + LOG.debug("Response recd from SDN-VE. resp: %(resp)s " + "body: %(body)s", {'resp': resp.status, 'body': replybody}) status_code = resp.status diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index 1adb2487f..40b7d1be8 100755 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -95,8 +95,8 @@ class LinuxBridgeManager(object): def get_bridge_name(self, network_id): if not network_id: - LOG.warning(_LW("Invalid Network ID, will lead to incorrect bridge" - "name")) + LOG.warning(_LW("Invalid Network ID, will lead to incorrect " + "bridge name")) bridge_name = BRIDGE_NAME_PREFIX + network_id[0:11] return bridge_name diff --git a/neutron/plugins/ml2/drivers/arista/config.py b/neutron/plugins/ml2/drivers/arista/config.py index 0f53f3afa..c1534d2bf 100644 --- a/neutron/plugins/ml2/drivers/arista/config.py +++ b/neutron/plugins/ml2/drivers/arista/config.py @@ -29,7 +29,7 @@ ARISTA_DRIVER_OPTS = [ cfg.StrOpt('eapi_username', default='', help=_('Username for Arista EOS. This is required field. ' - 'If not set, all communications to Arista EOS' + 'If not set, all communications to Arista EOS ' 'will fail.')), cfg.StrOpt('eapi_password', default='', @@ -40,7 +40,7 @@ ARISTA_DRIVER_OPTS = [ cfg.StrOpt('eapi_host', default='', help=_('Arista EOS IP address. This is required field. ' - 'If not set, all communications to Arista EOS' + 'If not set, all communications to Arista EOS ' 'will fail.')), cfg.BoolOpt('use_fqdn', default=True, @@ -112,7 +112,7 @@ ARISTA_L3_PLUGIN = [ default=False, help=_('A "True" value for this flag indicates to create a ' 'router in VRF. If not set, all routers are created ' - 'in default VRF.' + 'in default VRF. ' 'This is optional. If not set, a value of "False" ' 'is assumed.')), cfg.IntOpt('l3_sync_interval', diff --git a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py index f459902be..8308b58af 100644 --- a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py @@ -81,7 +81,7 @@ class OVSPort(object): self.device_owner = device_owner def __str__(self): - return ("OVSPort: id = %s, ofport = %s, mac = %s," + return ("OVSPort: id = %s, ofport = %s, mac = %s, " "device_owner = %s, subnets = %s" % (self.id, self.ofport, self.mac, self.device_owner, self.subnets)) diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index ab479b5c5..ea7c8e7fe 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -1267,7 +1267,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, try: skipped_devices = self.treat_devices_added_or_updated( devices_added_updated, ovs_restarted) - LOG.debug("process_network_ports - iteration:%(iter_num)d -" + LOG.debug("process_network_ports - iteration:%(iter_num)d - " "treat_devices_added_or_updated completed. " "Skipped %(num_skipped)d devices of " "%(num_current)d devices currently available. " @@ -1290,7 +1290,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, if 'removed' in port_info: start = time.time() resync_b = self.treat_devices_removed(port_info['removed']) - LOG.debug("process_network_ports - iteration:%(iter_num)d -" + LOG.debug("process_network_ports - iteration:%(iter_num)d - " "treat_devices_removed completed in %(elapsed).3f", {'iter_num': self.iter_num, 'elapsed': time.time() - start}) @@ -1489,7 +1489,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, # If treat devices fails - must resync with plugin sync = self.process_network_ports(port_info, ovs_restarted) - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d -" + LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " "ports processed. Elapsed:%(elapsed).3f", {'iter_num': self.iter_num, 'elapsed': time.time() - start}) @@ -1504,7 +1504,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, if self.ancillary_brs: port_info = self.update_ancillary_ports( ancillary_ports) - LOG.debug("Agent rpc_loop - iteration:%(iter_num)d -" + LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " "ancillary port info retrieved. " "Elapsed:%(elapsed).3f", {'iter_num': self.iter_num, @@ -1513,7 +1513,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, if port_info: rc = self.process_ancillary_network_ports( port_info) - LOG.debug("Agent rpc_loop - iteration:" + LOG.debug("Agent rpc_loop - iteration: " "%(iter_num)d - ancillary ports " "processed. Elapsed:%(elapsed).3f", {'iter_num': self.iter_num, diff --git a/neutron/policy.py b/neutron/policy.py index 8fa8a3878..d73d961c1 100644 --- a/neutron/policy.py +++ b/neutron/policy.py @@ -242,8 +242,8 @@ class OwnerCheck(policy.Check): self.target_field = re.findall(r'^\%\((.*)\)s$', match)[0] except IndexError: - err_reason = (_("Unable to identify a target field from:%s." - "match should be in the form %%()s") % + err_reason = (_("Unable to identify a target field from:%s. " + "Match should be in the form %%()s") % match) LOG.exception(err_reason) raise exceptions.PolicyInitError(