]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Move disabling of metadata and ipv6_ra to _destroy_router_namespace
authorCarl Baldwin <carl.baldwin@hp.com>
Mon, 20 Oct 2014 21:48:42 +0000 (21:48 +0000)
committerCarl Baldwin <carl.baldwin@hp.com>
Tue, 21 Oct 2014 20:50:16 +0000 (20:50 +0000)
commitd712663b99520e6d26269b0ca193527603178742
tree2dd841aaf64d37b19763e074fd2671a77c4b9c10
parentf0aef106e0feca893e64165b1c4718c83f9438dd
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
neutron/agent/l3_agent.py
neutron/tests/unit/services/vpn/test_vpn_agent.py
neutron/tests/unit/test_l3_agent.py