Merge "Fix i18n imports for Liberty" into stable/liberty

networking_cisco/_i18n.py

@@ -0,0 +1,45 @@
+# Copyright 2016 Cisco Systems, Inc.
+# 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 = "networking-cisco"
+
+_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"
+# requires oslo.i18n >=2.1.0
+_C = _translators.contextual_form
+
+# The plural translation function using the name "_P"
+# requires oslo.i18n >=2.1.0
+_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)

networking_cisco/apps/saf/agent/dfa_agent.py

@@ -24,8 +24,8 @@ import eventlet
 eventlet.monkey_patch()
 from oslo_serialization import jsonutils
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.agent import iptables_driver as iptd
 from networking_cisco.apps.saf.agent.vdp import dfa_vdp_mgr as vdpm

networking_cisco/apps/saf/agent/iptables_driver.py

@@ -18,8 +18,8 @@
 from six.moves import queue
 import time
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.common import dfa_logger as logging
 from networking_cisco.apps.saf.common import dfa_sys_lib as dsl

networking_cisco/apps/saf/agent/vdp/dfa_vdp_mgr.py

@@ -18,10 +18,11 @@
 from six.moves import queue
 import time
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 from oslo_serialization import jsonutils
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from networking_cisco.apps.saf.agent import detect_uplink as uplink_det
 from networking_cisco.apps.saf.agent.vdp import ovs_vdp
 from networking_cisco.apps.saf.common import constants

networking_cisco/apps/saf/agent/vdp/lldpad.py

@@ -20,6 +20,8 @@ VDP is a part of LLDP Agent Daemon (lldpad). For more information on VDP,
 pls visit http://www.ieee802.org/1/pages/802.1bg.html
 """
 
+from networking_cisco._i18n import _LE
+
 from networking_cisco.apps.saf.agent.vdp import (
     lldpad_constants as vdp_const)
 from networking_cisco.apps.saf.common import config
@@ -27,7 +29,6 @@ from networking_cisco.apps.saf.common import constants
 from networking_cisco.apps.saf.common import dfa_logger as logging
 from networking_cisco.apps.saf.common import dfa_sys_lib as utils
 from networking_cisco.apps.saf.common import utils as sys_utils
-from neutron.i18n import _LE
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/apps/saf/agent/vdp/ovs_vdp.py

@@ -19,6 +19,8 @@
 VDP is a part of LLDP Agent Daemon (lldpad). For more information on VDP,
 pls visit http://www.ieee802.org/1/pages/802.1bg.html
 """
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.agent.vdp import lldpad
 from networking_cisco.apps.saf.agent.vdp import vdp_constants as constants
@@ -27,8 +29,6 @@ from networking_cisco.apps.saf.common import dfa_exceptions as dfae
 from networking_cisco.apps.saf.common import dfa_logger as logging
 from networking_cisco.apps.saf.common import dfa_sys_lib as ovs_lib
 from neutron.agent.linux import ip_lib
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/apps/saf/common/config.py

@@ -19,7 +19,7 @@ import sys
 
 from oslo_config import cfg
 
-from neutron.i18n import _LE
+from networking_cisco._i18n import _LE
 
 from networking_cisco.apps.saf.agent.vdp import (
     lldpad_constants as vdp_const)

networking_cisco/apps/saf/common/dfa_exceptions.py

@@ -17,6 +17,8 @@
 
 """Exceptions used by DFA enabler"""
 
+from networking_cisco._i18n import _
+
 from neutron.common import exceptions
 from neutronclient.common import exceptions as ncexc
 

networking_cisco/apps/saf/common/dfa_sys_lib.py

@@ -22,8 +22,9 @@ import shlex
 import signal
 import six
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.common import constants as q_const
 from networking_cisco.apps.saf.common import dfa_exceptions as dfae

networking_cisco/apps/saf/db/dfa_db_models.py

@@ -18,8 +18,8 @@
 import sqlalchemy as sa
 import sqlalchemy.orm.exc as orm_exc
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.common import dfa_logger as logging
 from networking_cisco.apps.saf.db import dfa_db_api as db

networking_cisco/apps/saf/server/cisco_dfa_rest.py

@@ -20,10 +20,11 @@
 
 import requests
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 from oslo_serialization import jsonutils
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from networking_cisco.apps.saf.common import dfa_exceptions as dexc
 from networking_cisco.apps.saf.common import dfa_logger as logging
 

networking_cisco/apps/saf/server/dfa_events_handler.py

@@ -17,8 +17,9 @@
 
 import socket
 
+from networking_cisco._i18n import _LE
+
 from keystoneclient.v3 import client
-from neutron.i18n import _LE
 from neutronclient.v2_0 import client as nc
 
 from networking_cisco.apps.saf.common import config

networking_cisco/apps/saf/server/dfa_fail_recovery.py

@@ -16,12 +16,13 @@
 
 import time
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from networking_cisco.apps.saf.common import constants
 from networking_cisco.apps.saf.common import dfa_exceptions as dexc
 from networking_cisco.apps.saf.common import dfa_logger as logging
 from networking_cisco.apps.saf.common import utils
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/apps/saf/server/dfa_instance_api.py

@@ -21,11 +21,11 @@ information such as display_name.
 """
 
 from keystoneclient.v2_0 import client as keyc
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 from novaclient import exceptions as nexc
 from novaclient.v2 import client as nova_client
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.common import config
 from networking_cisco.apps.saf.common import dfa_logger as logging

networking_cisco/apps/saf/server/dfa_listen_dcnm.py

@@ -23,8 +23,8 @@ import traceback
 
 from oslo_serialization import jsonutils
 
-from neutron.i18n import _LE
-from neutron.i18n import _LI
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
 
 from networking_cisco.apps.saf.common import dfa_logger as logging
 

networking_cisco/apps/saf/server/dfa_server.py

@@ -31,10 +31,9 @@ from six.moves import queue
 import sys
 import time
 
-
-from neutron.i18n import _LE
-from neutron.i18n import _LI
-from neutron.i18n import _LW
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
 from oslo_serialization import jsonutils
 
 

networking_cisco/neutronclient/hostingdevice.py

@@ -19,10 +19,10 @@ from __future__ import print_function
 import argparse
 import six
 
-from neutronclient.common import extension
-from neutronclient.i18n import _
-from neutronclient.neutron import v2_0 as neutronV20
+from networking_cisco._i18n import _
 
+from neutronclient.common import extension
+from neutronclient.neutron import v2_0 as neutronV20
 
 DEVICE = 'hosting_device'
 HOSTING_DEVICE_CONFIG = '/get_hosting_device_config'

networking_cisco/neutronclient/hostingdevicescheduler.py

@@ -16,8 +16,9 @@
 
 from __future__ import print_function
 
+from networking_cisco._i18n import _
+
 from neutronclient.common import extension
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 
 

networking_cisco/neutronclient/hostingdevicetemplate.py

@@ -19,8 +19,9 @@ from __future__ import print_function
 import argparse
 import six
 
+from networking_cisco._i18n import _
+
 from neutronclient.common import extension
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 
 

networking_cisco/neutronclient/networkprofile.py

@@ -14,8 +14,9 @@
 #    under the License.
 #
 
+from networking_cisco._i18n import _
+
 from neutronclient.common import extension
-from neutronclient.i18n import _
 
 
 class NetworkProfile(extension.NeutronClientExtension):

networking_cisco/neutronclient/routerscheduler.py

@@ -16,8 +16,9 @@
 
 from __future__ import print_function
 
+from networking_cisco._i18n import _
+
 from neutronclient.common import extension
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 from neutronclient.neutron.v2_0 import router
 

networking_cisco/neutronclient/routertype.py

@@ -18,8 +18,9 @@ from __future__ import print_function
 
 import argparse
 
+from networking_cisco._i18n import _
+
 from neutronclient.common import extension
-from neutronclient.i18n import _
 from neutronclient.neutron import v2_0 as neutronV20
 
 

networking_cisco/plugins/cisco/cfg_agent/cfg_agent.py

@@ -28,6 +28,11 @@ from oslo_service import periodic_task
 from oslo_service import service
 from oslo_utils import importutils
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.agent.common import config
 from neutron.agent.linux import external_process
 from neutron.agent.linux import interface
@@ -37,7 +42,6 @@ from neutron.common import constants
 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
 from neutron import service as neutron_service
 

networking_cisco/plugins/cisco/cfg_agent/cfg_exceptions.py

@@ -14,6 +14,8 @@
 
 """Exceptions by Cisco Configuration Agent."""
 
+from networking_cisco._i18n import _
+
 from neutron.common import exceptions
 
 

networking_cisco/plugins/cisco/cfg_agent/device_drivers/asr1k/asr1k_cfg_syncer.py

@@ -22,7 +22,8 @@ from oslo_log import log as logging
 from oslo_utils import importutils
 
 from neutron.common import constants
-from neutron.i18n import _LI
+
+from networking_cisco._i18n import _LI
 
 # from networking_cisco.plugins.cisco.cfg_agent.device_drivers.csr1kv import (
 #    cisco_csr1kv_snippets as snippets)

networking_cisco/plugins/cisco/cfg_agent/device_drivers/asr1k/asr1k_routing_driver.py

@@ -17,9 +17,11 @@ import netaddr
 
 from oslo_config import cfg
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from neutron.common import constants
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_exceptions as cfg_exc
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers.asr1k import (

networking_cisco/plugins/cisco/cfg_agent/device_drivers/cisco_csr_rest_client.py

@@ -20,7 +20,8 @@ from oslo_serialization import jsonutils
 import requests
 from requests import exceptions as r_exc
 
-from neutron.i18n import _LE, _LW
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LW
 
 
 TIMEOUT = 20.0

networking_cisco/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_hotplug_routing_driver.py

@@ -26,7 +26,7 @@ from networking_cisco.plugins.cisco.cfg_agent.device_drivers.csr1kv.\
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers.csr1kv.\
     csr1kv_routing_driver import save_config
 
-from neutron.i18n import _LI
+from networking_cisco._i18n import _LI
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py

@@ -22,7 +22,9 @@ import xml.etree.ElementTree as ET
 from oslo_config import cfg
 from oslo_utils import importutils
 
-from neutron.i18n import _LE, _LI, _LW
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_exceptions as cfg_exc
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers import (

networking_cisco/plugins/cisco/cfg_agent/device_drivers/csr1kv/iosxe_routing_driver.py

@@ -22,7 +22,9 @@ import xml.etree.ElementTree as ET
 from oslo_config import cfg
 from oslo_utils import importutils
 
-from neutron.i18n import _LE, _LI, _LW
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_exceptions as cfg_exc
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers import (

networking_cisco/plugins/cisco/cfg_agent/device_drivers/driver_mgr.py

@@ -16,7 +16,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import importutils
 
-from neutron.i18n import _LE
+from networking_cisco._i18n import _LE
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_exceptions
 

networking_cisco/plugins/cisco/cfg_agent/device_status.py

@@ -18,8 +18,11 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import timeutils
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.agent.linux import utils as linux_utils
-from neutron.i18n import _LI, _LW
 import pprint
 
 

networking_cisco/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py

@@ -22,12 +22,16 @@ import oslo_messaging
 from oslo_utils import excutils
 import six
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.common import constants as l3_constants
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.common import utils as common_utils
 from neutron import context as n_context
-from neutron.i18n import _LE, _LI, _LW
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_exceptions
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers import driver_mgr

networking_cisco/plugins/cisco/cfg_agent/service_helpers/service_helper.py

@@ -17,6 +17,8 @@ import six
 
 from oslo_log import log as logging
 
+from networking_cisco._i18n import _
+
 from six.moves import queue as Queue
 
 LOG = logging.getLogger(__name__)

networking_cisco/plugins/cisco/common/utils.py

@@ -18,8 +18,11 @@ import time
 from oslo_log import log as logging
 from oslo_utils import importutils
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LW
+
 from neutron.common import exceptions as nexception
-from neutron.i18n import _LE, _LW
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/plugins/cisco/db/device_manager/hosting_device_manager_db.py

@@ -34,10 +34,14 @@ from sqlalchemy.orm import exc
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.common import exceptions as n_exc
 from neutron.common import utils
 from neutron import context as neutron_context
-from neutron.i18n import _LE, _LI, _LW
 from neutron import manager
 from neutron.plugins.common import constants as svc_constants
 

networking_cisco/plugins/cisco/db/l3/ha_db.py

@@ -24,6 +24,9 @@ from sqlalchemy.orm import exc
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LW
+
 from neutron.api.v2 import attributes as attrs
 from neutron.common import constants as l3_constants
 from neutron.common import exceptions as n_exc
@@ -32,7 +35,6 @@ from neutron.db import l3_db
 from neutron.db import model_base
 from neutron.db import models_v2
 from neutron.extensions import l3
-from neutron.i18n import _LW
 
 from networking_cisco.plugins.cisco.common import cisco_constants
 from networking_cisco.plugins.cisco.extensions import ha

networking_cisco/plugins/cisco/db/l3/l3_router_appliance_db.py

@@ -28,6 +28,10 @@ from sqlalchemy.orm import joinedload
 from sqlalchemy.sql import expression as expr
 from sqlalchemy.sql import false as sql_false
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from neutron.api.v2 import attributes
 from neutron.callbacks import events
 from neutron.callbacks import registry
@@ -42,7 +46,6 @@ from neutron.db import extraroute_db
 from neutron.db import l3_db
 from neutron.extensions import l3
 from neutron.extensions import providernet as pr_net
-from neutron.i18n import _LE, _LI
 from neutron import manager
 from neutron.plugins.common import constants as svc_constants
 

networking_cisco/plugins/cisco/db/l3/routertype_db.py

@@ -20,7 +20,7 @@ from oslo_utils import uuidutils
 from sqlalchemy import exc as sql_exc
 from sqlalchemy.orm import exc
 
-from neutron.i18n import _LE
+from networking_cisco._i18n import _LE
 
 from networking_cisco.plugins.cisco.db.l3 import l3_models
 import networking_cisco.plugins.cisco.extensions.routertype as routertype

networking_cisco/plugins/cisco/db/scheduler/cfg_agentschedulers_db.py

@@ -17,6 +17,8 @@ from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 
+from networking_cisco._i18n import _
+
 from neutron.db import agents_db
 from neutron.db import agentschedulers_db
 

networking_cisco/plugins/cisco/db/scheduler/l3_routertype_aware_schedulers_db.py

@@ -17,6 +17,8 @@ from oslo_log import log as logging
 from sqlalchemy import sql
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _
+
 from neutron.api.v2 import attributes
 from neutron.common import topics
 from neutron.db import agents_db

networking_cisco/plugins/cisco/device_manager/config.py

@@ -20,8 +20,10 @@ from oslo_utils import excutils
 from oslo_utils import uuidutils
 import six
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+
 from neutron.api.v2 import attributes
-from neutron.i18n import _LE
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/plugins/cisco/device_manager/hosting_device_drivers/csr1kv_hd_driver.py

@@ -16,7 +16,8 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 
-from neutron.i18n import _LE
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
 
 from networking_cisco.plugins.cisco.device_manager import (
     hosting_device_drivers)

networking_cisco/plugins/cisco/device_manager/plugging_drivers/hw_vlan_trunking_driver.py

@@ -15,9 +15,10 @@
 from oslo_log import log as logging
 from oslo_utils import excutils
 
+from networking_cisco._i18n import _LE
+
 from neutron.common import constants as l3_constants
 from neutron.extensions import providernet as pr_net
-from neutron.i18n import _LE
 from neutron import manager
 
 from networking_cisco.plugins.cisco.device_manager import config

networking_cisco/plugins/cisco/device_manager/plugging_drivers/n1kv_ml2_trunking_driver.py

@@ -19,12 +19,16 @@ from oslo_log import log as logging
 from sqlalchemy.orm import exc
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc
 from neutron import context as n_context
 from neutron.db import models_v2
 from neutron.extensions import providernet as pr_net
-from neutron.i18n import _LE, _LI, _LW
 from neutron import manager
 
 from networking_cisco.plugins.cisco.common import cisco_constants

networking_cisco/plugins/cisco/device_manager/plugging_drivers/vif_hotplug_plugging_driver.py

@@ -19,10 +19,13 @@ from novaclient import exceptions as nova_exc
 from oslo_log import log as logging
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LW
+
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc
 from neutron.db import models_v2
-from neutron.i18n import _LE, _LW
 from neutron import manager
 
 from networking_cisco.plugins.cisco.common import cisco_constants

networking_cisco/plugins/cisco/device_manager/scheduler/hosting_device_cfg_agent_scheduler.py

@@ -19,8 +19,9 @@ import random
 from oslo_log import log as logging
 from sqlalchemy.orm import exc
 
+from networking_cisco._i18n import _LW
+
 from neutron.db import agents_db
-from neutron.i18n import _LW
 
 from networking_cisco.plugins.cisco.common import (cisco_constants as
                                                    c_constants)

networking_cisco/plugins/cisco/device_manager/service_vm_lib.py

@@ -19,7 +19,10 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import uuidutils
 
-from neutron.i18n import _LE, _LI
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from neutron import manager
 
 from networking_cisco.plugins.cisco.common import (cisco_constants as

networking_cisco/plugins/cisco/extensions/ciscocfgagentscheduler.py

@@ -17,13 +17,15 @@ import abc
 from oslo_log import log as logging
 import webob.exc
 
+from networking_cisco._i18n import _
+from networking_cisco._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 import policy
 from neutron import wsgi

networking_cisco/plugins/cisco/extensions/ciscohostingdevicemanager.py

@@ -16,6 +16,8 @@ import abc
 
 import six
 
+from networking_cisco._i18n import _
+
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import resource_helper

networking_cisco/plugins/cisco/extensions/ha.py

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

networking_cisco/plugins/cisco/extensions/routertype.py

@@ -16,6 +16,8 @@ import abc
 
 from oslo_log import log as logging
 
+from networking_cisco._i18n import _
+
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import resource_helper

networking_cisco/plugins/cisco/extensions/routertypeawarescheduler.py

@@ -17,6 +17,9 @@ import abc
 from oslo_log import log as logging
 import webob.exc
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base
@@ -24,7 +27,6 @@ from neutron.api.v2 import resource
 from neutron.common import exceptions
 from neutron.common import rpc as n_rpc
 from neutron.extensions import l3
-from neutron.i18n import _LE
 from neutron import manager
 from neutron.plugins.common import constants as svc_constants
 from neutron import policy

networking_cisco/plugins/ml2/drivers/cisco/apic/apic_sync.py

@@ -16,9 +16,10 @@
 from oslo_log import log as logging
 from oslo_service import loopingcall
 
+from networking_cisco._i18n import _LW
+
 from neutron.common import constants as n_constants
 from neutron import context
-from neutron.i18n import _LW
 from neutron import manager
 from neutron.plugins.ml2 import db as l2_db
 from neutron.plugins.ml2 import driver_context

networking_cisco/plugins/ml2/drivers/cisco/apic/apic_topology.py

@@ -20,6 +20,9 @@ import eventlet
 
 eventlet.monkey_patch()
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from neutron.agent.common import config
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
@@ -27,7 +30,6 @@ from neutron.common import config as common_cfg
 from neutron.common import rpc
 from neutron.common import utils as neutron_utils
 from neutron.db import agents_db
-from neutron.i18n import _LE, _LI
 from neutron import manager
 from neutron.plugins.ml2.drivers import type_vlan  # noqa
 from neutron import service

networking_cisco/plugins/ml2/drivers/cisco/apic/config.py

@@ -15,6 +15,7 @@
 
 from oslo_config import cfg
 
+from networking_cisco._i18n import _
 
 # oslo_config limits ${var} expansion to global variables
 # That is why apic_system_id as a global variable

networking_cisco/plugins/ml2/drivers/cisco/n1kv/config.py

@@ -15,6 +15,8 @@
 
 from oslo_config import cfg
 
+from networking_cisco._i18n import _
+
 
 n1kv_opts = [
     cfg.ListOpt('n1kv_vsm_ips',

networking_cisco/plugins/ml2/drivers/cisco/n1kv/exceptions.py

@@ -15,6 +15,8 @@
 
 """Exceptions used by Cisco Nexus1000V ML2 mechanism driver."""
 
+from networking_cisco._i18n import _
+
 from neutron.common import exceptions
 
 

networking_cisco/plugins/ml2/drivers/cisco/n1kv/extensions/n1kv.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from networking_cisco._i18n import _
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import constants
 
 from neutron.api import extensions

networking_cisco/plugins/ml2/drivers/cisco/n1kv/mech_cisco_n1kv.py

@@ -23,6 +23,9 @@ from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import excutils
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
     constants as n1kv_const)
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
@@ -38,9 +41,6 @@ from neutron.common import constants as n_const
 from neutron.db import db_base_plugin_v2
 from neutron.extensions import portbindings
 from neutron.extensions import providernet
-from neutron.i18n import _LE
-from neutron.i18n import _LI
-from neutron.i18n import _LW
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2.common import exceptions as ml2_exc
 from neutron.plugins.ml2 import driver_api as api

networking_cisco/plugins/ml2/drivers/cisco/n1kv/n1kv_client.py

@@ -30,10 +30,12 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
     exceptions as n1kv_exc)
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import config  # noqa
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+
 from neutron.common import exceptions as n_exc
 from neutron.extensions import providernet
-from neutron.i18n import _LE
-from neutron.i18n import _LI
 from neutron.plugins.common import constants as p_const
 
 LOG = logging.getLogger(__name__)

networking_cisco/plugins/ml2/drivers/cisco/n1kv/n1kv_ext_driver.py

@@ -19,6 +19,7 @@ from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import uuidutils
 
+from networking_cisco._i18n import _LE
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
     constants)
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
@@ -31,7 +32,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
 from neutron.api import extensions as api_extensions
 from neutron.api.v2 import attributes
 from neutron.extensions import providernet
-from neutron.i18n import _LE
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2.common import exceptions as ml2_exc
 from neutron.plugins.ml2 import driver_api as api

networking_cisco/plugins/ml2/drivers/cisco/n1kv/n1kv_sync.py

@@ -24,6 +24,9 @@ import six
 from oslo_config import cfg
 from oslo_log import log
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LW
+
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
     constants as n1kv_const)
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
@@ -34,8 +37,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv import n1kv_db
 
 import neutron.db.api as db
 from neutron.extensions import providernet
-from neutron.i18n import _LE
-from neutron.i18n import _LW
 from neutron.plugins.common import constants as p_const
 
 LOG = log.getLogger(__name__)

networking_cisco/plugins/ml2/drivers/cisco/n1kv/network_profile_service.py

@@ -19,12 +19,13 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from sqlalchemy.orm import exc
 
+from networking_cisco._i18n import _LE
+
 from neutron.api import extensions as api_extensions
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc
 import neutron.db.api as db
 from neutron.db import common_db_mixin as base_db
-from neutron.i18n import _LE
 from neutron.plugins.common import constants as p_const
 
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (

networking_cisco/plugins/ml2/drivers/cisco/n1kv/policy_profile_service.py

@@ -18,6 +18,8 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 
+from networking_cisco._i18n import _LW
+
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
     constants as n1kv_const)
 from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
@@ -37,7 +39,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv.extensions import (
 from neutron.api import extensions as api_extensions
 import neutron.db.api as db
 from neutron.db import common_db_mixin as base_db
-from neutron.i18n import _LW
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/plugins/ml2/drivers/cisco/ncs/driver.py

@@ -21,6 +21,8 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import requests
 
+from networking_cisco._i18n import _
+
 from neutron.plugins.ml2 import driver_api as api
 
 LOG = logging.getLogger(__name__)

networking_cisco/plugins/ml2/drivers/cisco/nexus/config.py

@@ -15,6 +15,7 @@
 
 from oslo_config import cfg
 
+from networking_cisco._i18n import _
 
 ml2_cisco_opts = [
     cfg.StrOpt('vlan_name_prefix', default='q-',

networking_cisco/plugins/ml2/drivers/cisco/nexus/exceptions.py

@@ -15,6 +15,8 @@
 
 """Exceptions used by Cisco Nexus ML2 mechanism driver."""
 
+from networking_cisco._i18n import _
+
 from neutron.common import exceptions
 
 

networking_cisco/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py

@@ -27,6 +27,9 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
 from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
     config as conf)
 from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
@@ -41,7 +44,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
 from neutron.common import constants as n_const
 from neutron.db import api as db_api
 from neutron.extensions import portbindings
-from neutron.i18n import _LW, _LE, _LI
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2 import db as ml2_db
 from neutron.plugins.ml2 import driver_api as api

networking_cisco/plugins/ml2/drivers/cisco/nexus/nexus_db_v2.py

@@ -17,8 +17,9 @@
 from oslo_log import log as logging
 import sqlalchemy.orm.exc as sa_exc
 
+from networking_cisco._i18n import _LW
+
 import neutron.db.api as db
-from neutron.i18n import _LW
 
 from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
     exceptions as c_exc)

networking_cisco/plugins/ml2/drivers/cisco/nexus/nexus_network_driver.py

@@ -25,7 +25,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 
-from neutron.i18n import _LW
+from networking_cisco._i18n import _LW
 
 from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
     config as conf)

networking_cisco/plugins/ml2/drivers/cisco/nexus/type_nexus_vxlan.py

@@ -27,9 +27,13 @@ from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
 from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
     nexus_models_v2)
 
+from networking_cisco._i18n import _
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.common import exceptions as exc
 from neutron.db import api as db_api
-from neutron.i18n import _LE, _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 type_tunnel

networking_cisco/plugins/ml2/drivers/cisco/ucsm/config.py

@@ -18,6 +18,8 @@ import debtcollector
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from networking_cisco._i18n import _
+
 from networking_cisco.plugins.ml2.drivers.cisco.ucsm import constants as const
 
 LOG = logging.getLogger(__name__)

networking_cisco/plugins/ml2/drivers/cisco/ucsm/exceptions.py

@@ -15,6 +15,8 @@
 
 """Exceptions used by Cisco UCSM ML2 mechanism driver."""
 
+from networking_cisco._i18n import _
+
 from neutron.common import exceptions
 
 

networking_cisco/plugins/ml2/drivers/cisco/ucsm/mech_cisco_ucsm.py

@@ -19,9 +19,12 @@ from networking_cisco.plugins.ml2.drivers.cisco.ucsm import ucsm_network_driver
 
 from oslo_log import log as logging
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.common import constants
 from neutron.extensions import portbindings
-from neutron.i18n import _LE, _LI, _LW
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2 import driver_api as api
 

networking_cisco/plugins/ml2/drivers/cisco/ucsm/ucsm_network_driver.py

@@ -19,7 +19,11 @@ from contextlib import contextmanager
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
-from neutron.i18n import _LE, _LI, _LW
+
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+
 from neutron.extensions import portbindings
 
 from networking_cisco.plugins.ml2.drivers.cisco.ucsm import config as config

networking_cisco/services/l3_router/l3_apic.py

@@ -16,6 +16,8 @@
 from apicapi import apic_mapper
 from oslo_utils import excutils
 
+from networking_cisco._i18n import _
+
 from neutron.db import db_base_plugin_v2
 from neutron.db import extraroute_db
 from neutron.db import l3_dvr_db

networking_cisco/tests/unit/cisco/device_manager/device_manager_test_support.py

@@ -24,6 +24,7 @@ from oslo_utils import importutils
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 
+from networking_cisco._i18n import _LE
 import networking_cisco.plugins
 from networking_cisco.plugins.cisco.common import cisco_constants
 from networking_cisco.plugins.cisco.db.device_manager import (
@@ -44,7 +45,6 @@ from neutron.common import test_lib
 from neutron import context as n_context
 from neutron.db import agents_db
 from neutron.extensions import agent
-from neutron.i18n import _LE
 from neutron import manager
 from neutron.tests.unit.extensions import test_l3
 

networking_cisco/tests/unit/cisco/device_manager/plugging_test_driver.py

@@ -17,12 +17,15 @@ import eventlet
 from oslo_log import log as logging
 from sqlalchemy.sql import expression as expr
 
+from networking_cisco._i18n import _LE
+from networking_cisco._i18n import _LI
+from networking_cisco._i18n import _LW
+from networking_cisco.plugins.cisco.device_manager.plugging_drivers import (
+    n1kv_ml2_trunking_driver)
+
 from neutron.api.v2 import attributes
 from neutron.common import exceptions as n_exc
 from neutron.db import models_v2
-from neutron.i18n import _LE, _LI, _LW
-from networking_cisco.plugins.cisco.device_manager.plugging_drivers import (
-    n1kv_ml2_trunking_driver)
 
 LOG = logging.getLogger(__name__)
 

networking_cisco/tests/unit/cisco/l3/test_l3_router_appliance_plugin.py

@@ -19,6 +19,8 @@ from oslo_config import cfg
 from oslo_log import log as logging
 import six
 
+from networking_cisco._i18n import _
+
 from neutron.api.v2 import attributes
 from neutron import context as q_context
 from neutron.db import agents_db