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

Closes-Bug: 1430253
Change-Id: Ib58fd82f1d92d3e8b18118f344d63790bfd48c62

diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py
index 570ca71de55485fd33b34d66e873ffd3c989c874..976a39e11a755f347bf9a1fb32625e131b238c7d 100644 (file)
--- a/neutron/cmd/netns_cleanup.py
+++ b/neutron/cmd/netns_cleanup.py
@@ -23,6 +23,8 @@ from oslo_utils import importutils
 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 interface
 from neutron.agent.linux import ip_lib
@@ -33,7 +35,10 @@ from neutron.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)
-NS_MANGLING_PATTERN = ('(%s|%s)' % (dhcp.NS_PREFIX, l3_agent.NS_PREFIX) +
+NS_MANGLING_PATTERN = ('(%s|%s|%s|%s)' % (dhcp.NS_PREFIX,
+                                          l3_agent.NS_PREFIX,
+                                          dvr.SNAT_NS_PREFIX,
+                                          dvr_fip_ns.FIP_NS_PREFIX) +
                        attributes.UUID_PATTERN)
 
 

diff --git a/neutron/tests/unit/test_netns_cleanup.py b/neutron/tests/unit/test_netns_cleanup.py
index 505ae85568f61b31ee708f1f5a41e171f9bb96ad..273dcc7a5cfdb9c03feac4eee465b84bcc66ff65 100644 (file)
--- a/neutron/tests/unit/test_netns_cleanup.py
+++ b/neutron/tests/unit/test_netns_cleanup.py
@@ -74,6 +74,12 @@ class TestNetnsCleanup(base.BaseTestCase):
     def test_eligible_for_deletion_not_empty_forced(self):
         self._test_eligible_for_deletion_helper('qdhcp-', True, False, True)
 
+    def test_eligible_for_deletion_fip_namespace(self):
+        self._test_eligible_for_deletion_helper('fip-', False, True, True)
+
+    def test_eligible_for_deletion_snat_namespace(self):
+        self._test_eligible_for_deletion_helper('snat-', False, True, True)
+
     def test_unplug_device_regular_device(self):
         conf = mock.Mock()
         device = mock.Mock()