From dd726ed494db91e9c3e957a6a37e9fd498b5bbc0 Mon Sep 17 00:00:00 2001 From: Doug Wiegley Date: Wed, 25 Nov 2015 15:46:19 -0800 Subject: [PATCH] Move i18n to _i18n, as per oslo_i18n guidelines - This does NOT break other projects that rely on neutron.i18n, as this change includes a debtcollector shim to maintain those older entry points, until they can migrate. - Also updates _i18n.py to the latest pattern defined by oslo_i18n - Guidance and template are from the reference: http://docs.openstack.org/developer/oslo.i18n/usage.html Partially-Closes-Bug: #1519493 Change-Id: I1aa3a5fd837d9156da4643a367013c869ed8bf9d --- doc/source/devref/i18n.rst | 37 ++++++++++++++++ doc/source/devref/index.rst | 1 + neutron/_i18n.py | 42 +++++++++++++++++++ neutron/agent/common/ovs_lib.py | 2 +- neutron/agent/common/utils.py | 2 +- neutron/agent/dhcp/agent.py | 2 +- neutron/agent/l2/extensions/manager.py | 2 +- neutron/agent/l2/extensions/qos.py | 2 +- neutron/agent/l3/agent.py | 2 +- neutron/agent/l3/dvr_local_router.py | 2 +- neutron/agent/l3/dvr_router_base.py | 2 +- neutron/agent/l3/ha.py | 2 +- neutron/agent/l3/ha_router.py | 2 +- neutron/agent/l3/keepalived_state_change.py | 2 +- neutron/agent/l3/namespace_manager.py | 2 +- neutron/agent/l3/namespaces.py | 2 +- neutron/agent/l3/router_info.py | 2 +- neutron/agent/linux/async_process.py | 2 +- neutron/agent/linux/daemon.py | 2 +- neutron/agent/linux/dhcp.py | 2 +- neutron/agent/linux/external_process.py | 2 +- neutron/agent/linux/interface.py | 2 +- neutron/agent/linux/ip_conntrack.py | 2 +- neutron/agent/linux/ip_lib.py | 2 +- neutron/agent/linux/ip_link_support.py | 2 +- neutron/agent/linux/ip_monitor.py | 2 +- neutron/agent/linux/iptables_firewall.py | 2 +- neutron/agent/linux/iptables_manager.py | 2 +- neutron/agent/linux/ovsdb_monitor.py | 2 +- neutron/agent/linux/utils.py | 2 +- neutron/agent/metadata/agent.py | 2 +- neutron/agent/metadata/namespace_proxy.py | 2 +- neutron/agent/ovsdb/impl_vsctl.py | 2 +- neutron/agent/ovsdb/native/commands.py | 2 +- neutron/agent/rpc.py | 2 +- neutron/agent/securitygroups_rpc.py | 2 +- neutron/api/api_common.py | 2 +- neutron/api/extensions.py | 2 +- .../rpc/agentnotifiers/dhcp_rpc_agent_api.py | 2 +- .../rpc/agentnotifiers/l3_rpc_agent_api.py | 2 +- neutron/api/rpc/handlers/dhcp_rpc.py | 2 +- .../api/rpc/handlers/securitygroups_rpc.py | 2 +- neutron/api/v2/base.py | 2 +- neutron/api/v2/resource.py | 2 +- neutron/callbacks/manager.py | 2 +- .../eventlet/plugins/hyperv_neutron_agent.py | 2 +- neutron/cmd/ipset_cleanup.py | 2 +- neutron/cmd/linuxbridge_cleanup.py | 2 +- neutron/cmd/netns_cleanup.py | 2 +- neutron/cmd/ovs_cleanup.py | 2 +- neutron/cmd/sanity/checks.py | 2 +- neutron/cmd/sanity_check.py | 2 +- neutron/common/config.py | 2 +- neutron/common/ipv6_utils.py | 2 +- neutron/common/utils.py | 2 +- neutron/db/agents_db.py | 2 +- neutron/db/agentschedulers_db.py | 2 +- neutron/db/db_base_plugin_v2.py | 2 +- neutron/db/dvr_mac_db.py | 2 +- neutron/db/ipam_backend_mixin.py | 2 +- neutron/db/ipam_pluggable_backend.py | 2 +- neutron/db/l3_agentschedulers_db.py | 2 +- neutron/db/l3_db.py | 2 +- neutron/db/l3_dvr_db.py | 2 +- neutron/db/l3_dvrscheduler_db.py | 2 +- neutron/db/l3_hamode_db.py | 2 +- neutron/db/metering/metering_rpc.py | 2 +- neutron/db/securitygroups_rpc_base.py | 2 +- neutron/debug/commands.py | 2 +- neutron/debug/debug_agent.py | 2 +- neutron/extensions/l3agentscheduler.py | 2 +- neutron/extensions/vlantransparent.py | 2 +- neutron/i18n.py | 25 ++++++----- neutron/ipam/drivers/neutrondb_ipam/driver.py | 2 +- neutron/manager.py | 2 +- neutron/notifiers/nova.py | 2 +- neutron/pecan_wsgi/controllers/root.py | 2 +- neutron/pecan_wsgi/startup.py | 2 +- neutron/plugins/brocade/NeutronPlugin.py | 2 +- neutron/plugins/brocade/nos/nosdriver.py | 2 +- neutron/plugins/common/utils.py | 2 +- neutron/plugins/hyperv/agent/l2_agent.py | 2 +- neutron/plugins/ml2/db.py | 2 +- neutron/plugins/ml2/driver_context.py | 2 +- .../plugins/ml2/drivers/l2pop/mech_driver.py | 2 +- .../drivers/linuxbridge/agent/arp_protect.py | 2 +- .../agent/linuxbridge_neutron_agent.py | 2 +- neutron/plugins/ml2/drivers/mech_agent.py | 2 +- .../mech_sriov/agent/eswitch_manager.py | 2 +- .../agent/extension_drivers/qos_driver.py | 2 +- .../ml2/drivers/mech_sriov/agent/pci_lib.py | 2 +- .../mech_sriov/agent/sriov_nic_agent.py | 2 +- .../mech_sriov/mech_driver/mech_driver.py | 2 +- .../agent/openflow/native/br_int.py | 2 +- .../agent/openflow/native/ofswitch.py | 2 +- .../agent/openflow/native/ovs_bridge.py | 2 +- .../agent/openflow/ovs_ofctl/ofswitch.py | 2 +- .../agent/ovs_dvr_neutron_agent.py | 2 +- .../openvswitch/agent/ovs_neutron_agent.py | 2 +- neutron/plugins/ml2/drivers/type_flat.py | 2 +- neutron/plugins/ml2/drivers/type_geneve.py | 2 +- neutron/plugins/ml2/drivers/type_gre.py | 2 +- neutron/plugins/ml2/drivers/type_local.py | 2 +- neutron/plugins/ml2/drivers/type_tunnel.py | 2 +- neutron/plugins/ml2/drivers/type_vlan.py | 2 +- neutron/plugins/ml2/drivers/type_vxlan.py | 2 +- .../plugins/ml2/extensions/port_security.py | 2 +- neutron/plugins/ml2/managers.py | 2 +- neutron/plugins/ml2/plugin.py | 2 +- neutron/plugins/ml2/rpc.py | 2 +- neutron/policy.py | 2 +- neutron/quota/__init__.py | 2 +- neutron/quota/resource.py | 2 +- neutron/quota/resource_registry.py | 2 +- neutron/scheduler/dhcp_agent_scheduler.py | 2 +- neutron/scheduler/l3_agent_scheduler.py | 2 +- neutron/server/rpc_eventlet.py | 2 +- neutron/server/wsgi_eventlet.py | 2 +- neutron/server/wsgi_pecan.py | 2 +- neutron/service.py | 2 +- .../agents/l3reference/firewall_l3_agent.py | 2 +- .../metering/agents/metering_agent.py | 2 +- .../drivers/iptables/iptables_driver.py | 2 +- neutron/services/provider_configuration.py | 2 +- .../qos/notification_drivers/manager.py | 2 +- .../qos/notification_drivers/message_queue.py | 2 +- neutron/services/service_base.py | 2 +- neutron/wsgi.py | 2 +- tox.ini | 2 +- 129 files changed, 217 insertions(+), 138 deletions(-) create mode 100644 doc/source/devref/i18n.rst create mode 100644 neutron/_i18n.py mode change 100755 => 100644 neutron/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/qos_driver.py mode change 100755 => 100644 neutron/server/wsgi_pecan.py diff --git a/doc/source/devref/i18n.rst b/doc/source/devref/i18n.rst new file mode 100644 index 00000000000..1f0d69875b8 --- /dev/null +++ b/doc/source/devref/i18n.rst @@ -0,0 +1,37 @@ +.. + Licensed under the Apache License, Version 2.0 (the "License"); you may + not use this file except in compliance with the License. You may obtain + a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + License for the specific language governing permissions and limitations + under the License. + + + Convention for heading levels in Neutron devref: + ======= Heading 0 (reserved for the title in a document) + ------- Heading 1 + ~~~~~~~ Heading 2 + +++++++ Heading 3 + ''''''' Heading 4 + (Avoid deeper levels because they do not render well.) + + +Neutron Stadiun i18n +==================== + +* Refer to oslo_i18n documentation for the general mechanisms that should + be used: http://docs.openstack.org/developer/oslo.i18n/usage.html + +* Do NOT use the _i18n module in neutron-lib or neutron. + +* It is recommended that you create a {package_name}/_i18n.py file + in your repo, and use that. Your localization strings will also live + in your repo. + +* The neutron.i18n module will be around for a release or two, with + shared localization strings, but migration is encouraged. diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst index 13a7d5cc966..5cf198a7dfe 100644 --- a/doc/source/devref/index.rst +++ b/doc/source/devref/index.rst @@ -70,6 +70,7 @@ Neutron Internals callbacks dns_order upgrade + i18n Testing ------- diff --git a/neutron/_i18n.py b/neutron/_i18n.py new file mode 100644 index 00000000000..5b9b5fa2fdd --- /dev/null +++ b/neutron/_i18n.py @@ -0,0 +1,42 @@ +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import oslo_i18n + +DOMAIN = "neutron" + +_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) + +# The primary translation function using the well-known name "_" +_ = _translators.primary + +# The contextual translation function using the name "_C" +_C = _translators.contextual_form + +# The plural translation function using the name "_P" +_P = _translators.plural_form + +# Translators for log levels. +# +# The abbreviated names are meant to reflect the usual use of a short +# name like '_'. The "L" is for "log" and the other letter comes from +# the level. +_LI = _translators.log_info +_LW = _translators.log_warning +_LE = _translators.log_error +_LC = _translators.log_critical + + +def get_available_languages(): + return oslo_i18n.get_available_languages(DOMAIN) diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py index 08f3bb094dc..cb652b5597e 100644 --- a/neutron/agent/common/ovs_lib.py +++ b/neutron/agent/common/ovs_lib.py @@ -24,11 +24,11 @@ import retrying import six import uuid +from neutron._i18n import _LE, _LI, _LW from neutron.agent.common import utils from neutron.agent.linux import ip_lib from neutron.agent.ovsdb import api as ovsdb from neutron.common import exceptions -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers.openvswitch.agent.common \ import constants diff --git a/neutron/agent/common/utils.py b/neutron/agent/common/utils.py index f45ab600b93..08fdc681675 100644 --- a/neutron/agent/common/utils.py +++ b/neutron/agent/common/utils.py @@ -18,9 +18,9 @@ import os from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.common import config from neutron.common import utils as neutron_utils -from neutron.i18n import _LE if os.name == 'nt': diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py index 9d654a61d5d..98af99e31d2 100644 --- a/neutron/agent/dhcp/agent.py +++ b/neutron/agent/dhcp/agent.py @@ -24,6 +24,7 @@ import oslo_messaging from oslo_service import loopingcall from oslo_utils import importutils +from neutron._i18n import _LE, _LI, _LW from neutron.agent.linux import dhcp from neutron.agent.linux import external_process from neutron.agent.metadata import driver as metadata_driver @@ -34,7 +35,6 @@ from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron import manager LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l2/extensions/manager.py b/neutron/agent/l2/extensions/manager.py index bc8f3006f07..b31da1f5686 100644 --- a/neutron/agent/l2/extensions/manager.py +++ b/neutron/agent/l2/extensions/manager.py @@ -17,7 +17,7 @@ from oslo_config import cfg from oslo_log import log import stevedore -from neutron.i18n import _LE, _LI +from neutron._i18n import _LE, _LI LOG = log.getLogger(__name__) diff --git a/neutron/agent/l2/extensions/qos.py b/neutron/agent/l2/extensions/qos.py index 8ff4704f253..f5a2594c947 100644 --- a/neutron/agent/l2/extensions/qos.py +++ b/neutron/agent/l2/extensions/qos.py @@ -20,13 +20,13 @@ from oslo_concurrency import lockutils from oslo_log import log as logging import six +from neutron._i18n import _LW, _LI from neutron.agent.l2 import agent_extension from neutron.api.rpc.callbacks.consumer import registry from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc from neutron.common import exceptions -from neutron.i18n import _LW, _LI from neutron import manager LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/agent.py b/neutron/agent/l3/agent.py index 94be7e0d348..6d7c2edb24f 100644 --- a/neutron/agent/l3/agent.py +++ b/neutron/agent/l3/agent.py @@ -23,6 +23,7 @@ from oslo_service import periodic_task from oslo_utils import excutils from oslo_utils import timeutils +from neutron._i18n import _LE, _LI, _LW from neutron.agent.common import utils as common_utils from neutron.agent.l3 import dvr from neutron.agent.l3 import dvr_edge_ha_router @@ -48,7 +49,6 @@ from neutron.common import ipv6_utils from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as n_context -from neutron.i18n import _LE, _LI, _LW from neutron import manager try: diff --git a/neutron/agent/l3/dvr_local_router.py b/neutron/agent/l3/dvr_local_router.py index 52bb49cca01..2a4336364c6 100644 --- a/neutron/agent/l3/dvr_local_router.py +++ b/neutron/agent/l3/dvr_local_router.py @@ -20,13 +20,13 @@ from oslo_log import log as logging from oslo_utils import excutils import six +from neutron._i18n import _LE, _LW from neutron.agent.l3 import dvr_fip_ns from neutron.agent.l3 import dvr_router_base from neutron.agent.linux import ip_lib from neutron.common import constants as l3_constants from neutron.common import exceptions from neutron.common import utils as common_utils -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) # xor-folding mask used for IPv6 rule index diff --git a/neutron/agent/l3/dvr_router_base.py b/neutron/agent/l3/dvr_router_base.py index ec519ef93fb..f78968cdfd7 100644 --- a/neutron/agent/l3/dvr_router_base.py +++ b/neutron/agent/l3/dvr_router_base.py @@ -12,9 +12,9 @@ from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.l3 import router_info as router from neutron.common import constants as l3_constants -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/ha.py b/neutron/agent/l3/ha.py index 2c2044acb38..30e4b127bcd 100644 --- a/neutron/agent/l3/ha.py +++ b/neutron/agent/l3/ha.py @@ -20,10 +20,10 @@ from oslo_config import cfg from oslo_log import log as logging import webob +from neutron._i18n import _LI from neutron.agent.linux import keepalived from neutron.agent.linux import utils as agent_utils from neutron.common import utils as common_utils -from neutron.i18n import _LI from neutron.notifiers import batch_notifier LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/ha_router.py b/neutron/agent/l3/ha_router.py index e0e96f86e91..a9f2bfc6c76 100644 --- a/neutron/agent/l3/ha_router.py +++ b/neutron/agent/l3/ha_router.py @@ -18,13 +18,13 @@ import shutil import netaddr from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.l3 import router_info as router from neutron.agent.linux import external_process from neutron.agent.linux import ip_lib from neutron.agent.linux import keepalived from neutron.common import constants as n_consts from neutron.common import utils as common_utils -from neutron.i18n import _LE LOG = logging.getLogger(__name__) HA_DEV_PREFIX = 'ha-' diff --git a/neutron/agent/l3/keepalived_state_change.py b/neutron/agent/l3/keepalived_state_change.py index 6d33be2a67a..b4bcaa8eb45 100644 --- a/neutron/agent/l3/keepalived_state_change.py +++ b/neutron/agent/l3/keepalived_state_change.py @@ -20,12 +20,12 @@ from oslo_config import cfg from oslo_log import log as logging import requests +from neutron._i18n import _LE from neutron.agent.l3 import ha from neutron.agent.linux import daemon from neutron.agent.linux import ip_monitor from neutron.agent.linux import utils as agent_utils from neutron.common import config -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/namespace_manager.py b/neutron/agent/l3/namespace_manager.py index 00f2919fea7..7d3aceca8fa 100644 --- a/neutron/agent/l3/namespace_manager.py +++ b/neutron/agent/l3/namespace_manager.py @@ -12,12 +12,12 @@ from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.l3 import dvr_fip_ns from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import namespaces from neutron.agent.linux import external_process from neutron.agent.linux import ip_lib -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/namespaces.py b/neutron/agent/l3/namespaces.py index e3c6973d7f6..ccb0bf77d1e 100644 --- a/neutron/agent/l3/namespaces.py +++ b/neutron/agent/l3/namespaces.py @@ -15,8 +15,8 @@ from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.linux import ip_lib -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/l3/router_info.py b/neutron/agent/l3/router_info.py index e2c9907a84e..968bd9d3632 100644 --- a/neutron/agent/l3/router_info.py +++ b/neutron/agent/l3/router_info.py @@ -16,6 +16,7 @@ import netaddr from oslo_log import log as logging +from neutron._i18n import _LE, _LW from neutron.agent.l3 import namespaces from neutron.agent.linux import ip_lib from neutron.agent.linux import iptables_manager @@ -24,7 +25,6 @@ from neutron.common import constants as l3_constants from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.common import utils as common_utils -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) INTERNAL_DEV_PREFIX = namespaces.INTERNAL_DEV_PREFIX diff --git a/neutron/agent/linux/async_process.py b/neutron/agent/linux/async_process.py index ed6593a2d57..8e4ba21e49c 100644 --- a/neutron/agent/linux/async_process.py +++ b/neutron/agent/linux/async_process.py @@ -19,10 +19,10 @@ import eventlet.event import eventlet.queue from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import utils as common_utils -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/daemon.py b/neutron/agent/linux/daemon.py index f043920a7ad..98954b674f6 100644 --- a/neutron/agent/linux/daemon.py +++ b/neutron/agent/linux/daemon.py @@ -24,8 +24,8 @@ import sys from oslo_log import log as logging +from neutron._i18n import _LE, _LI from neutron.common import exceptions -from neutron.i18n import _LE, _LI LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index d6050074c53..d850a738399 100644 --- a/neutron/agent/linux/dhcp.py +++ b/neutron/agent/linux/dhcp.py @@ -27,6 +27,7 @@ import oslo_messaging from oslo_utils import uuidutils import six +from neutron._i18n import _LI, _LW, _LE from neutron.agent.common import utils as agent_common_utils from neutron.agent.linux import external_process from neutron.agent.linux import ip_lib @@ -36,7 +37,6 @@ from neutron.common import exceptions from neutron.common import ipv6_utils from neutron.common import utils as common_utils from neutron.extensions import extra_dhcp_opt as edo_ext -from neutron.i18n import _LI, _LW, _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py index 9f1808fb091..e0b7cf70af1 100644 --- a/neutron/agent/linux/external_process.py +++ b/neutron/agent/linux/external_process.py @@ -23,11 +23,11 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import fileutils +from neutron._i18n import _LE from neutron.agent.common import config as agent_cfg from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import utils as common_utils -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py index 13ff3c9078c..8a7a51eef0b 100644 --- a/neutron/agent/linux/interface.py +++ b/neutron/agent/linux/interface.py @@ -20,13 +20,13 @@ from oslo_config import cfg from oslo_log import log as logging import six +from neutron._i18n import _LE, _LI from neutron.agent.common import ovs_lib from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import constants as n_const from neutron.common import exceptions from neutron.common import ipv6_utils -from neutron.i18n import _LE, _LI LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/ip_conntrack.py b/neutron/agent/linux/ip_conntrack.py index 3e988ee3918..4bbd835c1d1 100644 --- a/neutron/agent/linux/ip_conntrack.py +++ b/neutron/agent/linux/ip_conntrack.py @@ -14,8 +14,8 @@ import netaddr from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.linux import utils as linux_utils -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py index ce6cd2c8786..c341a4e808e 100644 --- a/neutron/agent/linux/ip_lib.py +++ b/neutron/agent/linux/ip_lib.py @@ -23,10 +23,10 @@ from oslo_utils import excutils import re import six +from neutron._i18n import _LE from neutron.agent.common import utils from neutron.common import constants from neutron.common import exceptions -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/ip_link_support.py b/neutron/agent/linux/ip_link_support.py index d41a2ecb8d0..64122383b9d 100644 --- a/neutron/agent/linux/ip_link_support.py +++ b/neutron/agent/linux/ip_link_support.py @@ -17,9 +17,9 @@ import re from oslo_log import log as logging +from neutron._i18n import _LE from neutron.agent.linux import utils from neutron.common import exceptions as n_exc -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/ip_monitor.py b/neutron/agent/linux/ip_monitor.py index 27fb5cb6e96..97bd7ffa7df 100644 --- a/neutron/agent/linux/ip_monitor.py +++ b/neutron/agent/linux/ip_monitor.py @@ -16,8 +16,8 @@ from oslo_log import log as logging from oslo_utils import excutils +from neutron._i18n import _LE from neutron.agent.linux import async_process -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/iptables_firewall.py b/neutron/agent/linux/iptables_firewall.py index 47c7d9b7db2..f34c83b73e8 100644 --- a/neutron/agent/linux/iptables_firewall.py +++ b/neutron/agent/linux/iptables_firewall.py @@ -21,6 +21,7 @@ from oslo_config import cfg from oslo_log import log as logging import six +from neutron._i18n import _LI from neutron.agent import firewall from neutron.agent.linux import ip_conntrack from neutron.agent.linux import ipset_manager @@ -32,7 +33,6 @@ from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.common import utils as c_utils from neutron.extensions import portsecurity as psec -from neutron.i18n import _LI LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/iptables_manager.py b/neutron/agent/linux/iptables_manager.py index ad5da44545c..3d9542bca11 100644 --- a/neutron/agent/linux/iptables_manager.py +++ b/neutron/agent/linux/iptables_manager.py @@ -31,12 +31,12 @@ from oslo_log import log as logging from oslo_utils import excutils import six +from neutron._i18n import _LE, _LW from neutron.agent.common import config from neutron.agent.linux import iptables_comments as ic from neutron.agent.linux import utils as linux_utils from neutron.common import exceptions as n_exc from neutron.common import utils -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/ovsdb_monitor.py b/neutron/agent/linux/ovsdb_monitor.py index 0300728a3d6..bf1edf3b19b 100644 --- a/neutron/agent/linux/ovsdb_monitor.py +++ b/neutron/agent/linux/ovsdb_monitor.py @@ -16,9 +16,9 @@ import eventlet from oslo_log import log as logging from oslo_serialization import jsonutils +from neutron._i18n import _LE from neutron.agent.linux import async_process from neutron.agent.ovsdb import api as ovsdb -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 29d129ad1a2..5c4efc48f6d 100644 --- a/neutron/agent/linux/utils.py +++ b/neutron/agent/linux/utils.py @@ -35,10 +35,10 @@ from oslo_utils import excutils import six from six.moves import http_client as httplib +from neutron._i18n import _LE from neutron.agent.common import config from neutron.common import constants from neutron.common import utils -from neutron.i18n import _LE from neutron import wsgi diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index 81cb4256689..47ccdc4e422 100644 --- a/neutron/agent/metadata/agent.py +++ b/neutron/agent/metadata/agent.py @@ -24,6 +24,7 @@ import six import six.moves.urllib.parse as urlparse import webob +from neutron._i18n import _LE, _LW from neutron.agent.linux import utils as agent_utils from neutron.agent.metadata import config from neutron.agent import rpc as agent_rpc @@ -32,7 +33,6 @@ from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import context -from neutron.i18n import _LE, _LW from neutron.openstack.common.cache import cache LOG = logging.getLogger(__name__) diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py index 1af885d2779..b1ba58d47a8 100644 --- a/neutron/agent/metadata/namespace_proxy.py +++ b/neutron/agent/metadata/namespace_proxy.py @@ -21,12 +21,12 @@ import six import six.moves.urllib.parse as urlparse import webob +from neutron._i18n import _LE from neutron.agent.linux import daemon from neutron.agent.linux import utils as agent_utils from neutron.common import config from neutron.common import exceptions from neutron.common import utils -from neutron.i18n import _LE from neutron import wsgi LOG = logging.getLogger(__name__) diff --git a/neutron/agent/ovsdb/impl_vsctl.py b/neutron/agent/ovsdb/impl_vsctl.py index 21e3e63e673..e108a78b7e5 100644 --- a/neutron/agent/ovsdb/impl_vsctl.py +++ b/neutron/agent/ovsdb/impl_vsctl.py @@ -20,9 +20,9 @@ from oslo_serialization import jsonutils from oslo_utils import excutils import six +from neutron._i18n import _LE from neutron.agent.common import utils from neutron.agent.ovsdb import api as ovsdb -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/ovsdb/native/commands.py b/neutron/agent/ovsdb/native/commands.py index 2ed58576362..9aa4e116929 100644 --- a/neutron/agent/ovsdb/native/commands.py +++ b/neutron/agent/ovsdb/native/commands.py @@ -17,9 +17,9 @@ import collections from oslo_log import log as logging from oslo_utils import excutils +from neutron._i18n import _LE from neutron.agent.ovsdb import api from neutron.agent.ovsdb.native import idlutils -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py index fa93b362ba0..64a30e1a851 100644 --- a/neutron/agent/rpc.py +++ b/neutron/agent/rpc.py @@ -20,10 +20,10 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import uuidutils +from neutron._i18n import _LW from neutron.common import constants from neutron.common import rpc as n_rpc from neutron.common import topics -from neutron.i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py index 0f5c5d7ae40..8be598a221c 100644 --- a/neutron/agent/securitygroups_rpc.py +++ b/neutron/agent/securitygroups_rpc.py @@ -21,9 +21,9 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import importutils +from neutron._i18n import _LI, _LW from neutron.agent import firewall from neutron.api.rpc.handlers import securitygroups_rpc -from neutron.i18n import _LI, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py index 659e1ee1aa5..010ccfe1582 100644 --- a/neutron/api/api_common.py +++ b/neutron/api/api_common.py @@ -21,9 +21,9 @@ import six from six.moves.urllib import parse from webob import exc +from neutron._i18n import _LW from neutron.common import constants from neutron.common import exceptions -from neutron.i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index 61fb7cf8e70..602b5a134bf 100644 --- a/neutron/api/extensions.py +++ b/neutron/api/extensions.py @@ -26,9 +26,9 @@ import six import webob.dec import webob.exc +from neutron._i18n import _LE, _LI, _LW from neutron.common import exceptions import neutron.extensions -from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron.services import provider_configuration from neutron import wsgi diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py index 16e95140ead..e630c4a7f74 100644 --- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py @@ -17,11 +17,11 @@ from oslo_config import cfg from oslo_log import log as logging import oslo_messaging +from neutron._i18n import _LE, _LW from neutron.common import constants from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils -from neutron.i18n import _LE, _LW from neutron import manager diff --git a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py index 2b8f426d002..a0c0645df63 100644 --- a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py @@ -18,12 +18,12 @@ import random from oslo_log import log as logging import oslo_messaging +from neutron._i18n import _LE from neutron.common import constants from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agentschedulers_db -from neutron.i18n import _LE from neutron import manager from neutron.plugins.common import constants as service_constants diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py index ea33738b8a2..b23586a72b1 100644 --- a/neutron/api/rpc/handlers/dhcp_rpc.py +++ b/neutron/api/rpc/handlers/dhcp_rpc.py @@ -23,13 +23,13 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import excutils +from neutron._i18n import _LW from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc from neutron.common import utils from neutron.db import api as db_api from neutron.extensions import portbindings -from neutron.i18n import _LW from neutron import manager from neutron.plugins.common import utils as p_utils from neutron.quota import resource_registry diff --git a/neutron/api/rpc/handlers/securitygroups_rpc.py b/neutron/api/rpc/handlers/securitygroups_rpc.py index 7401fcda672..d621b24f95d 100644 --- a/neutron/api/rpc/handlers/securitygroups_rpc.py +++ b/neutron/api/rpc/handlers/securitygroups_rpc.py @@ -16,11 +16,11 @@ import oslo_messaging from oslo_log import log as logging +from neutron._i18n import _LW from neutron.common import constants from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils -from neutron.i18n import _LW from neutron import manager LOG = logging.getLogger(__name__) diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py index 4b978c4f181..f9470989a0c 100644 --- a/neutron/api/v2/base.py +++ b/neutron/api/v2/base.py @@ -24,6 +24,7 @@ from oslo_utils import excutils import six import webob.exc +from neutron._i18n import _LE, _LI from neutron.api import api_common from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.v2 import attributes @@ -32,7 +33,6 @@ from neutron.common import constants as const from neutron.common import exceptions from neutron.common import rpc as n_rpc from neutron.db import api as db_api -from neutron.i18n import _LE, _LI from neutron import policy from neutron import quota from neutron.quota import resource_registry diff --git a/neutron/api/v2/resource.py b/neutron/api/v2/resource.py index ac999465024..e8409af5905 100644 --- a/neutron/api/v2/resource.py +++ b/neutron/api/v2/resource.py @@ -27,8 +27,8 @@ import six import webob.dec import webob.exc +from neutron._i18n import _LE, _LI from neutron.common import exceptions -from neutron.i18n import _LE, _LI from neutron import wsgi diff --git a/neutron/callbacks/manager.py b/neutron/callbacks/manager.py index c5b97e9af73..2f050d7e3dc 100644 --- a/neutron/callbacks/manager.py +++ b/neutron/callbacks/manager.py @@ -15,9 +15,9 @@ import collections from oslo_log import log as logging from oslo_utils import reflection +from neutron._i18n import _LE from neutron.callbacks import events from neutron.callbacks import exceptions -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py b/neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py index eb1b61c12f1..60121636109 100644 --- a/neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py +++ b/neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py @@ -18,9 +18,9 @@ import sys from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LI from neutron.agent.common import config from neutron.common import config as common_config -from neutron.i18n import _LI from neutron.plugins.hyperv.agent import config as hyperv_config from neutron.plugins.hyperv.agent import l2_agent diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py index 91e3e52d667..d8121362c04 100644 --- a/neutron/cmd/ipset_cleanup.py +++ b/neutron/cmd/ipset_cleanup.py @@ -16,10 +16,10 @@ from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LE, _LI from neutron.agent.linux import ipset_manager from neutron.agent.linux import utils from neutron.common import config -from neutron.i18n import _LE, _LI LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/linuxbridge_cleanup.py b/neutron/cmd/linuxbridge_cleanup.py index 4daf665ad8a..4fa19760da3 100644 --- a/neutron/cmd/linuxbridge_cleanup.py +++ b/neutron/cmd/linuxbridge_cleanup.py @@ -15,9 +15,9 @@ import sys from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LE, _LI from neutron.common import config from neutron.common import utils as n_utils -from neutron.i18n import _LE, _LI from neutron.plugins.ml2.drivers.linuxbridge.agent \ import linuxbridge_neutron_agent diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py index 0a30545e5b3..e3822e8180c 100644 --- a/neutron/cmd/netns_cleanup.py +++ b/neutron/cmd/netns_cleanup.py @@ -20,6 +20,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import importutils +from neutron._i18n import _LE from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.dhcp import config as dhcp_config @@ -32,7 +33,6 @@ from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.api.v2 import attributes from neutron.common import config -from neutron.i18n import _LE LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/ovs_cleanup.py b/neutron/cmd/ovs_cleanup.py index ec9584228b9..bc3d2bae3f1 100644 --- a/neutron/cmd/ovs_cleanup.py +++ b/neutron/cmd/ovs_cleanup.py @@ -16,13 +16,13 @@ from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LI from neutron.agent.common import config as agent_config from neutron.agent.common import ovs_lib from neutron.agent.l3 import config as l3_config from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import config -from neutron.i18n import _LI LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/sanity/checks.py b/neutron/cmd/sanity/checks.py index 2f46f44629f..cbb9a2657f6 100644 --- a/neutron/cmd/sanity/checks.py +++ b/neutron/cmd/sanity/checks.py @@ -22,6 +22,7 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import uuidutils +from neutron._i18n import _LE from neutron.agent.common import ovs_lib from neutron.agent.l3 import ha_router from neutron.agent.l3 import namespaces @@ -32,7 +33,6 @@ from neutron.agent.linux import keepalived from neutron.agent.linux import utils as agent_utils from neutron.common import constants as n_consts from neutron.common import utils -from neutron.i18n import _LE from neutron.plugins.common import constants as const from neutron.plugins.ml2.drivers.openvswitch.agent.common \ import constants as ovs_const diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py index 71a286d9a5c..6088a1b35f1 100644 --- a/neutron/cmd/sanity_check.py +++ b/neutron/cmd/sanity_check.py @@ -18,11 +18,11 @@ import sys from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LE, _LW from neutron.agent import dhcp_agent from neutron.cmd.sanity import checks from neutron.common import config from neutron.db import l3_hamode_db -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/common/config.py b/neutron/common/config.py index 3358e371a9c..ac45d308283 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -27,9 +27,9 @@ from oslo_log import log as logging import oslo_messaging from oslo_service import wsgi +from neutron._i18n import _LI from neutron.api.v2 import attributes from neutron.common import utils -from neutron.i18n import _LI from neutron import policy from neutron import version diff --git a/neutron/common/ipv6_utils.py b/neutron/common/ipv6_utils.py index 9ad5b1ee3e1..35ac27277a9 100644 --- a/neutron/common/ipv6_utils.py +++ b/neutron/common/ipv6_utils.py @@ -21,8 +21,8 @@ import os import netaddr from oslo_log import log +from neutron._i18n import _LI from neutron.common import constants -from neutron.i18n import _LI LOG = log.getLogger(__name__) diff --git a/neutron/common/utils.py b/neutron/common/utils.py index 0cd9fc627a6..a20ba575206 100644 --- a/neutron/common/utils.py +++ b/neutron/common/utils.py @@ -44,8 +44,8 @@ from oslo_utils import importutils import six from stevedore import driver +from neutron._i18n import _LE from neutron.common import constants as n_const -from neutron.i18n import _LE TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" LOG = logging.getLogger(__name__) diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index 69ecb13180e..1eea41574cf 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -27,6 +27,7 @@ import sqlalchemy as sa from sqlalchemy.orm import exc from sqlalchemy import sql +from neutron._i18n import _LE, _LI, _LW from neutron.api.v2 import attributes from neutron.common import constants from neutron import context @@ -34,7 +35,6 @@ from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import agent as ext_agent from neutron.extensions import availability_zone as az_ext -from neutron.i18n import _LE, _LI, _LW from neutron import manager LOG = logging.getLogger(__name__) diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index 6c1e3658b80..de4457cc02e 100644 --- a/neutron/db/agentschedulers_db.py +++ b/neutron/db/agentschedulers_db.py @@ -25,6 +25,7 @@ import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc +from neutron._i18n import _LE, _LI, _LW from neutron.common import constants from neutron.common import utils from neutron import context as ncontext @@ -33,7 +34,6 @@ from neutron.db.availability_zone import network as network_az from neutron.db import model_base from neutron.extensions import agent as ext_agent from neutron.extensions import dhcpagentscheduler -from neutron.i18n import _LE, _LI, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index cbb482dfea9..ba1ad24203c 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -24,6 +24,7 @@ from oslo_utils import uuidutils from sqlalchemy import and_ from sqlalchemy import event +from neutron._i18n import _LE, _LI from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.callbacks import events @@ -44,7 +45,6 @@ from neutron.db import rbac_db_mixin as rbac_mixin from neutron.db import rbac_db_models as rbac_db from neutron.db import sqlalchemyutils from neutron.extensions import l3 -from neutron.i18n import _LE, _LI from neutron import ipam from neutron.ipam import subnet_alloc from neutron import manager diff --git a/neutron/db/dvr_mac_db.py b/neutron/db/dvr_mac_db.py index 7c3e92c9b9e..cd15ba48384 100644 --- a/neutron/db/dvr_mac_db.py +++ b/neutron/db/dvr_mac_db.py @@ -20,12 +20,12 @@ from oslo_log import log as logging import sqlalchemy as sa from sqlalchemy.orm import exc +from neutron._i18n import _LE from neutron.common import exceptions as n_exc from neutron.common import utils from neutron.db import model_base from neutron.extensions import dvr as ext_dvr from neutron.extensions import portbindings -from neutron.i18n import _LE from neutron import manager diff --git a/neutron/db/ipam_backend_mixin.py b/neutron/db/ipam_backend_mixin.py index 1b5f292fc57..e25aec16641 100644 --- a/neutron/db/ipam_backend_mixin.py +++ b/neutron/db/ipam_backend_mixin.py @@ -22,13 +22,13 @@ from oslo_db import exception as db_exc from oslo_log import log as logging from sqlalchemy.orm import exc as orm_exc +from neutron._i18n import _LI from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.db import db_base_plugin_common from neutron.db import models_v2 -from neutron.i18n import _LI from neutron.ipam import utils as ipam_utils LOG = logging.getLogger(__name__) diff --git a/neutron/db/ipam_pluggable_backend.py b/neutron/db/ipam_pluggable_backend.py index f364f5f99ee..5664316c550 100644 --- a/neutron/db/ipam_pluggable_backend.py +++ b/neutron/db/ipam_pluggable_backend.py @@ -19,13 +19,13 @@ from oslo_log import log as logging from oslo_utils import excutils from sqlalchemy import and_ +from neutron._i18n import _LE from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.db import ipam_backend_mixin from neutron.db import models_v2 -from neutron.i18n import _LE from neutron.ipam import driver from neutron.ipam import exceptions as ipam_exc from neutron.ipam import requests as ipam_req diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py index 9a76b1fd578..a7f984410ab 100644 --- a/neutron/db/l3_agentschedulers_db.py +++ b/neutron/db/l3_agentschedulers_db.py @@ -25,6 +25,7 @@ from sqlalchemy import orm from sqlalchemy.orm import joinedload from sqlalchemy import sql +from neutron._i18n import _LE, _LI, _LW from neutron.common import constants from neutron.common import utils as n_utils from neutron import context as n_ctx @@ -33,7 +34,6 @@ from neutron.db import agentschedulers_db from neutron.db import l3_attrs_db from neutron.db import model_base from neutron.extensions import l3agentscheduler -from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron.plugins.common import constants as service_constants diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index 5b10badc89e..feb3bda2b79 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -22,6 +22,7 @@ from sqlalchemy.orm import exc from oslo_utils import excutils import six +from neutron._i18n import _LI from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.callbacks import events @@ -37,7 +38,6 @@ from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import external_net from neutron.extensions import l3 -from neutron.i18n import _LI from neutron import manager from neutron.plugins.common import constants from neutron.plugins.common import utils as p_utils diff --git a/neutron/db/l3_dvr_db.py b/neutron/db/l3_dvr_db.py index 3a4fcfb3f10..35e86dfdd9a 100644 --- a/neutron/db/l3_dvr_db.py +++ b/neutron/db/l3_dvr_db.py @@ -18,6 +18,7 @@ from oslo_log import log as logging from oslo_utils import excutils import six +from neutron._i18n import _LI, _LW from neutron.api.v2 import attributes from neutron.callbacks import events from neutron.callbacks import exceptions @@ -32,7 +33,6 @@ from neutron.db import l3_dvrscheduler_db as l3_dvrsched_db from neutron.db import models_v2 from neutron.extensions import l3 from neutron.extensions import portbindings -from neutron.i18n import _LI, _LW from neutron import manager from neutron.plugins.common import constants from neutron.plugins.common import utils as p_utils diff --git a/neutron/db/l3_dvrscheduler_db.py b/neutron/db/l3_dvrscheduler_db.py index 28081904d6a..0a61d22a88d 100644 --- a/neutron/db/l3_dvrscheduler_db.py +++ b/neutron/db/l3_dvrscheduler_db.py @@ -21,6 +21,7 @@ import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import joinedload +from neutron._i18n import _LI, _LW from neutron.callbacks import events from neutron.callbacks import registry from neutron.callbacks import resources @@ -31,7 +32,6 @@ from neutron.db import l3_agentschedulers_db as l3agent_sch_db from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import l3agentscheduler -from neutron.i18n import _LI, _LW from neutron import manager from neutron.plugins.common import constants as service_constants from neutron.plugins.ml2 import db as ml2_db diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py index 525d3a53129..87545df2901 100644 --- a/neutron/db/l3_hamode_db.py +++ b/neutron/db/l3_hamode_db.py @@ -21,6 +21,7 @@ from oslo_utils import excutils import sqlalchemy as sa from sqlalchemy import orm +from neutron._i18n import _LI from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc @@ -34,7 +35,6 @@ from neutron.db import models_v2 from neutron.extensions import l3_ext_ha_mode as l3_ha from neutron.extensions import portbindings from neutron.extensions import providernet -from neutron.i18n import _LI from neutron.plugins.common import utils as p_utils diff --git a/neutron/db/metering/metering_rpc.py b/neutron/db/metering/metering_rpc.py index 9fda950df60..19e8e903aca 100644 --- a/neutron/db/metering/metering_rpc.py +++ b/neutron/db/metering/metering_rpc.py @@ -15,9 +15,9 @@ from oslo_log import log as logging import oslo_messaging +from neutron._i18n import _LE from neutron.common import constants as consts from neutron.common import utils -from neutron.i18n import _LE from neutron import manager from neutron.plugins.common import constants as service_constants diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py index a7a9bb204bc..5523ce13323 100644 --- a/neutron/db/securitygroups_rpc_base.py +++ b/neutron/db/securitygroups_rpc_base.py @@ -17,6 +17,7 @@ import netaddr from oslo_log import log as logging from sqlalchemy.orm import exc +from neutron._i18n import _LW from neutron.common import constants as n_const from neutron.common import ipv6_utils as ipv6 from neutron.common import utils @@ -24,7 +25,6 @@ from neutron.db import allowedaddresspairs_db as addr_pair from neutron.db import models_v2 from neutron.db import securitygroups_db as sg_db from neutron.extensions import securitygroup as ext_sg -from neutron.i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/debug/commands.py b/neutron/debug/commands.py index 9f3d380c40a..a8405c55508 100644 --- a/neutron/debug/commands.py +++ b/neutron/debug/commands.py @@ -19,7 +19,7 @@ from neutronclient.neutron import v2_0 as client from neutronclient.neutron.v2_0 import port from oslo_log import log as logging -from neutron.i18n import _LI +from neutron._i18n import _LI class ProbeCommand(client.NeutronCommand): diff --git a/neutron/debug/debug_agent.py b/neutron/debug/debug_agent.py index 5b436162c71..a83a8b06012 100644 --- a/neutron/debug/debug_agent.py +++ b/neutron/debug/debug_agent.py @@ -19,10 +19,10 @@ import socket import netaddr from oslo_log import log as logging +from neutron._i18n import _LW from neutron.agent.linux import dhcp from neutron.agent.linux import ip_lib from neutron.common import constants -from neutron.i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py index ac3e06a46a8..eb547dab77d 100644 --- a/neutron/extensions/l3agentscheduler.py +++ b/neutron/extensions/l3agentscheduler.py @@ -18,6 +18,7 @@ import abc from oslo_log import log as logging import webob.exc +from neutron._i18n import _LE from neutron.api import extensions from neutron.api.v2 import base from neutron.api.v2 import resource @@ -25,7 +26,6 @@ from neutron.common import constants from neutron.common import exceptions from neutron.common import rpc as n_rpc from neutron.extensions import agent -from neutron.i18n import _LE from neutron import manager from neutron.plugins.common import constants as service_constants from neutron import policy diff --git a/neutron/extensions/vlantransparent.py b/neutron/extensions/vlantransparent.py index c408d07cc1d..3086c1df015 100644 --- a/neutron/extensions/vlantransparent.py +++ b/neutron/extensions/vlantransparent.py @@ -15,10 +15,10 @@ from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LI from neutron.api import extensions from neutron.api.v2 import attributes from neutron.common import exceptions as nexception -from neutron.i18n import _LI LOG = logging.getLogger(__name__) diff --git a/neutron/i18n.py b/neutron/i18n.py index 39047248e1c..7c93336c8be 100644 --- a/neutron/i18n.py +++ b/neutron/i18n.py @@ -12,19 +12,18 @@ # License for the specific language governing permissions and limitations # under the License. -import oslo_i18n +# TODO(dougwig) - remove this file at the beginning of N. -_translators = oslo_i18n.TranslatorFactory(domain='neutron') +from debtcollector import moves -# The primary translation function using the well-known name "_" -_ = _translators.primary +import neutron._i18n -# Translators for log levels. -# -# The abbreviated names are meant to reflect the usual use of a short -# name like '_'. The "L" is for "log" and the other letter comes from -# the level. -_LI = _translators.log_info -_LW = _translators.log_warning -_LE = _translators.log_error -_LC = _translators.log_critical +message = "moved to neutron._i18n; please migrate to local oslo_i18n " \ + "usage, as defined in the devref and at " \ + "http://docs.openstack.org/developer/oslo.i18n/usage.html" + +_ = moves.moved_function(neutron._i18n._, '_', __name__, message=message) +_LI = moves.moved_function(neutron._i18n._LI, '_LI', __name__, message=message) +_LW = moves.moved_function(neutron._i18n._LW, '_LW', __name__, message=message) +_LE = moves.moved_function(neutron._i18n._LE, '_LE', __name__, message=message) +_LC = moves.moved_function(neutron._i18n._LC, '_LC', __name__, message=message) diff --git a/neutron/ipam/drivers/neutrondb_ipam/driver.py b/neutron/ipam/drivers/neutrondb_ipam/driver.py index 3a4beb1b281..d820ff1bdd6 100644 --- a/neutron/ipam/drivers/neutrondb_ipam/driver.py +++ b/neutron/ipam/drivers/neutrondb_ipam/driver.py @@ -18,10 +18,10 @@ from oslo_db import exception as db_exc from oslo_log import log from oslo_utils import uuidutils +from neutron._i18n import _LE from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils from neutron.db import api as db_api -from neutron.i18n import _LE from neutron.ipam import driver as ipam_base from neutron.ipam.drivers.neutrondb_ipam import db_api as ipam_db_api from neutron.ipam import exceptions as ipam_exc diff --git a/neutron/manager.py b/neutron/manager.py index d35ed8c626c..b90e8de9173 100644 --- a/neutron/manager.py +++ b/neutron/manager.py @@ -21,8 +21,8 @@ import oslo_messaging from oslo_service import periodic_task import six +from neutron._i18n import _LI from neutron.common import utils -from neutron.i18n import _LI from neutron.plugins.common import constants diff --git a/neutron/notifiers/nova.py b/neutron/notifiers/nova.py index 3479ef91db1..502085277d2 100644 --- a/neutron/notifiers/nova.py +++ b/neutron/notifiers/nova.py @@ -22,9 +22,9 @@ from oslo_log import log as logging from oslo_utils import uuidutils from sqlalchemy.orm import attributes as sql_attr +from neutron._i18n import _LE, _LI, _LW from neutron.common import constants from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron.notifiers import batch_notifier diff --git a/neutron/pecan_wsgi/controllers/root.py b/neutron/pecan_wsgi/controllers/root.py index 4e69beeec8d..d4522722306 100644 --- a/neutron/pecan_wsgi/controllers/root.py +++ b/neutron/pecan_wsgi/controllers/root.py @@ -18,9 +18,9 @@ from oslo_log import log import pecan from pecan import request +from neutron._i18n import _LW from neutron.api import extensions from neutron.api.views import versions as versions_view -from neutron.i18n import _LW from neutron import manager LOG = log.getLogger(__name__) diff --git a/neutron/pecan_wsgi/startup.py b/neutron/pecan_wsgi/startup.py index 5bf259c6d57..4b6dab2f7ad 100644 --- a/neutron/pecan_wsgi/startup.py +++ b/neutron/pecan_wsgi/startup.py @@ -15,10 +15,10 @@ from oslo_log import log +from neutron._i18n import _LI, _LW from neutron.api import extensions from neutron.api.v2 import attributes from neutron.api.v2 import router -from neutron.i18n import _LI, _LW from neutron import manager from neutron.pecan_wsgi.controllers import root from neutron import policy diff --git a/neutron/plugins/brocade/NeutronPlugin.py b/neutron/plugins/brocade/NeutronPlugin.py index 21c95158a64..861d255f60a 100644 --- a/neutron/plugins/brocade/NeutronPlugin.py +++ b/neutron/plugins/brocade/NeutronPlugin.py @@ -24,6 +24,7 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import importutils +from neutron._i18n import _LE, _LI from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api @@ -47,7 +48,6 @@ from neutron.db import portbindings_base from neutron.db import securitygroups_rpc_base as sg_db_rpc from neutron.extensions import portbindings from neutron.extensions import securitygroup as ext_sg -from neutron.i18n import _LE, _LI from neutron.plugins.brocade.db import models as brocade_db from neutron.plugins.brocade import vlanbm as vbm from neutron.plugins.common import constants as svc_constants diff --git a/neutron/plugins/brocade/nos/nosdriver.py b/neutron/plugins/brocade/nos/nosdriver.py index d2546a9a84d..fda80855c74 100644 --- a/neutron/plugins/brocade/nos/nosdriver.py +++ b/neutron/plugins/brocade/nos/nosdriver.py @@ -22,7 +22,7 @@ from ncclient import manager from oslo_log import log as logging from oslo_utils import excutils -from neutron.i18n import _LE +from neutron._i18n import _LE from neutron.plugins.brocade.nos import nctemplates as template diff --git a/neutron/plugins/common/utils.py b/neutron/plugins/common/utils.py index 47281b5cf16..28cab491466 100644 --- a/neutron/plugins/common/utils.py +++ b/neutron/plugins/common/utils.py @@ -22,10 +22,10 @@ from oslo_log import log as logging import six import webob.exc +from neutron._i18n import _LI from neutron.api.v2 import attributes from neutron.common import constants as n_const from neutron.common import exceptions as n_exc -from neutron.i18n import _LI from neutron.plugins.common import constants as p_const INTERFACE_HASH_LEN = 6 diff --git a/neutron/plugins/hyperv/agent/l2_agent.py b/neutron/plugins/hyperv/agent/l2_agent.py index 5a23c1c5519..ec2392eccf5 100644 --- a/neutron/plugins/hyperv/agent/l2_agent.py +++ b/neutron/plugins/hyperv/agent/l2_agent.py @@ -22,13 +22,13 @@ from oslo_log import log as logging import oslo_messaging from oslo_service import loopingcall +from neutron._i18n import _LE from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import constants as n_const from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context -from neutron.i18n import _LE from neutron.plugins.ml2.drivers.hyperv import constants as h_const LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/db.py b/neutron/plugins/ml2/db.py index a18319c7eeb..5ad811e37ca 100644 --- a/neutron/plugins/ml2/db.py +++ b/neutron/plugins/ml2/db.py @@ -20,11 +20,11 @@ import six from sqlalchemy import or_ from sqlalchemy.orm import exc +from neutron._i18n import _LE, _LI from neutron.common import constants as n_const from neutron.db import models_v2 from neutron.db import securitygroups_db as sg_db from neutron.extensions import portbindings -from neutron.i18n import _LE, _LI from neutron import manager from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import models diff --git a/neutron/plugins/ml2/driver_context.py b/neutron/plugins/ml2/driver_context.py index 72eccbf91d2..f6e71a6ca98 100644 --- a/neutron/plugins/ml2/driver_context.py +++ b/neutron/plugins/ml2/driver_context.py @@ -16,9 +16,9 @@ from oslo_log import log from oslo_serialization import jsonutils +from neutron._i18n import _LW from neutron.common import constants from neutron.extensions import portbindings -from neutron.i18n import _LW from neutron.plugins.ml2 import db from neutron.plugins.ml2 import driver_api as api diff --git a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py index 14dab900f6b..4df03ed9cdd 100644 --- a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py +++ b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py @@ -16,10 +16,10 @@ from oslo_config import cfg from oslo_log import log as logging +from neutron._i18n import _LW from neutron.common import constants as const from neutron import context as n_context from neutron.db import api as db_api -from neutron.i18n import _LW from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers.l2pop import config # noqa diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/arp_protect.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/arp_protect.py index e45c8b83f1a..54daff1720d 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/arp_protect.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/arp_protect.py @@ -17,9 +17,9 @@ import netaddr from oslo_concurrency import lockutils from oslo_log import log as logging +from neutron._i18n import _LI from neutron.agent.linux import ip_lib from neutron.common import utils -from neutron.i18n import _LI LOG = logging.getLogger(__name__) SPOOF_CHAIN_PREFIX = 'neutronARP-' diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index 159a6820dff..242f16c4ff7 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -34,6 +34,7 @@ from oslo_service import service from oslo_utils import excutils from six import moves +from neutron._i18n import _LE, _LI, _LW from neutron.agent.linux import bridge_lib from neutron.agent.linux import ip_lib from neutron.agent.linux import utils @@ -45,7 +46,6 @@ from neutron.common import exceptions from neutron.common import topics from neutron.common import utils as n_utils from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers.l2pop.rpc_manager \ import l2population_rpc as l2pop_rpc diff --git a/neutron/plugins/ml2/drivers/mech_agent.py b/neutron/plugins/ml2/drivers/mech_agent.py index 03fd8dc0db9..41dd242c93c 100644 --- a/neutron/plugins/ml2/drivers/mech_agent.py +++ b/neutron/plugins/ml2/drivers/mech_agent.py @@ -18,8 +18,8 @@ import six from oslo_log import log +from neutron._i18n import _LW from neutron.extensions import portbindings -from neutron.i18n import _LW from neutron.plugins.common import constants as p_constants from neutron.plugins.ml2 import driver_api as api diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py index f5f66c9e9ca..6c8161e3b8b 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py @@ -20,8 +20,8 @@ import re from oslo_log import log as logging import six +from neutron._i18n import _LE, _LW from neutron.common import utils -from neutron.i18n import _LE, _LW from neutron.plugins.ml2.drivers.mech_sriov.agent.common \ import exceptions as exc from neutron.plugins.ml2.drivers.mech_sriov.agent import pci_lib diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/qos_driver.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/qos_driver.py old mode 100755 new mode 100644 index 3773b7fbb7b..a404e18f054 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/qos_driver.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/extension_drivers/qos_driver.py @@ -14,8 +14,8 @@ from oslo_log import log as logging +from neutron._i18n import _LE, _LI from neutron.agent.l2.extensions import qos -from neutron.i18n import _LE, _LI from neutron.plugins.ml2.drivers.mech_sriov.agent.common import ( exceptions as exc) from neutron.plugins.ml2.drivers.mech_sriov.agent import eswitch_manager as esm diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py index 87fe3ec21b2..e5403e2e4bc 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py @@ -17,8 +17,8 @@ import re from oslo_log import log as logging +from neutron._i18n import _LE, _LW from neutron.agent.linux import ip_lib -from neutron.i18n import _LE, _LW from neutron.plugins.ml2.drivers.mech_sriov.agent.common \ import exceptions as exc diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py index 4815a0ac89a..af259117987 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py @@ -26,6 +26,7 @@ from oslo_log import log as logging import oslo_messaging from oslo_service import loopingcall +from neutron._i18n import _LE, _LI, _LW from neutron.agent.l2.extensions import manager as ext_manager from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc @@ -34,7 +35,6 @@ from neutron.common import constants as n_constants from neutron.common import topics from neutron.common import utils as n_utils from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.ml2.drivers.mech_sriov.agent.common import config from neutron.plugins.ml2.drivers.mech_sriov.agent.common \ import exceptions as exc diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py index 4859ddabbbf..c68a330256b 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py @@ -17,9 +17,9 @@ from oslo_config import cfg from oslo_log import log +from neutron._i18n import _LE, _LW from neutron.common import constants from neutron.extensions import portbindings -from neutron.i18n import _LE, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers.mech_sriov.mech_driver \ diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py index 26d15cc1145..2c4bd47f11d 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py @@ -24,7 +24,7 @@ from ryu.lib.packet import ether_types from ryu.lib.packet import icmpv6 from ryu.lib.packet import in_proto -from neutron.i18n import _LE +from neutron._i18n import _LE from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native \ diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py index c95c76e139c..42572ee4849 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ofswitch.py @@ -23,7 +23,7 @@ from oslo_utils import timeutils import ryu.app.ofctl.api as ofctl_api import ryu.exception as ryu_exc -from neutron.i18n import _LE, _LW +from neutron._i18n import _LE, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py index 21e18fc86b5..85173a9d0b8 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge.py @@ -17,8 +17,8 @@ from oslo_log import log as logging from oslo_utils import excutils +from neutron._i18n import _LI from neutron.agent.common import ovs_lib -from neutron.i18n import _LI from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native \ import ofswitch diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py index c5460db7f8b..de523664ed3 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py @@ -18,7 +18,7 @@ import re from oslo_log import log as logging -from neutron.i18n import _LW +from neutron._i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py index b897a4cac59..2023c36dac2 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py @@ -18,9 +18,9 @@ from oslo_log import log as logging import oslo_messaging from oslo_utils import excutils +from neutron._i18n import _LE, _LI, _LW from neutron.common import constants as n_const from neutron.common import utils as n_utils -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index e7a27b2a59e..9a939f4d16d 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -28,6 +28,7 @@ from oslo_service import loopingcall import six from six import moves +from neutron._i18n import _LE, _LI, _LW from neutron.agent.common import ovs_lib from neutron.agent.common import polling from neutron.agent.common import utils @@ -43,7 +44,6 @@ from neutron.common import ipv6_utils as ipv6 from neutron.common import topics from neutron.common import utils as n_utils from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.common import utils as p_utils from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc diff --git a/neutron/plugins/ml2/drivers/type_flat.py b/neutron/plugins/ml2/drivers/type_flat.py index 5aeefabf985..7aaf8c02154 100644 --- a/neutron/plugins/ml2/drivers/type_flat.py +++ b/neutron/plugins/ml2/drivers/type_flat.py @@ -19,9 +19,9 @@ from oslo_log import log import six import sqlalchemy as sa +from neutron._i18n import _LI, _LW from neutron.common import exceptions as exc from neutron.db import model_base -from neutron.i18n import _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers import helpers diff --git a/neutron/plugins/ml2/drivers/type_geneve.py b/neutron/plugins/ml2/drivers/type_geneve.py index 54da70914fc..f3d00ba68c8 100644 --- a/neutron/plugins/ml2/drivers/type_geneve.py +++ b/neutron/plugins/ml2/drivers/type_geneve.py @@ -18,9 +18,9 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql +from neutron._i18n import _LE from neutron.common import exceptions as n_exc from neutron.db import model_base -from neutron.i18n import _LE from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers import type_tunnel diff --git a/neutron/plugins/ml2/drivers/type_gre.py b/neutron/plugins/ml2/drivers/type_gre.py index 53b907c884c..aacb5a7e63f 100644 --- a/neutron/plugins/ml2/drivers/type_gre.py +++ b/neutron/plugins/ml2/drivers/type_gre.py @@ -18,9 +18,9 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql +from neutron._i18n import _LE from neutron.common import exceptions as n_exc from neutron.db import model_base -from neutron.i18n import _LE from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers import type_tunnel diff --git a/neutron/plugins/ml2/drivers/type_local.py b/neutron/plugins/ml2/drivers/type_local.py index 791df111dc7..0bf000094d5 100644 --- a/neutron/plugins/ml2/drivers/type_local.py +++ b/neutron/plugins/ml2/drivers/type_local.py @@ -16,8 +16,8 @@ from oslo_log import log import six +from neutron._i18n import _LI from neutron.common import exceptions as exc -from neutron.i18n import _LI from neutron.plugins.common import constants as p_const from neutron.plugins.ml2 import driver_api as api diff --git a/neutron/plugins/ml2/drivers/type_tunnel.py b/neutron/plugins/ml2/drivers/type_tunnel.py index 82c035ca900..44c19d64a84 100644 --- a/neutron/plugins/ml2/drivers/type_tunnel.py +++ b/neutron/plugins/ml2/drivers/type_tunnel.py @@ -23,10 +23,10 @@ from oslo_log import log from six import moves from sqlalchemy import or_ +from neutron._i18n import _LI, _LW from neutron.common import exceptions as exc from neutron.common import topics from neutron.db import api as db_api -from neutron.i18n import _LI, _LW from neutron.plugins.common import utils as plugin_utils from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers import helpers diff --git a/neutron/plugins/ml2/drivers/type_vlan.py b/neutron/plugins/ml2/drivers/type_vlan.py index a8280a46053..258caf4b744 100644 --- a/neutron/plugins/ml2/drivers/type_vlan.py +++ b/neutron/plugins/ml2/drivers/type_vlan.py @@ -20,10 +20,10 @@ from oslo_log import log from six import moves import sqlalchemy as sa +from neutron._i18n import _LE, _LI, _LW from neutron.common import exceptions as exc from neutron.db import api as db_api from neutron.db import model_base -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.common import constants as p_const from neutron.plugins.common import utils as plugin_utils from neutron.plugins.ml2 import driver_api as api diff --git a/neutron/plugins/ml2/drivers/type_vxlan.py b/neutron/plugins/ml2/drivers/type_vxlan.py index 1a4aae92e6e..1b6ce8bffc6 100644 --- a/neutron/plugins/ml2/drivers/type_vxlan.py +++ b/neutron/plugins/ml2/drivers/type_vxlan.py @@ -18,9 +18,9 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql +from neutron._i18n import _LE from neutron.common import exceptions as n_exc from neutron.db import model_base -from neutron.i18n import _LE from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.drivers import type_tunnel diff --git a/neutron/plugins/ml2/extensions/port_security.py b/neutron/plugins/ml2/extensions/port_security.py index 6a10a41a617..a2cb5cdee66 100644 --- a/neutron/plugins/ml2/extensions/port_security.py +++ b/neutron/plugins/ml2/extensions/port_security.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron._i18n import _LI from neutron.api.v2 import attributes as attrs from neutron.common import utils from neutron.db import common_db_mixin from neutron.db import portsecurity_db_common as ps_db_common from neutron.extensions import portsecurity as psec -from neutron.i18n import _LI from neutron.plugins.ml2 import driver_api as api from oslo_log import log as logging diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index 842f7c06ca7..e589a6dd22b 100644 --- a/neutron/plugins/ml2/managers.py +++ b/neutron/plugins/ml2/managers.py @@ -19,6 +19,7 @@ from oslo_utils import excutils import six import stevedore +from neutron._i18n import _LE, _LI, _LW from neutron.api.v2 import attributes from neutron.common import exceptions as exc from neutron.extensions import external_net @@ -26,7 +27,6 @@ from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import portbindings from neutron.extensions import providernet as provider from neutron.extensions import vlantransparent -from neutron.i18n import _LE, _LI, _LW from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import db from neutron.plugins.ml2 import driver_api as api diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index cd0dcde0657..7f97c16b7cf 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -26,6 +26,7 @@ from oslo_utils import uuidutils from sqlalchemy import exc as sql_exc from sqlalchemy.orm import exc as sa_exc +from neutron._i18n import _LE, _LI, _LW from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc @@ -66,7 +67,6 @@ from neutron.extensions import portbindings from neutron.extensions import portsecurity as psec from neutron.extensions import providernet as provider from neutron.extensions import vlantransparent -from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron.plugins.common import constants as service_constants from neutron.plugins.ml2.common import exceptions as ml2_exc diff --git a/neutron/plugins/ml2/rpc.py b/neutron/plugins/ml2/rpc.py index cf09ee34914..2217a7f680d 100644 --- a/neutron/plugins/ml2/rpc.py +++ b/neutron/plugins/ml2/rpc.py @@ -17,6 +17,7 @@ from oslo_log import log import oslo_messaging from sqlalchemy.orm import exc +from neutron._i18n import _LE, _LW from neutron.api.rpc.handlers import dvr_rpc from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc from neutron.callbacks import events @@ -28,7 +29,6 @@ from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.extensions import portbindings from neutron.extensions import portsecurity as psec -from neutron.i18n import _LE, _LW from neutron import manager from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers import type_tunnel diff --git a/neutron/policy.py b/neutron/policy.py index 660971c76d9..5cc1f1bc9c7 100644 --- a/neutron/policy.py +++ b/neutron/policy.py @@ -23,10 +23,10 @@ from oslo_utils import excutils from oslo_utils import importutils import six +from neutron._i18n import _LE, _LW from neutron.api.v2 import attributes from neutron.common import constants as const from neutron.common import exceptions -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/quota/__init__.py b/neutron/quota/__init__.py index a9a1549045e..aea79c86dfc 100644 --- a/neutron/quota/__init__.py +++ b/neutron/quota/__init__.py @@ -23,9 +23,9 @@ from oslo_utils import importutils import six import webob +from neutron._i18n import _LI, _LW from neutron.common import exceptions from neutron.db.quota import api as quota_api -from neutron.i18n import _LI, _LW from neutron.quota import resource_registry diff --git a/neutron/quota/resource.py b/neutron/quota/resource.py index 97cddfaf451..852d09673b4 100644 --- a/neutron/quota/resource.py +++ b/neutron/quota/resource.py @@ -19,9 +19,9 @@ from oslo_log import log from oslo_utils import excutils from sqlalchemy import event +from neutron._i18n import _LE from neutron.db import api as db_api from neutron.db.quota import api as quota_api -from neutron.i18n import _LE LOG = log.getLogger(__name__) diff --git a/neutron/quota/resource_registry.py b/neutron/quota/resource_registry.py index b6a41fa4d47..26b9fbccec1 100644 --- a/neutron/quota/resource_registry.py +++ b/neutron/quota/resource_registry.py @@ -14,7 +14,7 @@ from oslo_config import cfg from oslo_log import log import six -from neutron.i18n import _LI, _LW +from neutron._i18n import _LI, _LW from neutron.quota import resource LOG = log.getLogger(__name__) diff --git a/neutron/scheduler/dhcp_agent_scheduler.py b/neutron/scheduler/dhcp_agent_scheduler.py index 084fc6fa86f..5d2ce95227a 100644 --- a/neutron/scheduler/dhcp_agent_scheduler.py +++ b/neutron/scheduler/dhcp_agent_scheduler.py @@ -22,11 +22,11 @@ from oslo_db import exception as db_exc from oslo_log import log as logging from sqlalchemy import sql +from neutron._i18n import _LI, _LW from neutron.common import constants from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.extensions import availability_zone as az_ext -from neutron.i18n import _LI, _LW from neutron.scheduler import base_resource_filter from neutron.scheduler import base_scheduler diff --git a/neutron/scheduler/l3_agent_scheduler.py b/neutron/scheduler/l3_agent_scheduler.py index dfb9a6d8287..29aae7be1e4 100644 --- a/neutron/scheduler/l3_agent_scheduler.py +++ b/neutron/scheduler/l3_agent_scheduler.py @@ -22,12 +22,12 @@ from oslo_log import log as logging import six from sqlalchemy import sql +from neutron._i18n import _LE, _LW from neutron.common import constants from neutron.common import utils from neutron.db import l3_agentschedulers_db from neutron.db import l3_db from neutron.db import l3_hamode_db -from neutron.i18n import _LE, _LW LOG = logging.getLogger(__name__) diff --git a/neutron/server/rpc_eventlet.py b/neutron/server/rpc_eventlet.py index 218d009e0d5..8fd22cbe874 100644 --- a/neutron/server/rpc_eventlet.py +++ b/neutron/server/rpc_eventlet.py @@ -21,7 +21,7 @@ import eventlet from oslo_log import log -from neutron.i18n import _LI +from neutron._i18n import _LI from neutron import server from neutron import service diff --git a/neutron/server/wsgi_eventlet.py b/neutron/server/wsgi_eventlet.py index 02c9e19787a..725135503a4 100644 --- a/neutron/server/wsgi_eventlet.py +++ b/neutron/server/wsgi_eventlet.py @@ -15,7 +15,7 @@ import eventlet from oslo_log import log -from neutron.i18n import _LI +from neutron._i18n import _LI from neutron import server from neutron import service diff --git a/neutron/server/wsgi_pecan.py b/neutron/server/wsgi_pecan.py old mode 100755 new mode 100644 index 91677cc2951..e7194650230 --- a/neutron/server/wsgi_pecan.py +++ b/neutron/server/wsgi_pecan.py @@ -18,8 +18,8 @@ from oslo_config import cfg from oslo_log import log from six.moves import socketserver +from neutron._i18n import _LI, _LW from neutron.common import rpc as n_rpc -from neutron.i18n import _LI, _LW from neutron.pecan_wsgi import app as pecan_app from neutron import server diff --git a/neutron/service.py b/neutron/service.py index 8f03e1570c2..c90b0be95be 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -26,11 +26,11 @@ from oslo_service import service as common_service from oslo_utils import excutils from oslo_utils import importutils +from neutron._i18n import _LE, _LI from neutron.common import config from neutron.common import rpc as n_rpc from neutron import context from neutron.db import api as session -from neutron.i18n import _LE, _LI from neutron import manager from neutron import worker from neutron import wsgi diff --git a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py index 6b7df5acdb5..6109c53dcef 100644 --- a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py +++ b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py @@ -17,11 +17,11 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_utils import importutils +from neutron._i18n import _LE from neutron.agent.linux import ip_lib from neutron.common import exceptions as nexception from neutron.common import topics from neutron import context -from neutron.i18n import _LE from neutron.plugins.common import constants from neutron.services.firewall.agents import firewall_agent_api as api from neutron.services import provider_configuration as provconf diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index 930515c1a77..e9893dc14a0 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -23,6 +23,7 @@ from oslo_service import periodic_task from oslo_service import service from oslo_utils import importutils +from neutron._i18n import _LE, _LI, _LW from neutron.agent.common import config from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config @@ -31,7 +32,6 @@ from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import context -from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron import service as neutron_service diff --git a/neutron/services/metering/drivers/iptables/iptables_driver.py b/neutron/services/metering/drivers/iptables/iptables_driver.py index 6ccb0b9035a..f47ba98da60 100644 --- a/neutron/services/metering/drivers/iptables/iptables_driver.py +++ b/neutron/services/metering/drivers/iptables/iptables_driver.py @@ -18,12 +18,12 @@ from oslo_log import log as logging from oslo_utils import importutils import six +from neutron._i18n import _LE, _LI from neutron.agent.common import config from neutron.agent.linux import interface from neutron.agent.linux import iptables_manager from neutron.common import constants as constants from neutron.common import ipv6_utils -from neutron.i18n import _LE, _LI from neutron.services.metering.drivers import abstract_driver diff --git a/neutron/services/provider_configuration.py b/neutron/services/provider_configuration.py index c068ce8a319..6bc9e4dace8 100644 --- a/neutron/services/provider_configuration.py +++ b/neutron/services/provider_configuration.py @@ -20,8 +20,8 @@ from oslo_config import cfg from oslo_log import log as logging import stevedore +from neutron._i18n import _LW from neutron.common import exceptions as n_exc -from neutron.i18n import _LW LOG = logging.getLogger(__name__) diff --git a/neutron/services/qos/notification_drivers/manager.py b/neutron/services/qos/notification_drivers/manager.py index d027c1945c7..d5487bbbb67 100644 --- a/neutron/services/qos/notification_drivers/manager.py +++ b/neutron/services/qos/notification_drivers/manager.py @@ -12,7 +12,7 @@ from oslo_config import cfg from oslo_log import log as logging -from neutron.i18n import _LI +from neutron._i18n import _LI from neutron import manager QOS_DRIVER_NAMESPACE = 'neutron.qos.notification_drivers' diff --git a/neutron/services/qos/notification_drivers/message_queue.py b/neutron/services/qos/notification_drivers/message_queue.py index 1af63f9ac3c..1ffeda0ec41 100644 --- a/neutron/services/qos/notification_drivers/message_queue.py +++ b/neutron/services/qos/notification_drivers/message_queue.py @@ -12,11 +12,11 @@ from oslo_log import log as logging +from neutron._i18n import _LW from neutron.api.rpc.callbacks import events from neutron.api.rpc.callbacks.producer import registry from neutron.api.rpc.callbacks import resources from neutron.api.rpc.handlers import resources_rpc -from neutron.i18n import _LW from neutron.objects.qos import policy as policy_object from neutron.services.qos.notification_drivers import qos_base diff --git a/neutron/services/service_base.py b/neutron/services/service_base.py index 3ae9f6329f4..c2570e554e9 100644 --- a/neutron/services/service_base.py +++ b/neutron/services/service_base.py @@ -20,9 +20,9 @@ from oslo_utils import excutils from oslo_utils import importutils import six +from neutron._i18n import _LE, _LI from neutron.api import extensions from neutron.db import servicetype_db as sdb -from neutron.i18n import _LE, _LI from neutron.services import provider_configuration as pconf LOG = logging.getLogger(__name__) diff --git a/neutron/wsgi.py b/neutron/wsgi.py index 9fe21fbcb7d..b078b74ed67 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -37,11 +37,11 @@ import six import webob.dec import webob.exc +from neutron._i18n import _LE, _LI from neutron.common import config from neutron.common import exceptions as exception from neutron import context from neutron.db import api -from neutron.i18n import _LE, _LI from neutron import worker socket_opts = [ diff --git a/tox.ini b/tox.ini index 3889b04449a..06b59b7337e 100644 --- a/tox.ini +++ b/tox.ini @@ -171,7 +171,7 @@ builtins = _ exclude = ./.*,build,dist,neutron/openstack/common/*,neutron/tests/tempest [hacking] -import_exceptions = neutron.i18n +import_exceptions = neutron._i18n local-check-factory = neutron.hacking.checks.factory [testenv:genconfig]