Merge "Adding a cleanup for 'fip-' and 'snat-' namespaces in netns_cleanup"

diff --cc neutron/cmd/netns_cleanup.py
index bacef3d287b0d4baf5586721925cfe5c474618b0,976a39e11a755f347bf9a1fb32625e131b238c7d..41ca1edd63b2440e4e43f3bf9243f45d398d8b6c
--- 1/neutron/cmd/netns_cleanup.py
--- 2/neutron/cmd/netns_cleanup.py
+++ b/neutron/cmd/netns_cleanup.py
@@@ -23,8 -23,9 +23,10 @@@ from oslo_utils import importutil
  from neutron.agent.common import config as agent_config
  from neutron.agent.dhcp import config as dhcp_config
  from neutron.agent.l3 import agent as l3_agent
+ from neutron.agent.l3 import dvr
+ from neutron.agent.l3 import dvr_fip_ns
  from neutron.agent.linux import dhcp
 +from neutron.agent.linux import external_process
  from neutron.agent.linux import interface
  from neutron.agent.linux import ip_lib
  from neutron.agent.linux import ovs_lib

diff --cc neutron/tests/unit/test_netns_cleanup.py
Simple merge