--- /dev/null
+..
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+
+ Convention for heading levels in Neutron devref:
+ ======= Heading 0 (reserved for the title in a document)
+ ------- Heading 1
+ ~~~~~~~ Heading 2
+ +++++++ Heading 3
+ ''''''' Heading 4
+ (Avoid deeper levels because they do not render well.)
+
+
+Neutron Stadiun i18n
+====================
+
+* Refer to oslo_i18n documentation for the general mechanisms that should
+ be used: http://docs.openstack.org/developer/oslo.i18n/usage.html
+
+* Do NOT use the _i18n module in neutron-lib or neutron.
+
+* It is recommended that you create a {package_name}/_i18n.py file
+ in your repo, and use that. Your localization strings will also live
+ in your repo.
+
+* The neutron.i18n module will be around for a release or two, with
+ shared localization strings, but migration is encouraged.
callbacks
dns_order
upgrade
+ i18n
Testing
-------
--- /dev/null
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import oslo_i18n
+
+DOMAIN = "neutron"
+
+_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+# The contextual translation function using the name "_C"
+_C = _translators.contextual_form
+
+# The plural translation function using the name "_P"
+_P = _translators.plural_form
+
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical
+
+
+def get_available_languages():
+ return oslo_i18n.get_available_languages(DOMAIN)
import six
import uuid
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.common import utils
from neutron.agent.linux import ip_lib
from neutron.agent.ovsdb import api as ovsdb
from neutron.common import exceptions
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers.openvswitch.agent.common \
import constants
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.common import config
from neutron.common import utils as neutron_utils
-from neutron.i18n import _LE
if os.name == 'nt':
from oslo_service import loopingcall
from oslo_utils import importutils
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.linux import dhcp
from neutron.agent.linux import external_process
from neutron.agent.metadata import driver as metadata_driver
from neutron.common import topics
from neutron.common import utils
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
LOG = logging.getLogger(__name__)
from oslo_log import log
import stevedore
-from neutron.i18n import _LE, _LI
+from neutron._i18n import _LE, _LI
LOG = log.getLogger(__name__)
from oslo_log import log as logging
import six
+from neutron._i18n import _LW, _LI
from neutron.agent.l2 import agent_extension
from neutron.api.rpc.callbacks.consumer import registry
from neutron.api.rpc.callbacks import events
from neutron.api.rpc.callbacks import resources
from neutron.api.rpc.handlers import resources_rpc
from neutron.common import exceptions
-from neutron.i18n import _LW, _LI
from neutron import manager
LOG = logging.getLogger(__name__)
from oslo_utils import excutils
from oslo_utils import timeutils
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.common import utils as common_utils
from neutron.agent.l3 import dvr
from neutron.agent.l3 import dvr_edge_ha_router
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context as n_context
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
try:
from oslo_utils import excutils
import six
+from neutron._i18n import _LE, _LW
from neutron.agent.l3 import dvr_fip_ns
from neutron.agent.l3 import dvr_router_base
from neutron.agent.linux import ip_lib
from neutron.common import constants as l3_constants
from neutron.common import exceptions
from neutron.common import utils as common_utils
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
# xor-folding mask used for IPv6 rule index
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.l3 import router_info as router
from neutron.common import constants as l3_constants
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
import webob
+from neutron._i18n import _LI
from neutron.agent.linux import keepalived
from neutron.agent.linux import utils as agent_utils
from neutron.common import utils as common_utils
-from neutron.i18n import _LI
from neutron.notifiers import batch_notifier
LOG = logging.getLogger(__name__)
import netaddr
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.l3 import router_info as router
from neutron.agent.linux import external_process
from neutron.agent.linux import ip_lib
from neutron.agent.linux import keepalived
from neutron.common import constants as n_consts
from neutron.common import utils as common_utils
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
HA_DEV_PREFIX = 'ha-'
from oslo_log import log as logging
import requests
+from neutron._i18n import _LE
from neutron.agent.l3 import ha
from neutron.agent.linux import daemon
from neutron.agent.linux import ip_monitor
from neutron.agent.linux import utils as agent_utils
from neutron.common import config
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.l3 import dvr_fip_ns
from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.l3 import namespaces
from neutron.agent.linux import external_process
from neutron.agent.linux import ip_lib
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.linux import ip_lib
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
+from neutron._i18n import _LE, _LW
from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib
from neutron.agent.linux import iptables_manager
from neutron.common import exceptions as n_exc
from neutron.common import ipv6_utils
from neutron.common import utils as common_utils
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
INTERNAL_DEV_PREFIX = namespaces.INTERNAL_DEV_PREFIX
import eventlet.queue
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import utils as common_utils
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
+from neutron._i18n import _LE, _LI
from neutron.common import exceptions
-from neutron.i18n import _LE, _LI
LOG = logging.getLogger(__name__)
from oslo_utils import uuidutils
import six
+from neutron._i18n import _LI, _LW, _LE
from neutron.agent.common import utils as agent_common_utils
from neutron.agent.linux import external_process
from neutron.agent.linux import ip_lib
from neutron.common import ipv6_utils
from neutron.common import utils as common_utils
from neutron.extensions import extra_dhcp_opt as edo_ext
-from neutron.i18n import _LI, _LW, _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_utils import fileutils
+from neutron._i18n import _LE
from neutron.agent.common import config as agent_cfg
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import utils as common_utils
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
import six
+from neutron._i18n import _LE, _LI
from neutron.agent.common import ovs_lib
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import constants as n_const
from neutron.common import exceptions
from neutron.common import ipv6_utils
-from neutron.i18n import _LE, _LI
LOG = logging.getLogger(__name__)
import netaddr
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.linux import utils as linux_utils
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
import re
import six
+from neutron._i18n import _LE
from neutron.agent.common import utils
from neutron.common import constants
from neutron.common import exceptions
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
+from neutron._i18n import _LE
from neutron.agent.linux import utils
from neutron.common import exceptions as n_exc
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_utils import excutils
+from neutron._i18n import _LE
from neutron.agent.linux import async_process
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
import six
+from neutron._i18n import _LI
from neutron.agent import firewall
from neutron.agent.linux import ip_conntrack
from neutron.agent.linux import ipset_manager
from neutron.common import ipv6_utils
from neutron.common import utils as c_utils
from neutron.extensions import portsecurity as psec
-from neutron.i18n import _LI
LOG = logging.getLogger(__name__)
from oslo_utils import excutils
import six
+from neutron._i18n import _LE, _LW
from neutron.agent.common import config
from neutron.agent.linux import iptables_comments as ic
from neutron.agent.linux import utils as linux_utils
from neutron.common import exceptions as n_exc
from neutron.common import utils
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_serialization import jsonutils
+from neutron._i18n import _LE
from neutron.agent.linux import async_process
from neutron.agent.ovsdb import api as ovsdb
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
import six
from six.moves import http_client as httplib
+from neutron._i18n import _LE
from neutron.agent.common import config
from neutron.common import constants
from neutron.common import utils
-from neutron.i18n import _LE
from neutron import wsgi
import six.moves.urllib.parse as urlparse
import webob
+from neutron._i18n import _LE, _LW
from neutron.agent.linux import utils as agent_utils
from neutron.agent.metadata import config
from neutron.agent import rpc as agent_rpc
from neutron.common import topics
from neutron.common import utils
from neutron import context
-from neutron.i18n import _LE, _LW
from neutron.openstack.common.cache import cache
LOG = logging.getLogger(__name__)
import six.moves.urllib.parse as urlparse
import webob
+from neutron._i18n import _LE
from neutron.agent.linux import daemon
from neutron.agent.linux import utils as agent_utils
from neutron.common import config
from neutron.common import exceptions
from neutron.common import utils
-from neutron.i18n import _LE
from neutron import wsgi
LOG = logging.getLogger(__name__)
from oslo_utils import excutils
import six
+from neutron._i18n import _LE
from neutron.agent.common import utils
from neutron.agent.ovsdb import api as ovsdb
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_utils import excutils
+from neutron._i18n import _LE
from neutron.agent.ovsdb import api
from neutron.agent.ovsdb.native import idlutils
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
import oslo_messaging
from oslo_utils import uuidutils
+from neutron._i18n import _LW
from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
-from neutron.i18n import _LW
LOG = logging.getLogger(__name__)
import oslo_messaging
from oslo_utils import importutils
+from neutron._i18n import _LI, _LW
from neutron.agent import firewall
from neutron.api.rpc.handlers import securitygroups_rpc
-from neutron.i18n import _LI, _LW
LOG = logging.getLogger(__name__)
from six.moves.urllib import parse
from webob import exc
+from neutron._i18n import _LW
from neutron.common import constants
from neutron.common import exceptions
-from neutron.i18n import _LW
LOG = logging.getLogger(__name__)
import webob.dec
import webob.exc
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import exceptions
import neutron.extensions
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.services import provider_configuration
from neutron import wsgi
from oslo_log import log as logging
import oslo_messaging
+from neutron._i18n import _LE, _LW
from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
-from neutron.i18n import _LE, _LW
from neutron import manager
from oslo_log import log as logging
import oslo_messaging
+from neutron._i18n import _LE
from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
from neutron.db import agentschedulers_db
-from neutron.i18n import _LE
from neutron import manager
from neutron.plugins.common import constants as service_constants
import oslo_messaging
from oslo_utils import excutils
+from neutron._i18n import _LW
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron.common import utils
from neutron.db import api as db_api
from neutron.extensions import portbindings
-from neutron.i18n import _LW
from neutron import manager
from neutron.plugins.common import utils as p_utils
from neutron.quota import resource_registry
from oslo_log import log as logging
+from neutron._i18n import _LW
from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils
-from neutron.i18n import _LW
from neutron import manager
LOG = logging.getLogger(__name__)
import six
import webob.exc
+from neutron._i18n import _LE, _LI
from neutron.api import api_common
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.v2 import attributes
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.db import api as db_api
-from neutron.i18n import _LE, _LI
from neutron import policy
from neutron import quota
from neutron.quota import resource_registry
import webob.dec
import webob.exc
+from neutron._i18n import _LE, _LI
from neutron.common import exceptions
-from neutron.i18n import _LE, _LI
from neutron import wsgi
from oslo_log import log as logging
from oslo_utils import reflection
+from neutron._i18n import _LE
from neutron.callbacks import events
from neutron.callbacks import exceptions
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LI
from neutron.agent.common import config
from neutron.common import config as common_config
-from neutron.i18n import _LI
from neutron.plugins.hyperv.agent import config as hyperv_config
from neutron.plugins.hyperv.agent import l2_agent
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LE, _LI
from neutron.agent.linux import ipset_manager
from neutron.agent.linux import utils
from neutron.common import config
-from neutron.i18n import _LE, _LI
LOG = logging.getLogger(__name__)
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LE, _LI
from neutron.common import config
from neutron.common import utils as n_utils
-from neutron.i18n import _LE, _LI
from neutron.plugins.ml2.drivers.linuxbridge.agent \
import linuxbridge_neutron_agent
from oslo_log import log as logging
from oslo_utils import importutils
+from neutron._i18n import _LE
from neutron.agent.common import config as agent_config
from neutron.agent.common import ovs_lib
from neutron.agent.dhcp import config as dhcp_config
from neutron.agent.linux import ip_lib
from neutron.api.v2 import attributes
from neutron.common import config
-from neutron.i18n import _LE
LOG = logging.getLogger(__name__)
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LI
from neutron.agent.common import config as agent_config
from neutron.agent.common import ovs_lib
from neutron.agent.l3 import config as l3_config
from neutron.agent.linux import interface
from neutron.agent.linux import ip_lib
from neutron.common import config
-from neutron.i18n import _LI
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_utils import uuidutils
+from neutron._i18n import _LE
from neutron.agent.common import ovs_lib
from neutron.agent.l3 import ha_router
from neutron.agent.l3 import namespaces
from neutron.agent.linux import utils as agent_utils
from neutron.common import constants as n_consts
from neutron.common import utils
-from neutron.i18n import _LE
from neutron.plugins.common import constants as const
from neutron.plugins.ml2.drivers.openvswitch.agent.common \
import constants as ovs_const
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LE, _LW
from neutron.agent import dhcp_agent
from neutron.cmd.sanity import checks
from neutron.common import config
from neutron.db import l3_hamode_db
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
import oslo_messaging
from oslo_service import wsgi
+from neutron._i18n import _LI
from neutron.api.v2 import attributes
from neutron.common import utils
-from neutron.i18n import _LI
from neutron import policy
from neutron import version
import netaddr
from oslo_log import log
+from neutron._i18n import _LI
from neutron.common import constants
-from neutron.i18n import _LI
LOG = log.getLogger(__name__)
import six
from stevedore import driver
+from neutron._i18n import _LE
from neutron.common import constants as n_const
-from neutron.i18n import _LE
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
LOG = logging.getLogger(__name__)
from sqlalchemy.orm import exc
from sqlalchemy import sql
+from neutron._i18n import _LE, _LI, _LW
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron import context
from neutron.db import models_v2
from neutron.extensions import agent as ext_agent
from neutron.extensions import availability_zone as az_ext
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
LOG = logging.getLogger(__name__)
from sqlalchemy import orm
from sqlalchemy.orm import exc
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import constants
from neutron.common import utils
from neutron import context as ncontext
from neutron.db import model_base
from neutron.extensions import agent as ext_agent
from neutron.extensions import dhcpagentscheduler
-from neutron.i18n import _LE, _LI, _LW
LOG = logging.getLogger(__name__)
from sqlalchemy import and_
from sqlalchemy import event
+from neutron._i18n import _LE, _LI
from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
from neutron.api.v2 import attributes
from neutron.callbacks import events
from neutron.db import rbac_db_models as rbac_db
from neutron.db import sqlalchemyutils
from neutron.extensions import l3
-from neutron.i18n import _LE, _LI
from neutron import ipam
from neutron.ipam import subnet_alloc
from neutron import manager
import sqlalchemy as sa
from sqlalchemy.orm import exc
+from neutron._i18n import _LE
from neutron.common import exceptions as n_exc
from neutron.common import utils
from neutron.db import model_base
from neutron.extensions import dvr as ext_dvr
from neutron.extensions import portbindings
-from neutron.i18n import _LE
from neutron import manager
from oslo_log import log as logging
from sqlalchemy.orm import exc as orm_exc
+from neutron._i18n import _LI
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron.common import ipv6_utils
from neutron.db import db_base_plugin_common
from neutron.db import models_v2
-from neutron.i18n import _LI
from neutron.ipam import utils as ipam_utils
LOG = logging.getLogger(__name__)
from oslo_utils import excutils
from sqlalchemy import and_
+from neutron._i18n import _LE
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron.common import ipv6_utils
from neutron.db import ipam_backend_mixin
from neutron.db import models_v2
-from neutron.i18n import _LE
from neutron.ipam import driver
from neutron.ipam import exceptions as ipam_exc
from neutron.ipam import requests as ipam_req
from sqlalchemy.orm import joinedload
from sqlalchemy import sql
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import constants
from neutron.common import utils as n_utils
from neutron import context as n_ctx
from neutron.db import l3_attrs_db
from neutron.db import model_base
from neutron.extensions import l3agentscheduler
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.plugins.common import constants as service_constants
from oslo_utils import excutils
import six
+from neutron._i18n import _LI
from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
from neutron.api.v2 import attributes
from neutron.callbacks import events
from neutron.db import models_v2
from neutron.extensions import external_net
from neutron.extensions import l3
-from neutron.i18n import _LI
from neutron import manager
from neutron.plugins.common import constants
from neutron.plugins.common import utils as p_utils
from oslo_utils import excutils
import six
+from neutron._i18n import _LI, _LW
from neutron.api.v2 import attributes
from neutron.callbacks import events
from neutron.callbacks import exceptions
from neutron.db import models_v2
from neutron.extensions import l3
from neutron.extensions import portbindings
-from neutron.i18n import _LI, _LW
from neutron import manager
from neutron.plugins.common import constants
from neutron.plugins.common import utils as p_utils
from sqlalchemy import orm
from sqlalchemy.orm import joinedload
+from neutron._i18n import _LI, _LW
from neutron.callbacks import events
from neutron.callbacks import registry
from neutron.callbacks import resources
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import l3agentscheduler
-from neutron.i18n import _LI, _LW
from neutron import manager
from neutron.plugins.common import constants as service_constants
from neutron.plugins.ml2 import db as ml2_db
import sqlalchemy as sa
from sqlalchemy import orm
+from neutron._i18n import _LI
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron.common import exceptions as n_exc
from neutron.extensions import l3_ext_ha_mode as l3_ha
from neutron.extensions import portbindings
from neutron.extensions import providernet
-from neutron.i18n import _LI
from neutron.plugins.common import utils as p_utils
from oslo_log import log as logging
import oslo_messaging
+from neutron._i18n import _LE
from neutron.common import constants as consts
from neutron.common import utils
-from neutron.i18n import _LE
from neutron import manager
from neutron.plugins.common import constants as service_constants
from oslo_log import log as logging
from sqlalchemy.orm import exc
+from neutron._i18n import _LW
from neutron.common import constants as n_const
from neutron.common import ipv6_utils as ipv6
from neutron.common import utils
from neutron.db import models_v2
from neutron.db import securitygroups_db as sg_db
from neutron.extensions import securitygroup as ext_sg
-from neutron.i18n import _LW
LOG = logging.getLogger(__name__)
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):
import netaddr
from oslo_log import log as logging
+from neutron._i18n import _LW
from neutron.agent.linux import dhcp
from neutron.agent.linux import ip_lib
from neutron.common import constants
-from neutron.i18n import _LW
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
import webob.exc
+from neutron._i18n import _LE
from neutron.api import extensions
from neutron.api.v2 import base
from neutron.api.v2 import resource
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.extensions import agent
-from neutron.i18n import _LE
from neutron import manager
from neutron.plugins.common import constants as service_constants
from neutron import policy
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LI
from neutron.api import extensions
from neutron.api.v2 import attributes
from neutron.common import exceptions as nexception
-from neutron.i18n import _LI
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
-import oslo_i18n
+# TODO(dougwig) - remove this file at the beginning of N.
-_translators = oslo_i18n.TranslatorFactory(domain='neutron')
+from debtcollector import moves
-# The primary translation function using the well-known name "_"
-_ = _translators.primary
+import neutron._i18n
-# Translators for log levels.
-#
-# The abbreviated names are meant to reflect the usual use of a short
-# name like '_'. The "L" is for "log" and the other letter comes from
-# the level.
-_LI = _translators.log_info
-_LW = _translators.log_warning
-_LE = _translators.log_error
-_LC = _translators.log_critical
+message = "moved to neutron._i18n; please migrate to local oslo_i18n " \
+ "usage, as defined in the devref and at " \
+ "http://docs.openstack.org/developer/oslo.i18n/usage.html"
+
+_ = moves.moved_function(neutron._i18n._, '_', __name__, message=message)
+_LI = moves.moved_function(neutron._i18n._LI, '_LI', __name__, message=message)
+_LW = moves.moved_function(neutron._i18n._LW, '_LW', __name__, message=message)
+_LE = moves.moved_function(neutron._i18n._LE, '_LE', __name__, message=message)
+_LC = moves.moved_function(neutron._i18n._LC, '_LC', __name__, message=message)
from oslo_log import log
from oslo_utils import uuidutils
+from neutron._i18n import _LE
from neutron.common import exceptions as n_exc
from neutron.common import ipv6_utils
from neutron.db import api as db_api
-from neutron.i18n import _LE
from neutron.ipam import driver as ipam_base
from neutron.ipam.drivers.neutrondb_ipam import db_api as ipam_db_api
from neutron.ipam import exceptions as ipam_exc
from oslo_service import periodic_task
import six
+from neutron._i18n import _LI
from neutron.common import utils
-from neutron.i18n import _LI
from neutron.plugins.common import constants
from oslo_utils import uuidutils
from sqlalchemy.orm import attributes as sql_attr
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import constants
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.notifiers import batch_notifier
import pecan
from pecan import request
+from neutron._i18n import _LW
from neutron.api import extensions
from neutron.api.views import versions as versions_view
-from neutron.i18n import _LW
from neutron import manager
LOG = log.getLogger(__name__)
from oslo_log import log
+from neutron._i18n import _LI, _LW
from neutron.api import extensions
from neutron.api.v2 import attributes
from neutron.api.v2 import router
-from neutron.i18n import _LI, _LW
from neutron import manager
from neutron.pecan_wsgi.controllers import root
from neutron import policy
import oslo_messaging
from oslo_utils import importutils
+from neutron._i18n import _LE, _LI
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
from neutron.db import securitygroups_rpc_base as sg_db_rpc
from neutron.extensions import portbindings
from neutron.extensions import securitygroup as ext_sg
-from neutron.i18n import _LE, _LI
from neutron.plugins.brocade.db import models as brocade_db
from neutron.plugins.brocade import vlanbm as vbm
from neutron.plugins.common import constants as svc_constants
from oslo_log import log as logging
from oslo_utils import excutils
-from neutron.i18n import _LE
+from neutron._i18n import _LE
from neutron.plugins.brocade.nos import nctemplates as template
import six
import webob.exc
+from neutron._i18n import _LI
from neutron.api.v2 import attributes
from neutron.common import constants as n_const
from neutron.common import exceptions as n_exc
-from neutron.i18n import _LI
from neutron.plugins.common import constants as p_const
INTERFACE_HASH_LEN = 6
import oslo_messaging
from oslo_service import loopingcall
+from neutron._i18n import _LE
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import constants as n_const
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context
-from neutron.i18n import _LE
from neutron.plugins.ml2.drivers.hyperv import constants as h_const
LOG = logging.getLogger(__name__)
from sqlalchemy import or_
from sqlalchemy.orm import exc
+from neutron._i18n import _LE, _LI
from neutron.common import constants as n_const
from neutron.db import models_v2
from neutron.db import securitygroups_db as sg_db
from neutron.extensions import portbindings
-from neutron.i18n import _LE, _LI
from neutron import manager
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2 import models
from oslo_log import log
from oslo_serialization import jsonutils
+from neutron._i18n import _LW
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.i18n import _LW
from neutron.plugins.ml2 import db
from neutron.plugins.ml2 import driver_api as api
from oslo_config import cfg
from oslo_log import log as logging
+from neutron._i18n import _LW
from neutron.common import constants as const
from neutron import context as n_context
from neutron.db import api as db_api
-from neutron.i18n import _LW
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.l2pop import config # noqa
from oslo_concurrency import lockutils
from oslo_log import log as logging
+from neutron._i18n import _LI
from neutron.agent.linux import ip_lib
from neutron.common import utils
-from neutron.i18n import _LI
LOG = logging.getLogger(__name__)
SPOOF_CHAIN_PREFIX = 'neutronARP-'
from oslo_utils import excutils
from six import moves
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.linux import bridge_lib
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.common import topics
from neutron.common import utils as n_utils
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers.l2pop.rpc_manager \
import l2population_rpc as l2pop_rpc
from oslo_log import log
+from neutron._i18n import _LW
from neutron.extensions import portbindings
-from neutron.i18n import _LW
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2 import driver_api as api
from oslo_log import log as logging
import six
+from neutron._i18n import _LE, _LW
from neutron.common import utils
-from neutron.i18n import _LE, _LW
from neutron.plugins.ml2.drivers.mech_sriov.agent.common \
import exceptions as exc
from neutron.plugins.ml2.drivers.mech_sriov.agent import pci_lib
from oslo_log import log as logging
+from neutron._i18n import _LE, _LI
from neutron.agent.l2.extensions import qos
-from neutron.i18n import _LE, _LI
from neutron.plugins.ml2.drivers.mech_sriov.agent.common import (
exceptions as exc)
from neutron.plugins.ml2.drivers.mech_sriov.agent import eswitch_manager as esm
from oslo_log import log as logging
+from neutron._i18n import _LE, _LW
from neutron.agent.linux import ip_lib
-from neutron.i18n import _LE, _LW
from neutron.plugins.ml2.drivers.mech_sriov.agent.common \
import exceptions as exc
import oslo_messaging
from oslo_service import loopingcall
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.l2.extensions import manager as ext_manager
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import topics
from neutron.common import utils as n_utils
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.ml2.drivers.mech_sriov.agent.common import config
from neutron.plugins.ml2.drivers.mech_sriov.agent.common \
import exceptions as exc
from oslo_config import cfg
from oslo_log import log
+from neutron._i18n import _LE, _LW
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.i18n import _LE, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.mech_sriov.mech_driver \
from ryu.lib.packet import icmpv6
from ryu.lib.packet import in_proto
-from neutron.i18n import _LE
+from neutron._i18n import _LE
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native \
import ryu.app.ofctl.api as ofctl_api
import ryu.exception as ryu_exc
-from neutron.i18n import _LE, _LW
+from neutron._i18n import _LE, _LW
LOG = logging.getLogger(__name__)
from oslo_log import log as logging
from oslo_utils import excutils
+from neutron._i18n import _LI
from neutron.agent.common import ovs_lib
-from neutron.i18n import _LI
from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.native \
import ofswitch
from oslo_log import log as logging
-from neutron.i18n import _LW
+from neutron._i18n import _LW
LOG = logging.getLogger(__name__)
import oslo_messaging
from oslo_utils import excutils
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import constants as n_const
from neutron.common import utils as n_utils
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
import six
from six import moves
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.common import ovs_lib
from neutron.agent.common import polling
from neutron.agent.common import utils
from neutron.common import topics
from neutron.common import utils as n_utils
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.common import utils as p_utils
from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc
import six
import sqlalchemy as sa
+from neutron._i18n import _LI, _LW
from neutron.common import exceptions as exc
from neutron.db import model_base
-from neutron.i18n import _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import helpers
import sqlalchemy as sa
from sqlalchemy import sql
+from neutron._i18n import _LE
from neutron.common import exceptions as n_exc
from neutron.db import model_base
-from neutron.i18n import _LE
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers import type_tunnel
import sqlalchemy as sa
from sqlalchemy import sql
+from neutron._i18n import _LE
from neutron.common import exceptions as n_exc
from neutron.db import model_base
-from neutron.i18n import _LE
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers import type_tunnel
from oslo_log import log
import six
+from neutron._i18n import _LI
from neutron.common import exceptions as exc
-from neutron.i18n import _LI
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
from six import moves
from sqlalchemy import or_
+from neutron._i18n import _LI, _LW
from neutron.common import exceptions as exc
from neutron.common import topics
from neutron.db import api as db_api
-from neutron.i18n import _LI, _LW
from neutron.plugins.common import utils as plugin_utils
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import helpers
from six import moves
import sqlalchemy as sa
+from neutron._i18n import _LE, _LI, _LW
from neutron.common import exceptions as exc
from neutron.db import api as db_api
from neutron.db import model_base
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.common import constants as p_const
from neutron.plugins.common import utils as plugin_utils
from neutron.plugins.ml2 import driver_api as api
import sqlalchemy as sa
from sqlalchemy import sql
+from neutron._i18n import _LE
from neutron.common import exceptions as n_exc
from neutron.db import model_base
-from neutron.i18n import _LE
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers import type_tunnel
# License for the specific language governing permissions and limitations
# under the License.
+from neutron._i18n import _LI
from neutron.api.v2 import attributes as attrs
from neutron.common import utils
from neutron.db import common_db_mixin
from neutron.db import portsecurity_db_common as ps_db_common
from neutron.extensions import portsecurity as psec
-from neutron.i18n import _LI
from neutron.plugins.ml2 import driver_api as api
from oslo_log import log as logging
import six
import stevedore
+from neutron._i18n import _LE, _LI, _LW
from neutron.api.v2 import attributes
from neutron.common import exceptions as exc
from neutron.extensions import external_net
from neutron.extensions import portbindings
from neutron.extensions import providernet as provider
from neutron.extensions import vlantransparent
-from neutron.i18n import _LE, _LI, _LW
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import db
from neutron.plugins.ml2 import driver_api as api
from sqlalchemy import exc as sql_exc
from sqlalchemy.orm import exc as sa_exc
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.rpc.handlers import dhcp_rpc
from neutron.extensions import portsecurity as psec
from neutron.extensions import providernet as provider
from neutron.extensions import vlantransparent
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron.plugins.common import constants as service_constants
from neutron.plugins.ml2.common import exceptions as ml2_exc
import oslo_messaging
from sqlalchemy.orm import exc
+from neutron._i18n import _LE, _LW
from neutron.api.rpc.handlers import dvr_rpc
from neutron.api.rpc.handlers import securitygroups_rpc as sg_rpc
from neutron.callbacks import events
from neutron.common import topics
from neutron.extensions import portbindings
from neutron.extensions import portsecurity as psec
-from neutron.i18n import _LE, _LW
from neutron import manager
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import type_tunnel
from oslo_utils import importutils
import six
+from neutron._i18n import _LE, _LW
from neutron.api.v2 import attributes
from neutron.common import constants as const
from neutron.common import exceptions
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
import six
import webob
+from neutron._i18n import _LI, _LW
from neutron.common import exceptions
from neutron.db.quota import api as quota_api
-from neutron.i18n import _LI, _LW
from neutron.quota import resource_registry
from oslo_utils import excutils
from sqlalchemy import event
+from neutron._i18n import _LE
from neutron.db import api as db_api
from neutron.db.quota import api as quota_api
-from neutron.i18n import _LE
LOG = log.getLogger(__name__)
from oslo_log import log
import six
-from neutron.i18n import _LI, _LW
+from neutron._i18n import _LI, _LW
from neutron.quota import resource
LOG = log.getLogger(__name__)
from oslo_log import log as logging
from sqlalchemy import sql
+from neutron._i18n import _LI, _LW
from neutron.common import constants
from neutron.db import agents_db
from neutron.db import agentschedulers_db
from neutron.extensions import availability_zone as az_ext
-from neutron.i18n import _LI, _LW
from neutron.scheduler import base_resource_filter
from neutron.scheduler import base_scheduler
import six
from sqlalchemy import sql
+from neutron._i18n import _LE, _LW
from neutron.common import constants
from neutron.common import utils
from neutron.db import l3_agentschedulers_db
from neutron.db import l3_db
from neutron.db import l3_hamode_db
-from neutron.i18n import _LE, _LW
LOG = logging.getLogger(__name__)
import eventlet
from oslo_log import log
-from neutron.i18n import _LI
+from neutron._i18n import _LI
from neutron import server
from neutron import service
from oslo_log import log
-from neutron.i18n import _LI
+from neutron._i18n import _LI
from neutron import server
from neutron import service
from oslo_log import log
from six.moves import socketserver
+from neutron._i18n import _LI, _LW
from neutron.common import rpc as n_rpc
-from neutron.i18n import _LI, _LW
from neutron.pecan_wsgi import app as pecan_app
from neutron import server
from oslo_utils import excutils
from oslo_utils import importutils
+from neutron._i18n import _LE, _LI
from neutron.common import config
from neutron.common import rpc as n_rpc
from neutron import context
from neutron.db import api as session
-from neutron.i18n import _LE, _LI
from neutron import manager
from neutron import worker
from neutron import wsgi
from oslo_log import log as logging
from oslo_utils import importutils
+from neutron._i18n import _LE
from neutron.agent.linux import ip_lib
from neutron.common import exceptions as nexception
from neutron.common import topics
from neutron import context
-from neutron.i18n import _LE
from neutron.plugins.common import constants
from neutron.services.firewall.agents import firewall_agent_api as api
from neutron.services import provider_configuration as provconf
from oslo_service import service
from oslo_utils import importutils
+from neutron._i18n import _LE, _LI, _LW
from neutron.agent.common import config
from neutron.agent import rpc as agent_rpc
from neutron.common import config as common_config
from neutron.common import topics
from neutron.common import utils
from neutron import context
-from neutron.i18n import _LE, _LI, _LW
from neutron import manager
from neutron import service as neutron_service
from oslo_utils import importutils
import six
+from neutron._i18n import _LE, _LI
from neutron.agent.common import config
from neutron.agent.linux import interface
from neutron.agent.linux import iptables_manager
from neutron.common import constants as constants
from neutron.common import ipv6_utils
-from neutron.i18n import _LE, _LI
from neutron.services.metering.drivers import abstract_driver
from oslo_log import log as logging
import stevedore
+from neutron._i18n import _LW
from neutron.common import exceptions as n_exc
-from neutron.i18n import _LW
LOG = logging.getLogger(__name__)
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'
from oslo_log import log as logging
+from neutron._i18n import _LW
from neutron.api.rpc.callbacks import events
from neutron.api.rpc.callbacks.producer import registry
from neutron.api.rpc.callbacks import resources
from neutron.api.rpc.handlers import resources_rpc
-from neutron.i18n import _LW
from neutron.objects.qos import policy as policy_object
from neutron.services.qos.notification_drivers import qos_base
from oslo_utils import importutils
import six
+from neutron._i18n import _LE, _LI
from neutron.api import extensions
from neutron.db import servicetype_db as sdb
-from neutron.i18n import _LE, _LI
from neutron.services import provider_configuration as pconf
LOG = logging.getLogger(__name__)
import webob.dec
import webob.exc
+from neutron._i18n import _LE, _LI
from neutron.common import config
from neutron.common import exceptions as exception
from neutron import context
from neutron.db import api
-from neutron.i18n import _LE, _LI
from neutron import worker
socket_opts = [
exclude = ./.*,build,dist,neutron/openstack/common/*,neutron/tests/tempest
[hacking]
-import_exceptions = neutron.i18n
+import_exceptions = neutron._i18n
local-check-factory = neutron.hacking.checks.factory
[testenv:genconfig]
Code Review / openstack-build / neutron-build.git / commitdiff