openstack
/
neutron-vpnaas
Code Issues Proposed changes

Move disabling of metadata and ipv6_ra to _destroy_router_namespace 

I noticed that disable_ipv6_ra is called from the wrong place and that
in some cases it was called with a bogus router_id because the code
made an incorrect assumption about the context.  In other case, it was
never called because _destroy_router_namespace was being called
directly.  This patch moves the disabling of metadata and ipv6_ra in
to _destroy_router_namespace to ensure they get called correctly and
avoid duplication.

Change-Id: Ia76a5ff4200df072b60481f2ee49286b78ece6c4
Closes-Bug: #1383495
This commit is contained in:
Carl Baldwin 2014-10-20 21:48:42 +00:00
parent 9fc08d9095
commit 5e351b0312
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/unit/services/vpn/test_vpn_agent.py
View File

@ -171,9 +171,10 @@ class TestVPNAgent(base.BaseTestCase):
'neutron.agent.linux.iptables_manager.IptablesManager').start()
router_id = _uuid()
ri = l3_agent.RouterInfo(router_id, self.conf.root_helper,
self.conf.use_namespaces, {})
self.conf.use_namespaces, {},
ns_name="qrouter-%s" % router_id)
ri.router = {
'id': _uuid(),
'id': router_id,
'admin_state_up': True,
'routes': [],
'external_gateway_info': {},