diff --git a/neutron_dynamic_routing/services/bgp/agent/bgp_dragent.py b/neutron_dynamic_routing/services/bgp/agent/bgp_dragent.py
index ebf2146c..ed8995b8 100644
--- a/neutron_dynamic_routing/services/bgp/agent/bgp_dragent.py
+++ b/neutron_dynamic_routing/services/bgp/agent/bgp_dragent.py
@@ -15,6 +15,7 @@
 
 import collections
 
+from neutron_lib import context
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging
@@ -27,7 +28,6 @@ from neutron.common import constants as n_const
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.common import utils
-from neutron import context
 from neutron import manager
 
 from neutron_dynamic_routing.extensions import bgp as bgp_ext
diff --git a/neutron_dynamic_routing/services/bgp/bgp_plugin.py b/neutron_dynamic_routing/services/bgp/bgp_plugin.py
index e4436ebe..6b36e774 100644
--- a/neutron_dynamic_routing/services/bgp/bgp_plugin.py
+++ b/neutron_dynamic_routing/services/bgp/bgp_plugin.py
@@ -15,6 +15,7 @@
 from netaddr import IPAddress
 
 from neutron_lib import constants as n_const
+from neutron_lib import context
 from neutron_lib.services import base as service_base
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -24,7 +25,6 @@ from neutron.callbacks import events
 from neutron.callbacks import registry
 from neutron.callbacks import resources
 from neutron.common import rpc as n_rpc
-from neutron import context
 
 from neutron_dynamic_routing.api.rpc.agentnotifiers import bgp_dr_rpc_agent_api  # noqa
 from neutron_dynamic_routing.api.rpc.handlers import bgp_speaker_rpc as bs_rpc
diff --git a/neutron_dynamic_routing/tests/common/helpers.py b/neutron_dynamic_routing/tests/common/helpers.py
index 1a8c9908..c88bb93b 100644
--- a/neutron_dynamic_routing/tests/common/helpers.py
+++ b/neutron_dynamic_routing/tests/common/helpers.py
@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron import context
+from neutron_lib import context
+
 from neutron.tests.common import helpers
 
 from neutron_dynamic_routing.services.bgp.common import constants as bgp_const
diff --git a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
index 81f84e9e..8daa2f5a 100644
--- a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
+++ b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron_lib import context
 import testscenarios
 
-from neutron import context
 from neutron.db import agents_db
 from neutron.db import common_db_mixin
 from neutron.tests.unit import testlib_api
diff --git a/neutron_dynamic_routing/tests/unit/api/rpc/agentnotifiers/test_bgp_dr_rpc_agent_api.py b/neutron_dynamic_routing/tests/unit/api/rpc/agentnotifiers/test_bgp_dr_rpc_agent_api.py
index af93d964..367e10b7 100644
--- a/neutron_dynamic_routing/tests/unit/api/rpc/agentnotifiers/test_bgp_dr_rpc_agent_api.py
+++ b/neutron_dynamic_routing/tests/unit/api/rpc/agentnotifiers/test_bgp_dr_rpc_agent_api.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import mock
+from neutron_lib import context
 
-from neutron import context
 from neutron.tests import base
 
 from neutron_dynamic_routing.api.rpc.agentnotifiers import bgp_dr_rpc_agent_api
diff --git a/neutron_dynamic_routing/tests/unit/db/test_bgp_dragentscheduler_db.py b/neutron_dynamic_routing/tests/unit/db/test_bgp_dragentscheduler_db.py
index ff58d66b..4bb2da52 100644
--- a/neutron_dynamic_routing/tests/unit/db/test_bgp_dragentscheduler_db.py
+++ b/neutron_dynamic_routing/tests/unit/db/test_bgp_dragentscheduler_db.py
@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from neutron_lib import context
 from neutron_lib.plugins import directory
 from oslo_config import cfg
 from oslo_utils import importutils
 
 from neutron.api.v2 import attributes
-from neutron import context
 from neutron.extensions import agent
 from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_base_plugin
 from neutron.tests.unit.extensions import test_agent
diff --git a/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py b/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
index 8efbfe0b..a68c4982 100644
--- a/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
+++ b/neutron_dynamic_routing/tests/unit/services/bgp/agent/test_bgp_dragent.py
@@ -18,13 +18,13 @@ import sys
 
 import eventlet
 import mock
+from neutron_lib import context
 from oslo_config import cfg
 from oslo_utils import uuidutils
 import testtools
 
 from neutron.agent.common import config
 from neutron.common import config as n_config
-from neutron import context
 from neutron.tests import base
 
 from neutron_dynamic_routing.services.bgp.agent import bgp_dragent
diff --git a/neutron_dynamic_routing/tests/unit/services/bgp/scheduler/test_bgp_dragent_scheduler.py b/neutron_dynamic_routing/tests/unit/services/bgp/scheduler/test_bgp_dragent_scheduler.py
index a8a6a10b..e80eeb65 100644
--- a/neutron_dynamic_routing/tests/unit/services/bgp/scheduler/test_bgp_dragent_scheduler.py
+++ b/neutron_dynamic_routing/tests/unit/services/bgp/scheduler/test_bgp_dragent_scheduler.py
@@ -15,9 +15,9 @@
 
 import testscenarios
 
+from neutron_lib import context
 from oslo_utils import importutils
 
-from neutron import context
 from neutron.tests.unit import testlib_api
 
 from neutron_dynamic_routing.db import bgp_db