openstack
/
neutron-vpnaas
Code Issues Proposed changes

use rpc Connection rather than create_connection 

The create_connection function in neutron.common.rpc is just an alias to
Connection. This patch switches to the later so we can remove the former
in: https://review.openstack.org/#/c/560130

Change-Id: Ibba7148351e0978ddf6db27348e7cf7f19762f21
This commit is contained in:
Boden R 2018-04-12 11:50:57 -06:00
parent 1c91256cba
commit f87251a2e7
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py
View File

@ -104,7 +104,7 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
# TODO(pc_m): Once all driver implementations no longer need
# vpn_service argument, replace with just config argument.
self.host = host
self.conn = n_rpc.create_connection()
self.conn = n_rpc.Connection()
context = ctx.get_admin_context_without_session()
node_topic = '%s.%s' % (topics.CISCO_IPSEC_AGENT_TOPIC, self.host)

2
neutron_vpnaas/services/vpn/device_drivers/ipsec.py
View File

@ -759,7 +759,7 @@ class IPsecDriver(device_drivers.DeviceDriver):
# implementations no longer need vpn_service.
self.conf = vpn_service.conf
self.host = host
self.conn = n_rpc.create_connection()
self.conn = n_rpc.Connection()
self.context = context.get_admin_context_without_session()
self.topic = topics.IPSEC_AGENT_TOPIC
node_topic = '%s.%s' % (self.topic, self.host)

2
neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py
View File

@ -100,7 +100,7 @@ class VyattaIPSecDriver(device_drivers.DeviceDriver):
self.host = host
# register RPC endpoint
conn = n_rpc.create_connection()
conn = n_rpc.Connection()
node_topic = '%s.%s' % (topics.BROCADE_IPSEC_AGENT_TOPIC,
self.host)

2
neutron_vpnaas/services/vpn/service_drivers/cisco_ipsec.py
View File

@ -135,7 +135,7 @@ class CiscoCsrIPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver):
def create_rpc_conn(self):
self.endpoints = [CiscoCsrIPsecVpnDriverCallBack(self)]
self.conn = n_rpc.create_connection()
self.conn = n_rpc.Connection()
self.conn.create_consumer(
topics.CISCO_IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False)
self.conn.consume_in_threads()

2
neutron_vpnaas/services/vpn/service_drivers/ipsec.py
View File

@ -34,7 +34,7 @@ class IPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver):
def create_rpc_conn(self):
self.endpoints = [base_ipsec.IPsecVpnDriverCallBack(self)]
self.conn = n_rpc.create_connection()
self.conn = n_rpc.Connection()
self.conn.create_consumer(
topics.IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False)
self.conn.consume_in_threads()

2
neutron_vpnaas/services/vpn/service_drivers/vyatta_ipsec.py
View File

@ -30,7 +30,7 @@ class VyattaIPsecDriver(base_ipsec.BaseIPsecVPNDriver):
def create_rpc_conn(self):
self.endpoints = [base_ipsec.IPsecVpnDriverCallBack(self)]
self.conn = n_rpc.create_connection()
self.conn = n_rpc.Connection()
self.conn.create_consumer(
topics.BROCADE_IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False)
self.conn.consume_in_threads()

2
neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
View File

@ -421,7 +421,7 @@ class TestCiscoCsrIPsecDeviceDriverSyncStatuses(base.BaseTestCase):
def setUp(self):
super(TestCiscoCsrIPsecDeviceDriverSyncStatuses, self).setUp()
for klass in ['neutron.common.rpc.create_connection',
for klass in ['neutron.common.rpc.Connection',
'neutron_lib.context.get_admin_context_without_session',
'oslo_service.loopingcall.FixedIntervalLoopingCall']:
mock.patch(klass).start()

2
neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py
View File

@ -318,7 +318,7 @@ class BaseIPsecDeviceDriver(base.BaseTestCase):
vpnservice=FAKE_VPN_SERVICE):
super(BaseIPsecDeviceDriver, self).setUp()
for klass in [
'neutron.common.rpc.create_connection',
'neutron.common.rpc.Connection',
'oslo_service.loopingcall.FixedIntervalLoopingCall'
]:
mock.patch(klass).start()

6
neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py
View File

@ -80,7 +80,7 @@ class TestCiscoValidatorSelection(base.BaseTestCase):
mock.patch.object(st_db.ServiceTypeManager,
'get_service_providers').start())
self.service_providers.return_value = vpnaas_provider
mock.patch('neutron.common.rpc.create_connection').start()
mock.patch('neutron.common.rpc.Connection').start()
stm = st_db.ServiceTypeManager()
stm.get_provider_names_by_resource_ids = mock.Mock(
return_value={})
@ -389,7 +389,7 @@ class TestCiscoIPsecDriver(testlib_api.SqlTestCase):
def setUp(self):
super(TestCiscoIPsecDriver, self).setUp()
mock.patch('neutron.common.rpc.create_connection').start()
mock.patch('neutron.common.rpc.Connection').start()
self._fake_vpn_router_id = _uuid()
service_plugin = mock.Mock()
service_plugin._get_vpnservice.return_value = {
@ -459,7 +459,7 @@ class TestCiscoIPsecDriverRequests(base.BaseTestCase):
def setUp(self):
super(TestCiscoIPsecDriverRequests, self).setUp()
mock.patch('neutron.common.rpc.create_connection').start()
mock.patch('neutron.common.rpc.Connection').start()
service_plugin = mock.Mock()
self.driver = ipsec_driver.CiscoCsrIPsecVPNDriver(service_plugin)

4
neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py
View File

@ -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.create_connection').start()
mock.patch('neutron.common.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.create_connection').start()
mock.patch('neutron.common.rpc.Connection').start()
l3_agent = mock.Mock()
l3_agent.host = FAKE_HOST

2
neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_vyatta_ipsec.py
View File

@ -40,7 +40,7 @@ class TestVyattaDriver(base.BaseTestCase):
def setUp(self):
super(TestVyattaDriver, self).setUp()
mock.patch('neutron.common.rpc.create_connection').start()
mock.patch('neutron.common.rpc.Connection').start()
l3_agent = mock.Mock()
l3_agent.host = FAKE_HOST