From f2b1590feb27a9e5d8c0e5a83cff54fa0dc5c0ee Mon Sep 17 00:00:00 2001 From: Boden R Date: Thu, 7 Feb 2019 11:13:58 -0700 Subject: [PATCH] use rpc from neutron-lib We recently removed nenutron.common.rpc [1] as the rpc module lives in neutron-lib now. This project was missed because I didn't find neutron.common.rpc as an import. This patch switches rpc uses over to neutron-lib. [1] https://review.openstack.org/#/c/634790/ Change-Id: I40a4bdf03684a6e133b8dc28a0663a4f29bfb0af --- .../tests/unit/services/vpn/device_drivers/test_ipsec.py | 2 +- .../tests/unit/services/vpn/service_drivers/test_ipsec.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py b/neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py index 03371ada4..796aa4028 100644 --- a/neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py +++ b/neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py @@ -327,7 +327,7 @@ class BaseIPsecDeviceDriver(base.BaseTestCase): vpnservice=FAKE_VPN_SERVICE): super(BaseIPsecDeviceDriver, self).setUp() for klass in [ - 'neutron.common.rpc.Connection', + 'neutron_lib.rpc.Connection', 'oslo_service.loopingcall.FixedIntervalLoopingCall' ]: mock.patch(klass).start() diff --git a/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py b/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py index a52a963d6..76a25a786 100644 --- a/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py +++ b/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py @@ -67,7 +67,7 @@ class TestValidatorSelection(base.BaseTestCase): mock.patch.object(st_db.ServiceTypeManager, 'get_service_providers').start()) self.service_providers.return_value = vpnaas_provider - mock.patch('neutron.common.rpc.Connection').start() + mock.patch('neutron_lib.rpc.Connection').start() stm = st_db.ServiceTypeManager() stm.get_provider_names_by_resource_ids = mock.Mock( return_value={}) @@ -87,7 +87,7 @@ class TestValidatorSelection(base.BaseTestCase): class TestIPsecDriver(base.BaseTestCase): def setUp(self): super(TestIPsecDriver, self).setUp() - mock.patch('neutron.common.rpc.Connection').start() + mock.patch('neutron_lib.rpc.Connection').start() l3_agent = mock.Mock() l3_agent.host = FAKE_HOST