openstack
/
neutron-vpnaas
Code Issues Proposed changes

Prepare neutron "use_namespaces" option removal 

The neutron use_namespaces option is deprecated since Kilo, it's time
remove it from neutron, neutron-*aas and devstack. This change removes
use_namespaces option usage (without changing behavior) in
unit/functional tests in order to prepare option removal from neutron.

Partial-Bug: #1508188

Depends-On: I2fbf65df1250d9f9f1656b3964ee3b6de1ef1118
Change-Id: I84c1d3270448b1f085840d356532794974e5b31e
This commit is contained in:
Cedric Brandily 2015-10-27 11:36:06 +09:00 committed by Armando Migliaccio
parent d4e477d2c5
commit 7675d924ab
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):
super(TestStrongSwanDeviceDriver, self).setUp()
self.conf = cfg.CONF
self.conf.use_namespaces = True
self.conf.register_opts(l3_config.OPTS)
self.conf.register_opts(ipsec.ipsec_opts, 'ipsec')
self.conf.register_opts(strongswan_ipsec.strongswan_opts,

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

@ -278,7 +278,6 @@ class BaseIPsecDeviceDriver(base.BaseTestCase):
self.driver = driver(
self.agent,
FAKE_HOST)
self.conf.use_namespaces = True
self.driver.agent_rpc = mock.Mock()
self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False},
'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):
super(VPNBaseTestCase, self).setUp()
self.conf = cfg.CONF
self.conf.use_namespaces = True
self.ri_kwargs = {'router': {'id': FAKE_ROUTER_ID, 'ha': False},
'agent_conf': self.conf,
'interface_driver': mock.sentinel.interface_driver}