openstack/neutron-vpnaas
Code Issues Proposed changes

test: Register L3 option in L3 ext tests

Browse Source 
After https://review.openstack.org/#/c/524406/ landed,
we need to register L3 opts before initializing router info.

Change-Id: I2017be0e9ca069abfdd1c5250bc06b3b4109fa83
Closes-Bug: #1760320
This commit is contained in:
Akihiro Motoki 2018-04-01 01:04:56 +09:00
parent 1f9b95d6db
commit e10993c98c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ from neutron.agent.l3 import dvr_edge_router
from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.l3 import legacy_router from neutron.agent.l3 import legacy_router
from neutron.agent.linux import iptables_manager from neutron.agent.linux import iptables_manager
from neutron.conf.agent.l3 import config as l3_config
from neutron_lib import constants from neutron_lib import constants
from oslo_config import cfg from oslo_config import cfg
from oslo_utils import uuidutils from oslo_utils import uuidutils
@ -324,6 +325,7 @@ class BaseIPsecDeviceDriver(base.BaseTestCase):
self._execute = mock.patch.object(ipsec_process, '_execute').start() self._execute = mock.patch.object(ipsec_process, '_execute').start()
self.agent = mock.Mock() self.agent = mock.Mock()
self.conf = cfg.CONF self.conf = cfg.CONF
l3_config.register_l3_agent_config_opts(l3_config.OPTS, self.conf)
self.agent.conf = self.conf self.agent.conf = self.conf
self.driver = driver( self.driver = driver(
self.agent, self.agent,