Merge "Use _ from neutron._i18n"

neutron/agent/common/config.py

@@ -18,6 +18,7 @@ import os
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from neutron._i18n import _
 from neutron.common import config
 
 

neutron/agent/common/ovs_lib.py

@@ -24,7 +24,7 @@ import retrying
 import six
 import uuid
 
-from neutron._i18n import _LE, _LI, _LW
+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

neutron/agent/dhcp/agent.py

@@ -24,7 +24,7 @@ import oslo_messaging
 from oslo_service import loopingcall
 from oslo_utils import importutils
 
-from neutron._i18n import _LE, _LI, _LW
+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

neutron/agent/dhcp/config.py

@@ -16,6 +16,8 @@
 
 from oslo_config import cfg
 
+from neutron._i18n import _
+
 DHCP_AGENT_OPTS = [
     cfg.IntOpt('resync_interval', default=5,
                help=_("The DHCP agent will resync its state with Neutron to "

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/l3/agent.py

@@ -23,7 +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._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

neutron/agent/l3/config.py

@@ -16,6 +16,7 @@
 
 from oslo_config import cfg
 
+from neutron._i18n import _
 from neutron.agent.common import config
 from neutron.common import constants
 

neutron/agent/l3/ha.py

@@ -20,7 +20,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import webob
 
-from neutron._i18n import _LI
+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

neutron/agent/l3/keepalived_state_change.py

@@ -20,7 +20,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import requests
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.agent.l3 import ha
 from neutron.agent.linux import daemon
 from neutron.agent.linux import ip_monitor

neutron/agent/linux/async_process.py

@@ -19,7 +19,7 @@ import eventlet.event
 import eventlet.queue
 from oslo_log import log as logging
 
-from neutron._i18n import _LE
+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

neutron/agent/linux/daemon.py

@@ -24,7 +24,7 @@ import sys
 
 from oslo_log import log as logging
 
-from neutron._i18n import _LE, _LI
+from neutron._i18n import _, _LE, _LI
 from neutron.common import exceptions
 
 LOG = logging.getLogger(__name__)

neutron/agent/linux/dhcp.py

@@ -27,7 +27,7 @@ import oslo_messaging
 from oslo_utils import uuidutils
 import six
 
-from neutron._i18n import _LI, _LW, _LE
+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

neutron/agent/linux/external_process.py

@@ -23,7 +23,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import fileutils
 
-from neutron._i18n import _LE
+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

neutron/agent/linux/interface.py

@@ -20,7 +20,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import six
 
-from neutron._i18n import _LE, _LI
+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

neutron/agent/linux/ip_lib.py

@@ -23,7 +23,7 @@ from oslo_utils import excutils
 import re
 import six
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.agent.common import utils
 from neutron.common import constants
 from neutron.common import exceptions

neutron/agent/linux/ip_link_support.py

@@ -17,7 +17,7 @@ import re
 
 from oslo_log import log as logging
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.agent.linux import utils
 from neutron.common import exceptions as n_exc
 

neutron/agent/linux/iptables_manager.py

@@ -31,7 +31,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 import six
 
-from neutron._i18n import _LE, _LW
+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

neutron/agent/linux/keepalived.py

@@ -20,6 +20,7 @@ import netaddr
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from neutron._i18n import _
 from neutron.agent.linux import external_process
 from neutron.common import exceptions
 from neutron.common import utils as common_utils

neutron/agent/linux/pd.py

@@ -23,6 +23,7 @@ from stevedore import driver
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from neutron._i18n import _
 from neutron.agent.linux import utils as linux_utils
 from neutron.callbacks import events
 from neutron.callbacks import registry

neutron/agent/linux/pd_driver.py

@@ -18,6 +18,8 @@ import six
 
 from oslo_config import cfg
 
+from neutron._i18n import _
+
 OPTS = [
     cfg.StrOpt('pd_confs',
                default='$state_path/pd',

neutron/agent/linux/ra.py

@@ -20,6 +20,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import six
 
+from neutron._i18n import _
 from neutron.agent.linux import external_process
 from neutron.agent.linux import utils
 from neutron.common import constants

neutron/agent/linux/utils.py

@@ -35,7 +35,7 @@ from oslo_utils import excutils
 import six
 from six.moves import http_client as httplib
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.agent.common import config
 from neutron.common import constants
 from neutron.common import utils

neutron/agent/metadata/agent.py

@@ -24,7 +24,7 @@ import six
 import six.moves.urllib.parse as urlparse
 import webob
 
-from neutron._i18n import _LE, _LW
+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

neutron/agent/metadata/config.py

@@ -14,6 +14,7 @@
 
 from oslo_config import cfg
 
+from neutron._i18n import _
 from neutron.common import utils
 
 

neutron/agent/metadata/namespace_proxy.py

@@ -21,7 +21,7 @@ import six
 import six.moves.urllib.parse as urlparse
 import webob
 
-from neutron._i18n import _LE
+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

neutron/agent/ovsdb/api.py

@@ -20,6 +20,8 @@ from oslo_config import cfg
 from oslo_utils import importutils
 import six
 
+from neutron._i18n import _
+
 interface_map = {
     'vsctl': 'neutron.agent.ovsdb.impl_vsctl.OvsdbVsctl',
     'native': 'neutron.agent.ovsdb.impl_idl.OvsdbIdl',

neutron/agent/ovsdb/impl_idl.py

@@ -20,6 +20,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from ovs.db import idl
 
+from neutron._i18n import _
 from neutron.agent.ovsdb import api
 from neutron.agent.ovsdb.native import commands as cmd
 from neutron.agent.ovsdb.native import connection

neutron/agent/ovsdb/native/commands.py

@@ -17,7 +17,7 @@ import collections
 from oslo_log import log as logging
 from oslo_utils import excutils
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.agent.ovsdb import api
 from neutron.agent.ovsdb.native import idlutils
 

neutron/agent/ovsdb/native/idlutils.py

@@ -22,6 +22,7 @@ from ovs import jsonrpc
 from ovs import poller
 from ovs import stream
 
+from neutron._i18n import _
 from neutron.common import exceptions
 
 

neutron/agent/securitygroups_rpc.py

@@ -21,7 +21,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from oslo_utils import importutils
 
-from neutron._i18n import _LI, _LW
+from neutron._i18n import _, _LI, _LW
 from neutron.agent import firewall
 from neutron.api.rpc.handlers import securitygroups_rpc
 

neutron/agent/windows/utils.py

@@ -20,6 +20,7 @@ from eventlet import greenthread
 from oslo_log import log as logging
 import six
 
+from neutron._i18n import _
 from neutron.common import utils
 
 LOG = logging.getLogger(__name__)

neutron/api/api_common.py

@@ -21,7 +21,7 @@ import six
 from six.moves.urllib import parse
 from webob import exc
 
-from neutron._i18n import _LW
+from neutron._i18n import _, _LW
 from neutron.common import constants
 from neutron.common import exceptions
 

neutron/api/extensions.py

@@ -26,7 +26,7 @@ import six
 import webob.dec
 import webob.exc
 
-from neutron._i18n import _LE, _LI, _LW
+from neutron._i18n import _, _LE, _LI, _LW
 from neutron.common import exceptions
 import neutron.extensions
 from neutron import manager

neutron/api/rpc/callbacks/exceptions.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.common import exceptions
 
 

neutron/api/rpc/handlers/dhcp_rpc.py

@@ -23,7 +23,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from oslo_utils import excutils
 
-from neutron._i18n import _LW
+from neutron._i18n import _, _LW
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/api/rpc/handlers/resources_rpc.py

@@ -17,6 +17,7 @@ from oslo_log import helpers as log_helpers
 from oslo_log import log as logging
 import oslo_messaging
 
+from neutron._i18n import _
 from neutron.api.rpc.callbacks.consumer import registry as cons_registry
 from neutron.api.rpc.callbacks.producer import registry as prod_registry
 from neutron.api.rpc.callbacks import resources

neutron/api/v2/attributes.py

@@ -21,6 +21,7 @@ from oslo_utils import uuidutils
 import six
 import webob.exc
 
+from neutron._i18n import _
 from neutron.common import constants
 from neutron.common import exceptions as n_exc
 

neutron/api/v2/base.py

@@ -24,7 +24,7 @@ from oslo_utils import excutils
 import six
 import webob.exc
 
-from neutron._i18n import _LE, _LI
+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

neutron/api/v2/resource.py

@@ -27,7 +27,7 @@ import six
 import webob.dec
 import webob.exc
 
-from neutron._i18n import _LE, _LI
+from neutron._i18n import _, _LE, _LI
 from neutron.common import exceptions
 from neutron import wsgi
 

neutron/api/versions.py

@@ -17,6 +17,7 @@ import oslo_i18n
 from oslo_log import log as logging
 import webob.dec
 
+from neutron._i18n import _
 from neutron.api.views import versions as versions_view
 from neutron import wsgi
 

neutron/callbacks/exceptions.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.common import exceptions
 
 

neutron/cmd/ipset_cleanup.py

@@ -16,7 +16,7 @@
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from neutron._i18n import _LE, _LI
+from neutron._i18n import _, _LE, _LI
 from neutron.agent.linux import ipset_manager
 from neutron.agent.linux import utils
 from neutron.common import config

neutron/cmd/netns_cleanup.py

@@ -20,7 +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._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

neutron/cmd/ovs_cleanup.py

@@ -16,7 +16,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.agent.common import config as agent_config
 from neutron.agent.common import ovs_lib
 from neutron.agent.l3 import config as l3_config

neutron/cmd/sanity_check.py

@@ -18,7 +18,7 @@ import sys
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from neutron._i18n import _LE, _LW
+from neutron._i18n import _, _LE, _LW
 from neutron.agent import dhcp_agent
 from neutron.cmd.sanity import checks
 from neutron.common import config

neutron/common/config.py

@@ -26,7 +26,7 @@ from oslo_log import log as logging
 import oslo_messaging
 from oslo_service import wsgi
 
-from neutron._i18n import _LI
+from neutron._i18n import _, _LI
 from neutron.api.v2 import attributes
 from neutron.common import utils
 from neutron import policy

neutron/common/exceptions.py

@@ -20,6 +20,8 @@ Neutron base exception handling.
 from oslo_utils import excutils
 import six
 
+from neutron._i18n import _
+
 
 class NeutronException(Exception):
     """Base Neutron Exception.

neutron/common/ipv6_utils.py

@@ -21,7 +21,7 @@ import os
 import netaddr
 from oslo_log import log
 
-from neutron._i18n import _LI
+from neutron._i18n import _, _LI
 from neutron.common import constants
 
 

neutron/common/utils.py

@@ -44,7 +44,7 @@ from oslo_utils import importutils
 import six
 from stevedore import driver
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.common import constants as n_const
 
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"

neutron/db/address_scope_db.py

@@ -17,6 +17,7 @@ from oslo_utils import uuidutils
 import sqlalchemy as sa
 from sqlalchemy.orm import exc
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes as attr
 from neutron.db import model_base
 from neutron.db import models_v2

neutron/db/agents_db.py

@@ -27,7 +27,7 @@ import sqlalchemy as sa
 from sqlalchemy.orm import exc
 from sqlalchemy import sql
 
-from neutron._i18n import _LE, _LI, _LW
+from neutron._i18n import _, _LE, _LI, _LW
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron import context

neutron/db/agentschedulers_db.py

@@ -25,7 +25,7 @@ import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
-from neutron._i18n import _LE, _LI, _LW
+from neutron._i18n import _, _LE, _LI, _LW
 from neutron.common import constants
 from neutron.common import utils
 from neutron import context as ncontext

neutron/db/common_db_mixin.py

@@ -20,6 +20,7 @@ from sqlalchemy import and_
 from sqlalchemy import or_
 from sqlalchemy import sql
 
+from neutron._i18n import _
 from neutron.common import exceptions as n_exc
 from neutron.db import sqlalchemyutils
 

neutron/db/db_base_plugin_v2.py

@@ -24,7 +24,7 @@ from oslo_utils import uuidutils
 from sqlalchemy import and_
 from sqlalchemy import event
 
-from neutron._i18n import _LE, _LI
+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

neutron/db/dvr_mac_db.py

@@ -20,7 +20,7 @@ from oslo_log import log as logging
 import sqlalchemy as sa
 from sqlalchemy.orm import exc
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.common import exceptions as n_exc
 from neutron.common import utils
 from neutron.db import model_base

neutron/db/extraroute_db.py

@@ -19,6 +19,7 @@ from oslo_log import log as logging
 import sqlalchemy as sa
 from sqlalchemy import orm
 
+from neutron._i18n import _
 from neutron.common import utils
 from neutron.db import db_base_plugin_v2
 from neutron.db import l3_db

neutron/db/ipam_backend_mixin.py

@@ -22,7 +22,7 @@ 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._i18n import _, _LI
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/db/ipam_non_pluggable_backend.py

@@ -20,6 +20,7 @@ from sqlalchemy import and_
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/db/ipam_pluggable_backend.py

@@ -19,7 +19,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from sqlalchemy import and_
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/db/l3_agentschedulers_db.py

@@ -25,7 +25,7 @@ from sqlalchemy import orm
 from sqlalchemy.orm import joinedload
 from sqlalchemy import sql
 
-from neutron._i18n import _LE, _LI, _LW
+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

neutron/db/l3_db.py

@@ -22,7 +22,7 @@ from sqlalchemy.orm import exc
 from oslo_utils import excutils
 import six
 
-from neutron._i18n import _LI
+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

neutron/db/l3_dvr_db.py

@@ -18,7 +18,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 import six
 
-from neutron._i18n import _LI, _LW
+from neutron._i18n import _, _LI, _LW
 from neutron.api.v2 import attributes
 from neutron.callbacks import events
 from neutron.callbacks import exceptions

neutron/db/l3_gwmode_db.py

@@ -18,6 +18,7 @@ from oslo_log import log as logging
 import sqlalchemy as sa
 from sqlalchemy import sql
 
+from neutron._i18n import _
 from neutron.db import db_base_plugin_v2
 from neutron.db import l3_db
 from neutron.extensions import l3

neutron/db/l3_hamode_db.py

@@ -21,7 +21,7 @@ from oslo_utils import excutils
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-from neutron._i18n import _LI
+from neutron._i18n import _, _LI
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/db/migration/__init__.py

@@ -21,6 +21,8 @@ from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.engine import reflection
 
+from neutron._i18n import _
+
 # Neutron milestones for upgrade aliases
 LIBERTY = 'liberty'
 MITAKA = 'mitaka'

neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py

@@ -29,6 +29,7 @@ from alembic import op
 import six
 import sqlalchemy as sa
 
+from neutron._i18n import _
 from neutron.common import exceptions
 
 # Models can change in time, but migration should rely only on exact

neutron/db/migration/cli.py

@@ -26,6 +26,7 @@ from oslo_utils import importutils
 import pkg_resources
 import six
 
+from neutron._i18n import _
 from neutron.common import utils
 from neutron.db import migration
 

neutron/db/rbac_db_models.py

@@ -18,6 +18,7 @@ import abc
 import sqlalchemy as sa
 from sqlalchemy.orm import validates
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as n_exc
 from neutron.db import model_base

neutron/db/securitygroups_db.py

@@ -21,6 +21,7 @@ from sqlalchemy import orm
 from sqlalchemy.orm import exc
 from sqlalchemy.orm import scoped_session
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes
 from neutron.callbacks import events
 from neutron.callbacks import exceptions

neutron/db/securitygroups_rpc_base.py

@@ -17,7 +17,7 @@ import netaddr
 from oslo_log import log as logging
 from sqlalchemy.orm import exc
 
-from neutron._i18n import _LW
+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

neutron/db/sqlalchemyutils.py

@@ -18,6 +18,7 @@ from six import moves
 import sqlalchemy
 from sqlalchemy.orm import properties
 
+from neutron._i18n import _
 from neutron.common import exceptions as n_exc
 
 

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/shell.py

@@ -18,6 +18,7 @@ import sys
 from oslo_config import cfg
 from oslo_utils import importutils
 
+from neutron._i18n import _
 from neutron.agent.common import config
 from neutron.agent.common import utils
 from neutron.agent.linux import interface

neutron/extensions/address_scope.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/agent.py

@@ -15,6 +15,7 @@
 
 import abc
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/allowedaddresspairs.py

@@ -14,6 +14,7 @@
 
 import webob.exc
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as nexception

neutron/extensions/availability_zone.py

@@ -16,6 +16,7 @@ import abc
 
 from oslo_serialization import jsonutils
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/dhcpagentscheduler.py

@@ -15,6 +15,7 @@
 
 import abc
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import base
 from neutron.api.v2 import resource

neutron/extensions/dns.py

@@ -18,6 +18,7 @@ import six
 
 from oslo_config import cfg
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as n_exc

neutron/extensions/dvr.py

@@ -16,6 +16,7 @@ import abc
 
 import six
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import constants

neutron/extensions/external_net.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as nexception

neutron/extensions/extra_dhcp_opt.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions

neutron/extensions/extraroute.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as nexception

neutron/extensions/flavors.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/l3.py

@@ -17,6 +17,7 @@ import abc
 
 from oslo_config import cfg
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import resource_helper

neutron/extensions/l3_ext_ha_mode.py

@@ -13,6 +13,7 @@
 # under the License.
 #
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import constants

neutron/extensions/l3agentscheduler.py

@@ -18,7 +18,7 @@ import abc
 from oslo_log import log as logging
 import webob.exc
 
-from neutron._i18n import _LE
+from neutron._i18n import _, _LE
 from neutron.api import extensions
 from neutron.api.v2 import base
 from neutron.api.v2 import resource

neutron/extensions/metering.py

@@ -17,6 +17,7 @@ import abc
 from oslo_log import log as logging
 import six
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import resource_helper

neutron/extensions/multiprovidernet.py

@@ -15,6 +15,7 @@
 
 import webob.exc
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as nexception

neutron/extensions/portsecurity.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as nexception

neutron/extensions/providernet.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc

neutron/extensions/quotasv2.py

@@ -17,6 +17,7 @@ from oslo_config import cfg
 from oslo_utils import importutils
 import webob
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.api.v2 import base

neutron/extensions/rbac.py

@@ -14,6 +14,7 @@
 #    under the License.
 from oslo_config import cfg
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/securitygroup.py

@@ -20,6 +20,7 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 import six
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base

neutron/extensions/servicetype.py

@@ -15,6 +15,7 @@
 
 from oslo_log import log as logging
 
+from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.api.v2 import base

neutron/extensions/vlantransparent.py

@@ -15,7 +15,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.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as nexception

neutron/ipam/exceptions.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron._i18n import _
 from neutron.common import exceptions
 
 

neutron/ipam/requests.py

@@ -17,6 +17,7 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 import six
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import ipv6_utils

neutron/ipam/subnet_alloc.py

@@ -20,6 +20,7 @@ import netaddr
 from oslo_db import exception as db_exc
 from oslo_utils import uuidutils
 
+from neutron._i18n import _
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc

neutron/manager.py

@@ -21,7 +21,7 @@ import oslo_messaging
 from oslo_service import periodic_task
 import six
 
-from neutron._i18n import _LI
+from neutron._i18n import _, _LI
 from neutron.common import utils
 from neutron.plugins.common import constants