Fix import pathnames, based on new path at networking_brocade

Fixes bug: #1423387

Change-Id: Id92afeb2032efa33401955992ac41cc3ffe80457

networking_brocade/vdx/ml2driver/mechanism_brocade.py

@@ -21,8 +21,8 @@ from neutron.i18n import _LI
 from neutron.openstack.common import log as logging
 from neutron.plugins.ml2 import driver_api
 from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 
 LOG = logging.getLogger(__name__)
 MECHANISM_VERSION = 0.9

networking_brocade/vdx/ml2driver/nos/nosdriver.py

@@ -19,7 +19,7 @@ Neutron network life-cycle management.
 """
 
 from ncclient import manager
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from xml.etree import ElementTree
 

networking_brocade/vdx/services/l3_router/l3_router_plugin.py

@@ -26,8 +26,8 @@ from neutron.plugins.ml2 import db
 from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
 from neutron.plugins.ml2.drivers.brocade.nos import nosdriver as driver
 from neutron.services.l3_router import l3_router_plugin as router
-from oslo.config import cfg
-from oslo.utils import excutils
+from oslo_config import cfg
+from oslo_utils import excutils
 
 
 DEVICE_OWNER_ROUTER_INTF = l3_constants.DEVICE_OWNER_ROUTER_INTF

networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py

@@ -17,11 +17,12 @@
 
 import mock
 from neutron.db import api as db
+from neutron.i18n import _LI
 from neutron.openstack.common import log as logging
 from neutron.tests.unit import test_l3_plugin
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
 from oslo_context import context as oslo_context
+from oslo_utils import importutils
 
 LOG = logging.getLogger(__name__)
 L3_SVC_PLUGIN = ('neutron.services.l3_router.'
@@ -40,7 +41,7 @@ class BrocadeSVIPlugin_TestCases(test_l3_plugin.TestL3NatBasePlugin):
                             'password': cfg.CONF.ml2_brocade.password,
                             'rbridge_id': cfg.CONF.ml2_brocade.rbridge_id
                             }
-            LOG.info(_("rbridge id %s"), self._switch['rbridge_id'])
+            LOG.info(_LI("rbridge id %s"), self._switch['rbridge_id'])
             self._driver = mock.MagicMock()
 
         self.l3_plugin = importutils.import_object(L3_SVC_PLUGIN)

networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py

@@ -14,16 +14,16 @@
 # limitations under the License.
 
 import mock
+from networking_brocade.vdx.ml2driver import (
+    mechanism_brocade as brocademechanism)
 from neutron.openstack.common import log as logging
 from neutron.plugins.ml2 import config as ml2_config
 from neutron.tests.unit.ml2 import test_ml2_plugin
-from oslo.utils import importutils
-from vendor.brocade.networking_brocade.vdx.ml2driver import (
-    mechanism_brocade as brocademechanism)
+from oslo_utils import importutils
 
 LOG = logging.getLogger(__name__)
 
-MECHANISM_NAME = ('vendor.brocade.networking_brocade.'
+MECHANISM_NAME = ('networking_brocade.'
                   'vdx.ml2driver.mechanism_brocade.BrocadeMechanism')
 
 

tox.ini

@@ -8,7 +8,8 @@ usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
-deps = -r{toxinidir}/requirements.txt
+deps = -egit+https://git.openstack.org/openstack/neutron#egg=neutron
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
@@ -35,3 +36,4 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
 [hacking]
 import_exceptions = neutron.i18n
+local-check-factory = neutron.hacking.checks.factory