From 51251b54a71cdd445a471a1e4e8d35b7a21283a9 Mon Sep 17 00:00:00 2001 From: Boden R Date: Wed, 26 Sep 2018 10:02:21 -0600 Subject: [PATCH] use common rpc and exceptions from neutron-lib The neutron.common.rpc and exceptions were rehomed into neutron-lib and are currently shimmed in neutron [1] This patch consumes those modules from neutron-lib by using lib's modules rather than neutrons. [1] https://review.openstack.org/#/c/586525/ Change-Id: Ic6849eb2282ed39193a46421a6079d3dcb918442 --- neutron_lbaas/agent/agent.py | 2 +- neutron_lbaas/agent/agent_api.py | 2 +- neutron_lbaas/drivers/common/agent_driver_base.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron_lbaas/agent/agent.py b/neutron_lbaas/agent/agent.py index aa8fdfe6f..572f36626 100644 --- a/neutron_lbaas/agent/agent.py +++ b/neutron_lbaas/agent/agent.py @@ -16,8 +16,8 @@ import sys from neutron.common import config as common_config -from neutron.common import rpc as n_rpc from neutron.conf.agent import common as config +from neutron_lib import rpc as n_rpc from oslo_config import cfg from oslo_log import log as logging from oslo_service import service diff --git a/neutron_lbaas/agent/agent_api.py b/neutron_lbaas/agent/agent_api.py index 6c41880b4..462394c66 100644 --- a/neutron_lbaas/agent/agent_api.py +++ b/neutron_lbaas/agent/agent_api.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.common import rpc as n_rpc +from neutron_lib import rpc as n_rpc import oslo_messaging diff --git a/neutron_lbaas/drivers/common/agent_driver_base.py b/neutron_lbaas/drivers/common/agent_driver_base.py index bdfc6c674..94fc7d9a1 100644 --- a/neutron_lbaas/drivers/common/agent_driver_base.py +++ b/neutron_lbaas/drivers/common/agent_driver_base.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.common import rpc as n_rpc from neutron.db import agents_db from neutron.db import common_db_mixin from neutron.services import provider_configuration as provconf from neutron_lib import exceptions as n_exc +from neutron_lib import rpc as n_rpc from oslo_config import cfg import oslo_messaging as messaging from oslo_utils import importutils