openstack
/
deb-networking-cisco
Code Issues Proposed changes

Change import exclusions in tox.ini and update imports 

Now that olso is being used for i18n, the import exclusion
should be networking_cisco._i18n. Updated (hopefully all)
the existing imports, to use a single line for i18n wrappers.

Cherry-picking commit 4c637f5 from master. Had conflicts:
    networking_cisco/apps/saf/server/dfa_server.py
    networking_cisco/plugins/ml2/drivers/cisco/n1kv/mech_cisco_n1kv.py
    networking_cisco/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py
    networking_cisco/tests/unit/cisco/device_manager/plugging_test_driver.py

Resolved them to be identical to master branch changes.

Change-Id: Ifb0f696b912e32af9736e33589d2c5ad80392cc9
This commit is contained in:
Paul Michali 2016-02-01 16:43:23 +00:00
parent 7222234613
commit 5723c9fc40
39 changed files with 60 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
networking_cisco/apps/saf/agent/dfa_agent.py
View File

@ -24,8 +24,7 @@ import eventlet
eventlet.monkey_patch()
from oslo_serialization import jsonutils
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LE, _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

3
networking_cisco/apps/saf/agent/iptables_driver.py
View File

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

3
networking_cisco/apps/saf/agent/vdp/dfa_vdp_mgr.py
View File

@ -20,8 +20,7 @@ import time
from oslo_serialization import jsonutils
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LE, _LI
from networking_cisco.apps.saf.agent import detect_uplink as uplink_det
from networking_cisco.apps.saf.agent.vdp import ovs_vdp

3
networking_cisco/apps/saf/agent/vdp/ovs_vdp.py
View File

@ -19,8 +19,7 @@
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._i18n import _LE, _LI
from networking_cisco.apps.saf.agent.vdp import lldpad
from networking_cisco.apps.saf.agent.vdp import vdp_constants as constants

4
networking_cisco/apps/saf/common/dfa_sys_lib.py
View File

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

3
networking_cisco/apps/saf/db/dfa_db_models.py
View File

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

3
networking_cisco/apps/saf/server/cisco_dfa_rest.py
View File

@ -22,8 +22,7 @@ import requests
from oslo_serialization import jsonutils
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LE, _LI
from networking_cisco.apps.saf.common import dfa_exceptions as dexc
from networking_cisco.apps.saf.common import dfa_logger as logging

3
networking_cisco/apps/saf/server/dfa_fail_recovery.py
View File

@ -16,8 +16,7 @@
import time
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LE, _LI
from networking_cisco.apps.saf.common import constants
from networking_cisco.apps.saf.common import dfa_exceptions as dexc

3
networking_cisco/apps/saf/server/dfa_instance_api.py
View File

@ -24,8 +24,7 @@ from keystoneclient.v2_0 import client as keyc
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._i18n import _LE, _LI
from networking_cisco.apps.saf.common import config
from networking_cisco.apps.saf.common import dfa_logger as logging

3
networking_cisco/apps/saf/server/dfa_listen_dcnm.py
View File

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

5
networking_cisco/apps/saf/server/dfa_server.py
View File

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

5
networking_cisco/plugins/cisco/cfg_agent/cfg_agent.py
View File

@ -28,10 +28,7 @@ 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 networking_cisco._i18n import _, _LE, _LI, _LW
from neutron.agent.common import config
from neutron.agent.linux import external_process

4
networking_cisco/plugins/cisco/cfg_agent/device_drivers/asr1k/asr1k_routing_driver.py
View File

@ -17,9 +17,7 @@ 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 networking_cisco._i18n import _, _LE, _LI
from neutron.common import constants

3
networking_cisco/plugins/cisco/cfg_agent/device_drivers/cisco_csr_rest_client.py
View File

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

4
networking_cisco/plugins/cisco/cfg_agent/device_drivers/csr1kv/csr1kv_routing_driver.py
View File

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

4
networking_cisco/plugins/cisco/cfg_agent/device_drivers/csr1kv/iosxe_routing_driver.py
View File

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

4
networking_cisco/plugins/cisco/cfg_agent/device_status.py
View File

@ -18,9 +18,7 @@ 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 networking_cisco._i18n import _, _LI, _LW
from neutron.agent.linux import utils as linux_utils
import pprint

5
networking_cisco/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py
View File

@ -22,10 +22,7 @@ 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 networking_cisco._i18n import _, _LE, _LI, _LW
from neutron.common import constants as l3_constants
from neutron.common import rpc as n_rpc

4
networking_cisco/plugins/cisco/common/utils.py
View File

@ -18,9 +18,7 @@ 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 networking_cisco._i18n import _, _LE, _LW
from neutron.common import exceptions as nexception

5
networking_cisco/plugins/cisco/db/device_manager/hosting_device_manager_db.py
View File

@ -34,10 +34,7 @@ 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 networking_cisco._i18n import _, _LE, _LI, _LW
from neutron.common import exceptions as n_exc
from neutron.common import utils

3
networking_cisco/plugins/cisco/db/l3/ha_db.py
View File

@ -24,8 +24,7 @@ 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 networking_cisco._i18n import _, _LW
from neutron.api.v2 import attributes as attrs
from neutron.common import constants as l3_constants

4
networking_cisco/plugins/cisco/db/l3/l3_router_appliance_db.py
View File

@ -28,9 +28,7 @@ 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 networking_cisco._i18n import _, _LE, _LI
from neutron.api.v2 import attributes
from neutron.callbacks import events

3
networking_cisco/plugins/cisco/device_manager/config.py
View File

@ -20,8 +20,7 @@ from oslo_utils import excutils
from oslo_utils import uuidutils
import six
from networking_cisco._i18n import _
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _, _LE
from neutron.api.v2 import attributes

3
networking_cisco/plugins/cisco/device_manager/hosting_device_drivers/csr1kv_hd_driver.py
View File

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

5
networking_cisco/plugins/cisco/device_manager/plugging_drivers/n1kv_ml2_trunking_driver.py
View File

@ -19,10 +19,7 @@ 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 networking_cisco._i18n import _, _LE, _LI, _LW
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc

4
networking_cisco/plugins/cisco/device_manager/plugging_drivers/vif_hotplug_plugging_driver.py
View File

@ -19,9 +19,7 @@ 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 networking_cisco._i18n import _, _LE, _LW
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc

4
networking_cisco/plugins/cisco/device_manager/service_vm_lib.py
View File

@ -19,9 +19,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import uuidutils
from networking_cisco._i18n import _
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _, _LE, _LI
from neutron import manager

3
networking_cisco/plugins/cisco/extensions/ciscocfgagentscheduler.py
View File

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

3
networking_cisco/plugins/cisco/extensions/routertypeawarescheduler.py
View File

@ -17,8 +17,7 @@ import abc
from oslo_log import log as logging
import webob.exc
from networking_cisco._i18n import _
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _, _LE
from neutron.api import extensions
from neutron.api.v2 import attributes as attr

3
networking_cisco/plugins/ml2/drivers/cisco/apic/apic_topology.py
View File

@ -20,8 +20,7 @@ import eventlet
eventlet.monkey_patch()
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LE, _LI
from neutron.agent.common import config
from neutron.agent.linux import ip_lib

21
networking_cisco/plugins/ml2/drivers/cisco/n1kv/mech_cisco_n1kv.py
View File

@ -23,9 +23,16 @@ 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._i18n import _LE, _LI, _LW
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.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
from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
constants as n1kv_const)
from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
@ -37,14 +44,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
n1kv_sync)
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.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
LOG = log.getLogger(__name__)
cfg.CONF.import_group(

4
networking_cisco/plugins/ml2/drivers/cisco/n1kv/n1kv_client.py
View File

@ -30,9 +30,7 @@ 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 networking_cisco._i18n import _, _LE, _LI
from neutron.common import exceptions as n_exc
from neutron.extensions import providernet

3
networking_cisco/plugins/ml2/drivers/cisco/n1kv/n1kv_sync.py
View File

@ -24,8 +24,7 @@ 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._i18n import _LE, _LW
from networking_cisco.plugins.ml2.drivers.cisco.n1kv import (
constants as n1kv_const)

19
networking_cisco/plugins/ml2/drivers/cisco/nexus/mech_cisco_nexus.py
View File

@ -27,9 +27,15 @@ 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._i18n import _LE, _LI, _LW
from neutron.common import constants as n_const
from neutron.db import api as db_api
from neutron.extensions import portbindings
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
from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
config as conf)
from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
@ -41,13 +47,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
from networking_cisco.plugins.ml2.drivers.cisco.nexus import (
nexus_network_driver)
from neutron.common import constants as n_const
from neutron.db import api as db_api
from neutron.extensions import portbindings
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
LOG = logging.getLogger(__name__)
HOST_NOT_FOUND = _LW("Host %s not defined in switch configuration section.")

5
networking_cisco/plugins/ml2/drivers/cisco/nexus/type_nexus_vxlan.py
View File

@ -27,10 +27,7 @@ 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 networking_cisco._i18n import _, _LE, _LI, _LW
from neutron.common import exceptions as exc
from neutron.db import api as db_api

4
networking_cisco/plugins/ml2/drivers/cisco/ucsm/mech_cisco_ucsm.py
View File

@ -19,9 +19,7 @@ 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 networking_cisco._i18n import _LE, _LI, _LW
from neutron.common import constants
from neutron.extensions import portbindings

4
networking_cisco/plugins/ml2/drivers/cisco/ucsm/ucsm_network_driver.py
View File

@ -20,9 +20,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils
from networking_cisco._i18n import _LE
from networking_cisco._i18n import _LI
from networking_cisco._i18n import _LW
from networking_cisco._i18n import _LE, _LI, _LW
from neutron.extensions import portbindings

9
networking_cisco/tests/unit/cisco/device_manager/plugging_test_driver.py
View File

@ -17,16 +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 networking_cisco._i18n import _LE, _LI, _LW
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc
from neutron.db import models_v2
from networking_cisco.plugins.cisco.device_manager.plugging_drivers import (
n1kv_ml2_trunking_driver)
LOG = logging.getLogger(__name__)

2
tox.ini
View File

@ -67,5 +67,5 @@ commands =
pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron}
[hacking]
import_exceptions = neutron.i18n
import_exceptions = networking_cisco._i18n
local-check-factory = neutron.hacking.checks.factory