From: Akihiro Motoki Date: Thu, 26 Nov 2015 18:48:03 +0000 (+0900) Subject: Use _ from neutron._i18n X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2d8632e412c6187187d44ee169048bf9d4c8c106;p=openstack-build%2Fneutron-build.git Use _ from neutron._i18n Partial-Bug: #1520094 Change-Id: I874a4aa1d71d1f7034a1ff0b7450b419ef5c6864 --- diff --git a/neutron/agent/common/config.py b/neutron/agent/common/config.py index 233cf622a..8b040f384 100644 --- a/neutron/agent/common/config.py +++ b/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 diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py index cb652b559..e4b8b7903 100644 --- a/neutron/agent/common/ovs_lib.py +++ b/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 diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py index 98af99e31..2fde2e473 100644 --- a/neutron/agent/dhcp/agent.py +++ b/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 diff --git a/neutron/agent/dhcp/config.py b/neutron/agent/dhcp/config.py index 0331755f0..926e8ec8f 100644 --- a/neutron/agent/dhcp/config.py +++ b/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 " diff --git a/neutron/agent/l2/extensions/manager.py b/neutron/agent/l2/extensions/manager.py index b31da1f56..2f0436dfe 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/l3/agent.py b/neutron/agent/l3/agent.py index 6d7c2edb2..834d1723a 100644 --- a/neutron/agent/l3/agent.py +++ b/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 diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index 8831b310e..c54f7f612 100644 --- a/neutron/agent/l3/config.py +++ b/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 diff --git a/neutron/agent/l3/ha.py b/neutron/agent/l3/ha.py index 30e4b127b..c6cc9c445 100644 --- a/neutron/agent/l3/ha.py +++ b/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 diff --git a/neutron/agent/l3/keepalived_state_change.py b/neutron/agent/l3/keepalived_state_change.py index b4bcaa8eb..1d986ef9d 100644 --- a/neutron/agent/l3/keepalived_state_change.py +++ b/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 diff --git a/neutron/agent/linux/async_process.py b/neutron/agent/linux/async_process.py index 8e4ba21e4..3acec0d86 100644 --- a/neutron/agent/linux/async_process.py +++ b/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 diff --git a/neutron/agent/linux/daemon.py b/neutron/agent/linux/daemon.py index 98954b674..7ad4ca7b3 100644 --- a/neutron/agent/linux/daemon.py +++ b/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__) diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index d850a7383..ff44a8e23 100644 --- a/neutron/agent/linux/dhcp.py +++ b/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 diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py index e0b7cf70a..42a302f07 100644 --- a/neutron/agent/linux/external_process.py +++ b/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 diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py index 8a7a51eef..551074fce 100644 --- a/neutron/agent/linux/interface.py +++ b/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 diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py index c341a4e80..89bc5776f 100644 --- a/neutron/agent/linux/ip_lib.py +++ b/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 diff --git a/neutron/agent/linux/ip_link_support.py b/neutron/agent/linux/ip_link_support.py index 64122383b..1a4994753 100644 --- a/neutron/agent/linux/ip_link_support.py +++ b/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 diff --git a/neutron/agent/linux/iptables_manager.py b/neutron/agent/linux/iptables_manager.py index 3d9542bca..40340ca74 100644 --- a/neutron/agent/linux/iptables_manager.py +++ b/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 diff --git a/neutron/agent/linux/keepalived.py b/neutron/agent/linux/keepalived.py index 09d437e8d..41da43dcd 100644 --- a/neutron/agent/linux/keepalived.py +++ b/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 diff --git a/neutron/agent/linux/pd.py b/neutron/agent/linux/pd.py index e4c151f76..b649076d2 100644 --- a/neutron/agent/linux/pd.py +++ b/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 diff --git a/neutron/agent/linux/pd_driver.py b/neutron/agent/linux/pd_driver.py index 8f11e817c..3cdb36abf 100644 --- a/neutron/agent/linux/pd_driver.py +++ b/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', diff --git a/neutron/agent/linux/ra.py b/neutron/agent/linux/ra.py index fcdd1c830..8896e8d26 100644 --- a/neutron/agent/linux/ra.py +++ b/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 diff --git a/neutron/agent/linux/utils.py b/neutron/agent/linux/utils.py index 5c4efc48f..67aa71101 100644 --- a/neutron/agent/linux/utils.py +++ b/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 diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py index 47ccdc4e4..ab5c93f86 100644 --- a/neutron/agent/metadata/agent.py +++ b/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 diff --git a/neutron/agent/metadata/config.py b/neutron/agent/metadata/config.py index 0d34c9045..a5a79a1d3 100644 --- a/neutron/agent/metadata/config.py +++ b/neutron/agent/metadata/config.py @@ -14,6 +14,7 @@ from oslo_config import cfg +from neutron._i18n import _ from neutron.common import utils diff --git a/neutron/agent/metadata/namespace_proxy.py b/neutron/agent/metadata/namespace_proxy.py index b1ba58d47..8a226a622 100644 --- a/neutron/agent/metadata/namespace_proxy.py +++ b/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 diff --git a/neutron/agent/ovsdb/api.py b/neutron/agent/ovsdb/api.py index c711ac224..23ae9b4ba 100644 --- a/neutron/agent/ovsdb/api.py +++ b/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', diff --git a/neutron/agent/ovsdb/impl_idl.py b/neutron/agent/ovsdb/impl_idl.py index 8133c0c03..4ce44c033 100644 --- a/neutron/agent/ovsdb/impl_idl.py +++ b/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 diff --git a/neutron/agent/ovsdb/native/commands.py b/neutron/agent/ovsdb/native/commands.py index 9aa4e1169..dd977a7e4 100644 --- a/neutron/agent/ovsdb/native/commands.py +++ b/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 diff --git a/neutron/agent/ovsdb/native/idlutils.py b/neutron/agent/ovsdb/native/idlutils.py index a7b683ca7..ccc8599f7 100644 --- a/neutron/agent/ovsdb/native/idlutils.py +++ b/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 diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py index 8be598a22..5efc4cfe3 100644 --- a/neutron/agent/securitygroups_rpc.py +++ b/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 diff --git a/neutron/agent/windows/utils.py b/neutron/agent/windows/utils.py index 06795f3e7..115593ed0 100644 --- a/neutron/agent/windows/utils.py +++ b/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__) diff --git a/neutron/api/api_common.py b/neutron/api/api_common.py index 010ccfe15..fe7296773 100644 --- a/neutron/api/api_common.py +++ b/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 diff --git a/neutron/api/extensions.py b/neutron/api/extensions.py index 602b5a134..37f497951 100644 --- a/neutron/api/extensions.py +++ b/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 diff --git a/neutron/api/rpc/callbacks/exceptions.py b/neutron/api/rpc/callbacks/exceptions.py index 9e17474db..c45615bca 100644 --- a/neutron/api/rpc/callbacks/exceptions.py +++ b/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 diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py index b23586a72..e51e31ba2 100644 --- a/neutron/api/rpc/handlers/dhcp_rpc.py +++ b/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 diff --git a/neutron/api/rpc/handlers/resources_rpc.py b/neutron/api/rpc/handlers/resources_rpc.py index 42316c115..f49351184 100755 --- a/neutron/api/rpc/handlers/resources_rpc.py +++ b/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 diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py index c9f43b4e1..00a827e92 100644 --- a/neutron/api/v2/attributes.py +++ b/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 diff --git a/neutron/api/v2/base.py b/neutron/api/v2/base.py index f9470989a..ad68c6019 100644 --- a/neutron/api/v2/base.py +++ b/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 diff --git a/neutron/api/v2/resource.py b/neutron/api/v2/resource.py index e8409af59..0687977f7 100644 --- a/neutron/api/v2/resource.py +++ b/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 diff --git a/neutron/api/versions.py b/neutron/api/versions.py index 857dd6eca..f806b0cdd 100644 --- a/neutron/api/versions.py +++ b/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 diff --git a/neutron/callbacks/exceptions.py b/neutron/callbacks/exceptions.py index 96dbef52a..be5e6d58a 100644 --- a/neutron/callbacks/exceptions.py +++ b/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 diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py index d8121362c..9448b44ea 100644 --- a/neutron/cmd/ipset_cleanup.py +++ b/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 diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py index e3822e818..0c53ded68 100644 --- a/neutron/cmd/netns_cleanup.py +++ b/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 diff --git a/neutron/cmd/ovs_cleanup.py b/neutron/cmd/ovs_cleanup.py index bc3d2bae3..4571912e0 100644 --- a/neutron/cmd/ovs_cleanup.py +++ b/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 diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py index 6088a1b35..833a74d49 100644 --- a/neutron/cmd/sanity_check.py +++ b/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 diff --git a/neutron/common/config.py b/neutron/common/config.py index ac45d3082..a27e28dc4 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -27,7 +27,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 diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py index 54800e246..d3ac99963 100644 --- a/neutron/common/exceptions.py +++ b/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. diff --git a/neutron/common/ipv6_utils.py b/neutron/common/ipv6_utils.py index 35ac27277..a0c8f0cc7 100644 --- a/neutron/common/ipv6_utils.py +++ b/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 diff --git a/neutron/common/utils.py b/neutron/common/utils.py index a20ba5752..7237fd9d8 100644 --- a/neutron/common/utils.py +++ b/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" diff --git a/neutron/db/address_scope_db.py b/neutron/db/address_scope_db.py index f08f0b583..4bf6778ad 100644 --- a/neutron/db/address_scope_db.py +++ b/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 diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index 592340fec..0400e523e 100644 --- a/neutron/db/agents_db.py +++ b/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 diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index de4457cc0..478159c42 100644 --- a/neutron/db/agentschedulers_db.py +++ b/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 diff --git a/neutron/db/common_db_mixin.py b/neutron/db/common_db_mixin.py index e2473a5d0..301e0ba59 100644 --- a/neutron/db/common_db_mixin.py +++ b/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 diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index ba1ad2420..4f80f372d 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/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 diff --git a/neutron/db/dvr_mac_db.py b/neutron/db/dvr_mac_db.py index cd15ba483..0399292f2 100644 --- a/neutron/db/dvr_mac_db.py +++ b/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 diff --git a/neutron/db/extraroute_db.py b/neutron/db/extraroute_db.py index f3f3de4e7..0f94810cb 100644 --- a/neutron/db/extraroute_db.py +++ b/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 diff --git a/neutron/db/ipam_backend_mixin.py b/neutron/db/ipam_backend_mixin.py index e25aec166..7c817d589 100644 --- a/neutron/db/ipam_backend_mixin.py +++ b/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 diff --git a/neutron/db/ipam_non_pluggable_backend.py b/neutron/db/ipam_non_pluggable_backend.py index cf9c18ad5..f18ffeb21 100644 --- a/neutron/db/ipam_non_pluggable_backend.py +++ b/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 diff --git a/neutron/db/ipam_pluggable_backend.py b/neutron/db/ipam_pluggable_backend.py index 5664316c5..752d505e7 100644 --- a/neutron/db/ipam_pluggable_backend.py +++ b/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 diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py index 0258aefff..df51bfb8f 100644 --- a/neutron/db/l3_agentschedulers_db.py +++ b/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 diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index 8a051c74d..798433024 100644 --- a/neutron/db/l3_db.py +++ b/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 diff --git a/neutron/db/l3_dvr_db.py b/neutron/db/l3_dvr_db.py index 35e86dfdd..5470bb9d3 100644 --- a/neutron/db/l3_dvr_db.py +++ b/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 diff --git a/neutron/db/l3_gwmode_db.py b/neutron/db/l3_gwmode_db.py index 8eabc9212..6252b5bd8 100644 --- a/neutron/db/l3_gwmode_db.py +++ b/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 diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py index 32c53d5ba..5a795dc2f 100644 --- a/neutron/db/l3_hamode_db.py +++ b/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 diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index e69b8ab6b..484aeeaee 100644 --- a/neutron/db/migration/__init__.py +++ b/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' diff --git a/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py b/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py index ca5c6aafb..7391ce7ef 100644 --- a/neutron/db/migration/alembic_migrations/versions/14be42f3d0a5_default_sec_group_table.py +++ b/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 diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index fd482c6fe..e88530791 100644 --- a/neutron/db/migration/cli.py +++ b/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 diff --git a/neutron/db/rbac_db_models.py b/neutron/db/rbac_db_models.py index 1490e72a2..956f05f97 100644 --- a/neutron/db/rbac_db_models.py +++ b/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 diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py index f395f1cc6..8cbcc22e6 100644 --- a/neutron/db/securitygroups_db.py +++ b/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 diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py index 5523ce133..7f151fef6 100644 --- a/neutron/db/securitygroups_rpc_base.py +++ b/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 diff --git a/neutron/db/sqlalchemyutils.py b/neutron/db/sqlalchemyutils.py index 3cdb9ffa7..b720554d8 100644 --- a/neutron/db/sqlalchemyutils.py +++ b/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 diff --git a/neutron/debug/commands.py b/neutron/debug/commands.py index a8405c555..bb77b58f8 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/shell.py b/neutron/debug/shell.py index eca65d1f9..6a00071ce 100644 --- a/neutron/debug/shell.py +++ b/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 diff --git a/neutron/extensions/address_scope.py b/neutron/extensions/address_scope.py index 5636d3d27..802537bd2 100644 --- a/neutron/extensions/address_scope.py +++ b/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 diff --git a/neutron/extensions/agent.py b/neutron/extensions/agent.py index c83d3fb49..176aa2ce0 100644 --- a/neutron/extensions/agent.py +++ b/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 diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py index 9b73a1542..18884b3a3 100644 --- a/neutron/extensions/allowedaddresspairs.py +++ b/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 diff --git a/neutron/extensions/availability_zone.py b/neutron/extensions/availability_zone.py index d0cdf1bd9..ec94dc4a2 100644 --- a/neutron/extensions/availability_zone.py +++ b/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 diff --git a/neutron/extensions/dhcpagentscheduler.py b/neutron/extensions/dhcpagentscheduler.py index ebd8ff55d..ea636e63b 100644 --- a/neutron/extensions/dhcpagentscheduler.py +++ b/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 diff --git a/neutron/extensions/dns.py b/neutron/extensions/dns.py index 6b0a789cf..93e1ffbbb 100644 --- a/neutron/extensions/dns.py +++ b/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 diff --git a/neutron/extensions/dvr.py b/neutron/extensions/dvr.py index 06031fb7f..28b549b39 100644 --- a/neutron/extensions/dvr.py +++ b/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 diff --git a/neutron/extensions/external_net.py b/neutron/extensions/external_net.py index 54b481092..ebaab5d22 100644 --- a/neutron/extensions/external_net.py +++ b/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 diff --git a/neutron/extensions/extra_dhcp_opt.py b/neutron/extensions/extra_dhcp_opt.py index 8bc4bf699..1ad943d10 100644 --- a/neutron/extensions/extra_dhcp_opt.py +++ b/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 diff --git a/neutron/extensions/extraroute.py b/neutron/extensions/extraroute.py index ea12c00ea..4c2e96e4f 100644 --- a/neutron/extensions/extraroute.py +++ b/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 diff --git a/neutron/extensions/flavors.py b/neutron/extensions/flavors.py index 685d11fd9..a8167b3f9 100644 --- a/neutron/extensions/flavors.py +++ b/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 diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py index ea1652da1..64292ff0f 100644 --- a/neutron/extensions/l3.py +++ b/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 diff --git a/neutron/extensions/l3_ext_ha_mode.py b/neutron/extensions/l3_ext_ha_mode.py index 901f24381..48d24cd91 100644 --- a/neutron/extensions/l3_ext_ha_mode.py +++ b/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 diff --git a/neutron/extensions/l3agentscheduler.py b/neutron/extensions/l3agentscheduler.py index eb547dab7..1d0974cec 100644 --- a/neutron/extensions/l3agentscheduler.py +++ b/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 diff --git a/neutron/extensions/metering.py b/neutron/extensions/metering.py index 22d67b5e0..9410f51fd 100644 --- a/neutron/extensions/metering.py +++ b/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 diff --git a/neutron/extensions/multiprovidernet.py b/neutron/extensions/multiprovidernet.py index 18b769702..565179fd7 100644 --- a/neutron/extensions/multiprovidernet.py +++ b/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 diff --git a/neutron/extensions/portsecurity.py b/neutron/extensions/portsecurity.py index e743c0c02..fede653b9 100644 --- a/neutron/extensions/portsecurity.py +++ b/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 diff --git a/neutron/extensions/providernet.py b/neutron/extensions/providernet.py index 1cc8865f2..cf3bdcea8 100644 --- a/neutron/extensions/providernet.py +++ b/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 diff --git a/neutron/extensions/quotasv2.py b/neutron/extensions/quotasv2.py index f9a3ae991..00ce987f8 100644 --- a/neutron/extensions/quotasv2.py +++ b/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 diff --git a/neutron/extensions/rbac.py b/neutron/extensions/rbac.py index a96b82ad3..75aa13530 100644 --- a/neutron/extensions/rbac.py +++ b/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 diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index dcaddabfb..e1c8d45ad 100644 --- a/neutron/extensions/securitygroup.py +++ b/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 diff --git a/neutron/extensions/servicetype.py b/neutron/extensions/servicetype.py index 3a2574780..adecd81aa 100644 --- a/neutron/extensions/servicetype.py +++ b/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 diff --git a/neutron/extensions/vlantransparent.py b/neutron/extensions/vlantransparent.py index 3086c1df0..57a3cbb00 100644 --- a/neutron/extensions/vlantransparent.py +++ b/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 diff --git a/neutron/ipam/exceptions.py b/neutron/ipam/exceptions.py index 185e69784..53d16a297 100644 --- a/neutron/ipam/exceptions.py +++ b/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 diff --git a/neutron/ipam/requests.py b/neutron/ipam/requests.py index 09c279268..377689b4f 100644 --- a/neutron/ipam/requests.py +++ b/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 diff --git a/neutron/ipam/subnet_alloc.py b/neutron/ipam/subnet_alloc.py index 95d2a7a6f..7e90ceee0 100644 --- a/neutron/ipam/subnet_alloc.py +++ b/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 diff --git a/neutron/manager.py b/neutron/manager.py index b90e8de91..65b31ac3c 100644 --- a/neutron/manager.py +++ b/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 diff --git a/neutron/objects/base.py b/neutron/objects/base.py index 371fd896d..ac16d4152 100644 --- a/neutron/objects/base.py +++ b/neutron/objects/base.py @@ -17,6 +17,7 @@ from oslo_utils import reflection from oslo_versionedobjects import base as obj_base import six +from neutron._i18n import _ from neutron.common import exceptions from neutron.db import api as db_api diff --git a/neutron/pecan_wsgi/controllers/root.py b/neutron/pecan_wsgi/controllers/root.py index d45227223..15b509d5e 100644 --- a/neutron/pecan_wsgi/controllers/root.py +++ b/neutron/pecan_wsgi/controllers/root.py @@ -18,7 +18,7 @@ from oslo_log import log import pecan from pecan import request -from neutron._i18n import _LW +from neutron._i18n import _, _LW from neutron.api import extensions from neutron.api.views import versions as versions_view from neutron import manager diff --git a/neutron/pecan_wsgi/hooks/ownership_validation.py b/neutron/pecan_wsgi/hooks/ownership_validation.py index e6449acfb..469ffe228 100644 --- a/neutron/pecan_wsgi/hooks/ownership_validation.py +++ b/neutron/pecan_wsgi/hooks/ownership_validation.py @@ -16,6 +16,7 @@ from pecan import hooks import webob +from neutron._i18n import _ from neutron import manager diff --git a/neutron/pecan_wsgi/hooks/policy_enforcement.py b/neutron/pecan_wsgi/hooks/policy_enforcement.py index 0656e1214..e0bc77418 100644 --- a/neutron/pecan_wsgi/hooks/policy_enforcement.py +++ b/neutron/pecan_wsgi/hooks/policy_enforcement.py @@ -23,6 +23,7 @@ import pecan from pecan import hooks import webob +from neutron._i18n import _ from neutron.common import constants as const from neutron import manager from neutron.pecan_wsgi.hooks import attribute_population diff --git a/neutron/pecan_wsgi/hooks/translation.py b/neutron/pecan_wsgi/hooks/translation.py index d3c5f15fb..82bb0350d 100644 --- a/neutron/pecan_wsgi/hooks/translation.py +++ b/neutron/pecan_wsgi/hooks/translation.py @@ -17,6 +17,7 @@ from oslo_log import log as logging from pecan import hooks import webob.exc +from neutron._i18n import _ from neutron.api.v2 import base as v2base diff --git a/neutron/plugins/common/utils.py b/neutron/plugins/common/utils.py index 28cab4914..7ec7ba5a2 100644 --- a/neutron/plugins/common/utils.py +++ b/neutron/plugins/common/utils.py @@ -22,7 +22,7 @@ from oslo_log import log as logging import six import webob.exc -from neutron._i18n import _LI +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 diff --git a/neutron/plugins/ml2/common/exceptions.py b/neutron/plugins/ml2/common/exceptions.py index 166711d8e..ae75c8c5c 100644 --- a/neutron/plugins/ml2/common/exceptions.py +++ b/neutron/plugins/ml2/common/exceptions.py @@ -15,6 +15,7 @@ """Exceptions used by ML2.""" +from neutron._i18n import _ from neutron.common import exceptions diff --git a/neutron/plugins/ml2/config.py b/neutron/plugins/ml2/config.py index 0c16368fc..de8960692 100644 --- a/neutron/plugins/ml2/config.py +++ b/neutron/plugins/ml2/config.py @@ -15,6 +15,7 @@ from oslo_config import cfg +from neutron._i18n import _ ml2_opts = [ cfg.ListOpt('type_drivers', diff --git a/neutron/plugins/ml2/drivers/l2pop/config.py b/neutron/plugins/ml2/drivers/l2pop/config.py index 3e88a72f8..d8d685d24 100644 --- a/neutron/plugins/ml2/drivers/l2pop/config.py +++ b/neutron/plugins/ml2/drivers/l2pop/config.py @@ -15,6 +15,8 @@ from oslo_config import cfg +from neutron._i18n import _ + l2_population_options = [ cfg.IntOpt('agent_boot_time', default=180, diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py index 83c6203e5..df0ef7559 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py @@ -14,6 +14,7 @@ from oslo_config import cfg +from neutron._i18n import _ from neutron.agent.common import config DEFAULT_BRIDGE_MAPPINGS = [] diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py index 947eb9cad..1173d8a9a 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py @@ -16,6 +16,7 @@ from oslo_config import cfg +from neutron._i18n import _ from neutron.agent.common import config diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/exceptions.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/exceptions.py index 4446609b1..fbf8a5492 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/exceptions.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/exceptions.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.common import exceptions as n_exc 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 6c8161e3b..dc4c0e72f 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py @@ -20,7 +20,7 @@ import re from oslo_log import log as logging import six -from neutron._i18n import _LE, _LW +from neutron._i18n import _, _LE, _LW from neutron.common import utils 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 af2591179..6268009b8 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,7 +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._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 diff --git a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/exceptions.py b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/exceptions.py index 7b761de96..fd6ec90e9 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/exceptions.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/mech_driver/exceptions.py @@ -15,6 +15,7 @@ """Exceptions used by SRIOV Mechanism Driver.""" +from neutron._i18n import _ from neutron.common import exceptions 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 c68a33025..b1a63dc44 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,7 +17,7 @@ from oslo_config import cfg from oslo_log import log -from neutron._i18n import _LE, _LW +from neutron._i18n import _, _LE, _LW from neutron.common import constants from neutron.extensions import portbindings from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py index 11f22b730..059510bc8 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py @@ -14,6 +14,7 @@ from oslo_config import cfg +from neutron._i18n import _ from neutron.agent.common import config from neutron.common import constants as n_const from neutron.plugins.common import constants as p_const 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 9a939f4d1..deb0e4408 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -28,7 +28,7 @@ from oslo_service import loopingcall import six from six import moves -from neutron._i18n import _LE, _LI, _LW +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 diff --git a/neutron/plugins/ml2/drivers/type_flat.py b/neutron/plugins/ml2/drivers/type_flat.py index 7aaf8c021..c47d9c76c 100644 --- a/neutron/plugins/ml2/drivers/type_flat.py +++ b/neutron/plugins/ml2/drivers/type_flat.py @@ -19,7 +19,7 @@ from oslo_log import log import six import sqlalchemy as sa -from neutron._i18n import _LI, _LW +from neutron._i18n import _, _LI, _LW from neutron.common import exceptions as exc from neutron.db import model_base from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/ml2/drivers/type_geneve.py b/neutron/plugins/ml2/drivers/type_geneve.py index f3d00ba68..17f44b42d 100644 --- a/neutron/plugins/ml2/drivers/type_geneve.py +++ b/neutron/plugins/ml2/drivers/type_geneve.py @@ -18,7 +18,7 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql -from neutron._i18n import _LE +from neutron._i18n import _, _LE from neutron.common import exceptions as n_exc from neutron.db import model_base from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/ml2/drivers/type_gre.py b/neutron/plugins/ml2/drivers/type_gre.py index aacb5a7e6..bec904b87 100644 --- a/neutron/plugins/ml2/drivers/type_gre.py +++ b/neutron/plugins/ml2/drivers/type_gre.py @@ -18,7 +18,7 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql -from neutron._i18n import _LE +from neutron._i18n import _, _LE from neutron.common import exceptions as n_exc from neutron.db import model_base from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/ml2/drivers/type_local.py b/neutron/plugins/ml2/drivers/type_local.py index 0bf000094..610878e76 100644 --- a/neutron/plugins/ml2/drivers/type_local.py +++ b/neutron/plugins/ml2/drivers/type_local.py @@ -16,7 +16,7 @@ from oslo_log import log import six -from neutron._i18n import _LI +from neutron._i18n import _, _LI from neutron.common import exceptions as exc 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 44c19d64a..5e9e2df19 100644 --- a/neutron/plugins/ml2/drivers/type_tunnel.py +++ b/neutron/plugins/ml2/drivers/type_tunnel.py @@ -23,7 +23,7 @@ from oslo_log import log from six import moves from sqlalchemy import or_ -from neutron._i18n import _LI, _LW +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 diff --git a/neutron/plugins/ml2/drivers/type_vlan.py b/neutron/plugins/ml2/drivers/type_vlan.py index 258caf4b7..6d22670f6 100644 --- a/neutron/plugins/ml2/drivers/type_vlan.py +++ b/neutron/plugins/ml2/drivers/type_vlan.py @@ -20,7 +20,7 @@ from oslo_log import log from six import moves import sqlalchemy as sa -from neutron._i18n import _LE, _LI, _LW +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 diff --git a/neutron/plugins/ml2/drivers/type_vxlan.py b/neutron/plugins/ml2/drivers/type_vxlan.py index 1b6ce8bff..d258d9d61 100644 --- a/neutron/plugins/ml2/drivers/type_vxlan.py +++ b/neutron/plugins/ml2/drivers/type_vxlan.py @@ -18,7 +18,7 @@ from oslo_log import log import sqlalchemy as sa from sqlalchemy import sql -from neutron._i18n import _LE +from neutron._i18n import _, _LE from neutron.common import exceptions as n_exc from neutron.db import model_base from neutron.plugins.common import constants as p_const diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index e589a6dd2..995c68260 100644 --- a/neutron/plugins/ml2/managers.py +++ b/neutron/plugins/ml2/managers.py @@ -19,7 +19,7 @@ from oslo_utils import excutils import six import stevedore -from neutron._i18n import _LE, _LI, _LW +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 diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 7f97c16b7..a2747ce50 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -26,7 +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._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 diff --git a/neutron/policy.py b/neutron/policy.py index 5cc1f1bc9..ed680566b 100644 --- a/neutron/policy.py +++ b/neutron/policy.py @@ -23,7 +23,7 @@ from oslo_utils import excutils from oslo_utils import importutils import six -from neutron._i18n import _LE, _LW +from neutron._i18n import _, _LE, _LW from neutron.api.v2 import attributes from neutron.common import constants as const from neutron.common import exceptions diff --git a/neutron/quota/__init__.py b/neutron/quota/__init__.py index a0fffcb8b..ce61682dc 100644 --- a/neutron/quota/__init__.py +++ b/neutron/quota/__init__.py @@ -23,7 +23,7 @@ from oslo_utils import importutils import six import webob -from neutron._i18n import _LI, _LW +from neutron._i18n import _, _LI, _LW from neutron.common import exceptions from neutron.db.quota import api as quota_api from neutron.quota import resource_registry diff --git a/neutron/server/__init__.py b/neutron/server/__init__.py index 3386fcfa6..32ebdf2fa 100644 --- a/neutron/server/__init__.py +++ b/neutron/server/__init__.py @@ -20,6 +20,7 @@ import sys from oslo_config import cfg +from neutron._i18n import _ from neutron.common import config diff --git a/neutron/service.py b/neutron/service.py index c90b0be95..4f0a0fdcd 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -26,7 +26,7 @@ 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._i18n import _, _LE, _LI from neutron.common import config from neutron.common import rpc as n_rpc from neutron import context diff --git a/neutron/services/firewall/agents/firewall_agent_api.py b/neutron/services/firewall/agents/firewall_agent_api.py index 6e906a339..2c274c5d0 100644 --- a/neutron/services/firewall/agents/firewall_agent_api.py +++ b/neutron/services/firewall/agents/firewall_agent_api.py @@ -17,6 +17,7 @@ from oslo_config import cfg from oslo_log import log as logging import oslo_messaging +from neutron._i18n import _ from neutron.common import rpc as n_rpc LOG = logging.getLogger(__name__) diff --git a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py index 6109c53dc..51f35ca9f 100644 --- a/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py +++ b/neutron/services/firewall/agents/l3reference/firewall_l3_agent.py @@ -17,7 +17,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.linux import ip_lib from neutron.common import exceptions as nexception from neutron.common import topics diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index e9893dc14..d82afe7ac 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -23,7 +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._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 diff --git a/neutron/services/metering/drivers/iptables/iptables_driver.py b/neutron/services/metering/drivers/iptables/iptables_driver.py index f47ba98da..733e9efb6 100644 --- a/neutron/services/metering/drivers/iptables/iptables_driver.py +++ b/neutron/services/metering/drivers/iptables/iptables_driver.py @@ -18,7 +18,7 @@ from oslo_log import log as logging from oslo_utils import importutils import six -from neutron._i18n import _LE, _LI +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 diff --git a/neutron/services/provider_configuration.py b/neutron/services/provider_configuration.py index 5823ae937..722dddb08 100644 --- a/neutron/services/provider_configuration.py +++ b/neutron/services/provider_configuration.py @@ -20,7 +20,7 @@ from oslo_config import cfg from oslo_log import log as logging import stevedore -from neutron._i18n import _LW +from neutron._i18n import _, _LW from neutron.api.v2 import attributes as attr from neutron.common import exceptions as n_exc diff --git a/neutron/services/qos/notification_drivers/manager.py b/neutron/services/qos/notification_drivers/manager.py index d5487bbbb..5a8c89a9f 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/service_base.py b/neutron/services/service_base.py index c2570e554..5fa9bcf38 100644 --- a/neutron/services/service_base.py +++ b/neutron/services/service_base.py @@ -20,7 +20,7 @@ from oslo_utils import excutils from oslo_utils import importutils import six -from neutron._i18n import _LE, _LI +from neutron._i18n import _, _LE, _LI from neutron.api import extensions from neutron.db import servicetype_db as sdb from neutron.services import provider_configuration as pconf diff --git a/neutron/tests/base.py b/neutron/tests/base.py index d7dd976b6..301b6fc7b 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -34,6 +34,7 @@ from oslo_utils import strutils import six import testtools +from neutron._i18n import _ from neutron.agent.linux import external_process from neutron.api.rpc.callbacks.consumer import registry as rpc_consumer_reg from neutron.callbacks import manager as registry_manager diff --git a/neutron/tests/common/agents/l3_agent.py b/neutron/tests/common/agents/l3_agent.py index 9f87f6bba..410cce630 100755 --- a/neutron/tests/common/agents/l3_agent.py +++ b/neutron/tests/common/agents/l3_agent.py @@ -17,6 +17,7 @@ import sys from oslo_config import cfg +from neutron._i18n import _ from neutron.agent.l3 import agent from neutron.agent.l3 import namespaces from neutron.agent import l3_agent diff --git a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py index 107e59ee4..fa084616c 100644 --- a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py +++ b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py @@ -19,6 +19,7 @@ from oslo_config import cfg from oslo_config import fixture as fixture_config from oslo_utils import uuidutils +from neutron._i18n import _ from neutron.agent.l3 import keepalived_state_change from neutron.tests.functional import base diff --git a/neutron/tests/functional/agent/linux/simple_daemon.py b/neutron/tests/functional/agent/linux/simple_daemon.py index bcc565cfb..fa8b047da 100644 --- a/neutron/tests/functional/agent/linux/simple_daemon.py +++ b/neutron/tests/functional/agent/linux/simple_daemon.py @@ -16,6 +16,7 @@ import time from oslo_config import cfg +from neutron._i18n import _ from neutron.agent.linux import daemon diff --git a/neutron/tests/functional/agent/linux/test_async_process.py b/neutron/tests/functional/agent/linux/test_async_process.py index 09bfc027f..07225c9bb 100644 --- a/neutron/tests/functional/agent/linux/test_async_process.py +++ b/neutron/tests/functional/agent/linux/test_async_process.py @@ -15,6 +15,7 @@ import eventlet import six +from neutron._i18n import _ from neutron.agent.linux import async_process from neutron.agent.linux import utils from neutron.tests import base diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index 4c0b9605d..08ee3d2f1 100644 --- a/neutron/tests/functional/agent/linux/test_keepalived.py +++ b/neutron/tests/functional/agent/linux/test_keepalived.py @@ -16,6 +16,7 @@ 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.agent.linux import keepalived from neutron.agent.linux import utils diff --git a/neutron/tests/unit/agent/linux/test_iptables_manager.py b/neutron/tests/unit/agent/linux/test_iptables_manager.py index 76bb89cee..685e66a48 100644 --- a/neutron/tests/unit/agent/linux/test_iptables_manager.py +++ b/neutron/tests/unit/agent/linux/test_iptables_manager.py @@ -20,6 +20,7 @@ import mock from oslo_config import cfg import testtools +from neutron._i18n import _ from neutron.agent.linux import iptables_comments as ic from neutron.agent.linux import iptables_manager from neutron.common import constants diff --git a/neutron/tests/unit/api/v2/test_attributes.py b/neutron/tests/unit/api/v2/test_attributes.py index fe3953a8b..4401566f6 100644 --- a/neutron/tests/unit/api/v2/test_attributes.py +++ b/neutron/tests/unit/api/v2/test_attributes.py @@ -18,6 +18,7 @@ import testtools import mock +from neutron._i18n import _ from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc diff --git a/neutron/tests/unit/api/v2/test_resource.py b/neutron/tests/unit/api/v2/test_resource.py index 36afc9557..6b675c386 100644 --- a/neutron/tests/unit/api/v2/test_resource.py +++ b/neutron/tests/unit/api/v2/test_resource.py @@ -18,6 +18,7 @@ import oslo_i18n from webob import exc import webtest +from neutron._i18n import _ from neutron.api.v2 import resource as wsgi_resource from neutron.common import exceptions as n_exc from neutron import context diff --git a/neutron/tests/unit/plugins/ml2/drivers/mechanism_logger.py b/neutron/tests/unit/plugins/ml2/drivers/mechanism_logger.py index de6772bc4..93b1f53ff 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/mechanism_logger.py +++ b/neutron/tests/unit/plugins/ml2/drivers/mechanism_logger.py @@ -15,6 +15,7 @@ from oslo_log import log +from neutron._i18n import _ from neutron.plugins.ml2 import driver_api as api LOG = log.getLogger(__name__) diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py index 205dda824..0df40c181 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py @@ -21,6 +21,7 @@ from oslo_log import log import oslo_messaging import testtools +from neutron._i18n import _ from neutron.agent.common import ovs_lib from neutron.agent.common import utils from neutron.agent.linux import async_process diff --git a/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py b/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py index 985e4ebc8..bc739e4e1 100644 --- a/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py +++ b/neutron/tests/unit/plugins/ml2/extensions/fake_extension.py @@ -10,6 +10,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 diff --git a/neutron/tests/unit/plugins/ml2/test_plugin.py b/neutron/tests/unit/plugins/ml2/test_plugin.py index b4e906000..34b23eb89 100644 --- a/neutron/tests/unit/plugins/ml2/test_plugin.py +++ b/neutron/tests/unit/plugins/ml2/test_plugin.py @@ -26,6 +26,7 @@ from oslo_db import exception as db_exc from oslo_utils import uuidutils from sqlalchemy.orm import exc as sqla_exc +from neutron._i18n import _ from neutron.callbacks import registry from neutron.common import constants from neutron.common import exceptions as exc diff --git a/neutron/wsgi.py b/neutron/wsgi.py index b078b74ed..8f349a926 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -37,7 +37,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 config from neutron.common import exceptions as exception from neutron import context