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

@@ -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.

doc/source/devref/index.rst

@@ -70,6 +70,7 @@ Neutron Internals
    callbacks
    dns_order
    upgrade
+   i18n
 
 Testing
 -------

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)

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

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':

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__)

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__)
 

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__)

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:

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

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__)
 

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__)

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-'

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__)

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__)
 

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__)
 

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

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__)

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__)
 

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__)
 

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__)
 

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__)

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__)
 

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__)
 

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__)

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__)
 

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__)

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__)
 

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__)

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
 
 

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__)

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__)

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__)
 

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__)
 

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__)

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__)
 

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__)

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

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
 
 

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
 

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

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__)

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

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
 
 

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__)
 

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
 

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__)

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
 

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__)

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__)

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

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__)

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
 

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__)

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__)

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__)

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__)

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

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
 
 

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__)

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

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
 

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

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

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

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
 
 

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
 

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__)
 

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):

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__)

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

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__)
 

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)

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

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
 
 

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
 

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__)

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

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

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
 
 

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

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__)

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

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
 

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

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-'

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

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
 

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

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

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
 

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

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 \

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 \

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__)
 

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
 

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__)
 

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
 

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

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