diff --git a/networking_l2gw/services/l2gateway/agent/base_agent_manager.py b/networking_l2gw/services/l2gateway/agent/base_agent_manager.py index d6560e5..cdfe496 100644 --- a/networking_l2gw/services/l2gateway/agent/base_agent_manager.py +++ b/networking_l2gw/services/l2gateway/agent/base_agent_manager.py @@ -14,7 +14,7 @@ # under the License. from neutron.agent import rpc as agent_rpc -from neutron import context +from neutron_lib import context from oslo_config import cfg from oslo_log import log as logging diff --git a/networking_l2gw/services/l2gateway/agent/ovsdb/manager.py b/networking_l2gw/services/l2gateway/agent/ovsdb/manager.py index e7d0a9f..b5ed141 100644 --- a/networking_l2gw/services/l2gateway/agent/ovsdb/manager.py +++ b/networking_l2gw/services/l2gateway/agent/ovsdb/manager.py @@ -18,7 +18,7 @@ import os.path import eventlet from contextlib import contextmanager -from neutron import context as ctx +from neutron_lib import context as ctx from oslo_config import cfg from oslo_log import log as logging diff --git a/networking_l2gw/services/l2gateway/agent/ovsdb/ovsdb_monitor.py b/networking_l2gw/services/l2gateway/agent/ovsdb/ovsdb_monitor.py index cd91a64..f98c91d 100644 --- a/networking_l2gw/services/l2gateway/agent/ovsdb/ovsdb_monitor.py +++ b/networking_l2gw/services/l2gateway/agent/ovsdb/ovsdb_monitor.py @@ -30,7 +30,7 @@ from networking_l2gw.services.l2gateway import exceptions LOG = logging.getLogger(__name__) -class Activity: +class Activity(object): Initial, Update = range(2) diff --git a/networking_l2gw/services/l2gateway/agent_scheduler.py b/networking_l2gw/services/l2gateway/agent_scheduler.py index 7ff3a3f..68ce793 100644 --- a/networking_l2gw/services/l2gateway/agent_scheduler.py +++ b/networking_l2gw/services/l2gateway/agent_scheduler.py @@ -20,8 +20,8 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_service import loopingcall -from neutron import context as neutron_context from neutron.db import agents_db +from neutron_lib import context as neutron_context from networking_l2gw._i18n import _LE from networking_l2gw.services.l2gateway.common import config diff --git a/networking_l2gw/tests/unit/db/ovsdb/test_idl_impl.py b/networking_l2gw/tests/unit/db/ovsdb/test_idl_impl.py index fbfc884..6520cbe 100644 --- a/networking_l2gw/tests/unit/db/ovsdb/test_idl_impl.py +++ b/networking_l2gw/tests/unit/db/ovsdb/test_idl_impl.py @@ -24,7 +24,7 @@ from neutron.tests import base from networking_l2gw.services.l2gateway.agent.ovsdb import impl_idl -class Msg: +class Msg(object): id = 0 type = 1 method = 'update' diff --git a/networking_l2gw/tests/unit/db/ovsdb/test_lib.py b/networking_l2gw/tests/unit/db/ovsdb/test_lib.py index 70e9184..7710b25 100644 --- a/networking_l2gw/tests/unit/db/ovsdb/test_lib.py +++ b/networking_l2gw/tests/unit/db/ovsdb/test_lib.py @@ -17,8 +17,8 @@ from oslo_db import exception as d_exc from oslo_utils import timeutils from oslo_utils import uuidutils -from neutron import context from neutron.tests.unit import testlib_api +from neutron_lib import context from networking_l2gw.db.l2gateway.ovsdb import lib from networking_l2gw.db.l2gateway.ovsdb import models diff --git a/networking_l2gw/tests/unit/db/test_l2gw_db.py b/networking_l2gw/tests/unit/db/test_l2gw_db.py index bb4ef89..386b4f0 100644 --- a/networking_l2gw/tests/unit/db/test_l2gw_db.py +++ b/networking_l2gw/tests/unit/db/test_l2gw_db.py @@ -17,8 +17,8 @@ import mock from neutron.callbacks import events from neutron.callbacks import resources -from neutron import context from neutron.tests.unit import testlib_api +from neutron_lib import context from networking_l2gw.db.l2gateway import l2gateway_db from networking_l2gw.services.l2gateway.common import constants diff --git a/networking_l2gw/tests/unit/services/l2gateway/agent/ovsdb/test_manager.py b/networking_l2gw/tests/unit/services/l2gateway/agent/ovsdb/test_manager.py index 68041c5..e056616 100644 --- a/networking_l2gw/tests/unit/services/l2gateway/agent/ovsdb/test_manager.py +++ b/networking_l2gw/tests/unit/services/l2gateway/agent/ovsdb/test_manager.py @@ -22,8 +22,8 @@ import mock from neutron.agent.common import config as agent_config from neutron.agent import rpc as agent_rpc from neutron.common import rpc -from neutron import context from neutron.tests import base +from neutron_lib import context from oslo_config import cfg from oslo_service import loopingcall diff --git a/networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py b/networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py index 50627cd..23e85d0 100644 --- a/networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py +++ b/networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py @@ -15,11 +15,11 @@ import mock -from neutron import context from neutron import manager from neutron.plugins.ml2 import managers from neutron.tests import base +from neutron_lib import context from neutron_lib.plugins import directory from networking_l2gw.db.l2gateway import l2gateway_db diff --git a/networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py b/networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py index 5d27b84..b656e6a 100644 --- a/networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py +++ b/networking_l2gw/tests/unit/services/l2gateway/service_drivers/test_rpc_l2gw.py @@ -15,9 +15,9 @@ import mock from neutron.common import rpc as n_rpc -from neutron import context as ctx from neutron.db import agents_db from neutron.tests.unit.plugins.ml2 import test_plugin +from neutron_lib import context as ctx from networking_l2gw.db.l2gateway.ovsdb import lib as db from networking_l2gw.services.l2gateway.common import l2gw_validators diff --git a/networking_l2gw/tests/unit/services/l2gateway/test_agent_scheduler.py b/networking_l2gw/tests/unit/services/l2gateway/test_agent_scheduler.py index 4dc3586..6cf9dec 100644 --- a/networking_l2gw/tests/unit/services/l2gateway/test_agent_scheduler.py +++ b/networking_l2gw/tests/unit/services/l2gateway/test_agent_scheduler.py @@ -23,11 +23,11 @@ from oslo_service import loopingcall from oslo_utils import timeutils from neutron.common import topics -from neutron import context as neutron_context from neutron.db import agents_db from neutron import manager from neutron.plugins.ml2 import rpc from neutron.tests import base +from neutron_lib import context as neutron_context from networking_l2gw.services.l2gateway import agent_scheduler from networking_l2gw.services.l2gateway.common import constants as srv_const diff --git a/requirements.txt b/requirements.txt index 9742433..05ebdb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.8 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 Babel>=2.3.4 # BSD -neutron-lib>=1.1.0 # Apache-2.0 +neutron-lib>=1.2.0 # Apache-2.0 python-neutronclient>=5.1.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 782bb21..566d844 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 8ee4c73..3790b3e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking<0.10,>=0.9.2 +hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 coverage>=4.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD