Browse Source

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
Boden R 6 months ago
parent
commit
51251b54a7

+ 1
- 1
neutron_lbaas/agent/agent.py View File

@@ -16,8 +16,8 @@
16 16
 import sys
17 17
 
18 18
 from neutron.common import config as common_config
19
-from neutron.common import rpc as n_rpc
20 19
 from neutron.conf.agent import common as config
20
+from neutron_lib import rpc as n_rpc
21 21
 from oslo_config import cfg
22 22
 from oslo_log import log as logging
23 23
 from oslo_service import service

+ 1
- 1
neutron_lbaas/agent/agent_api.py View File

@@ -13,7 +13,7 @@
13 13
 #    License for the specific language governing permissions and limitations
14 14
 #    under the License.
15 15
 
16
-from neutron.common import rpc as n_rpc
16
+from neutron_lib import rpc as n_rpc
17 17
 import oslo_messaging
18 18
 
19 19
 

+ 1
- 1
neutron_lbaas/drivers/common/agent_driver_base.py View File

@@ -12,11 +12,11 @@
12 12
 #    License for the specific language governing permissions and limitations
13 13
 #    under the License.
14 14
 
15
-from neutron.common import rpc as n_rpc
16 15
 from neutron.db import agents_db
17 16
 from neutron.db import common_db_mixin
18 17
 from neutron.services import provider_configuration as provconf
19 18
 from neutron_lib import exceptions as n_exc
19
+from neutron_lib import rpc as n_rpc
20 20
 from oslo_config import cfg
21 21
 import oslo_messaging as messaging
22 22
 from oslo_utils import importutils

Loading…
Cancel
Save