openstack/neutron-vpnaas
Code Issues Proposed changes

Merge "Prepare neutron "use_namespaces" option removal"

Browse Source
This commit is contained in:
Jenkins 2015-11-21 00:09:39 +00:00 committed by Gerrit Code Review
commit 359ba652ae
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron_vpnaas/tests/functional/strongswan/test_strongswan_driver.py
View File

@ -91,7 +91,6 @@ class TestStrongSwanDeviceDriver(base.BaseSudoTestCase):
def setUp(self): def setUp(self):
super(TestStrongSwanDeviceDriver, self).setUp() super(TestStrongSwanDeviceDriver, self).setUp()
self.conf = cfg.CONF self.conf = cfg.CONF
self.conf.use_namespaces = True
self.conf.register_opts(l3_config.OPTS) self.conf.register_opts(l3_config.OPTS)
self.conf.register_opts(ipsec.ipsec_opts, 'ipsec') self.conf.register_opts(ipsec.ipsec_opts, 'ipsec')
self.conf.register_opts(strongswan_ipsec.strongswan_opts, self.conf.register_opts(strongswan_ipsec.strongswan_opts,

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

@ -295,7 +295,6 @@ class BaseIPsecDeviceDriver(base.BaseTestCase):
self.driver = driver( self.driver = driver(
self.agent, self.agent,
FAKE_HOST) FAKE_HOST)
self.conf.use_namespaces = True
self.driver.agent_rpc = mock.Mock() self.driver.agent_rpc = mock.Mock()
self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False}, self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False},
'agent_conf': self.conf, 'agent_conf': self.conf,

1
neutron_vpnaas/tests/unit/services/vpn/test_vpn_service.py
View File

@ -51,7 +51,6 @@ class VPNBaseTestCase(base.BaseTestCase):
def setUp(self): def setUp(self):
super(VPNBaseTestCase, self).setUp() super(VPNBaseTestCase, self).setUp()
self.conf = cfg.CONF self.conf = cfg.CONF
self.conf.use_namespaces = True
self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False}, self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False},
'agent_conf': self.conf, 'agent_conf': self.conf,
'interface_driver': mock.sentinel.interface_driver} 'interface_driver': mock.sentinel.interface_driver}