Adding a cleanup for 'qlbaas-' namespaces in netns_cleanup

Change-Id: I2f8c2c037419953d6f6a9416472f4e5fb73d53db
Closes-Bug: 1456151

diff --git a/neutron/cmd/netns_cleanup.py b/neutron/cmd/netns_cleanup.py
index c2b74355f9da92a485194d917b4298a02f08c266..8c54bbc44fd1737e20c0bbf3298b08c13b5d4c17 100644 (file)
--- a/neutron/cmd/netns_cleanup.py
+++ b/neutron/cmd/netns_cleanup.py
@@ -36,10 +36,12 @@ from neutron.i18n import _LE
 
 
 LOG = logging.getLogger(__name__)
-NS_MANGLING_PATTERN = ('(%s|%s|%s|%s)' % (dhcp.NS_PREFIX,
+LB_NS_PREFIX = 'qlbaas-'
+NS_MANGLING_PATTERN = ('(%s|%s|%s|%s|%s)' % (dhcp.NS_PREFIX,
                                           l3_agent.NS_PREFIX,
                                           dvr.SNAT_NS_PREFIX,
-                                          dvr_fip_ns.FIP_NS_PREFIX) +
+                                          dvr_fip_ns.FIP_NS_PREFIX,
+                                          LB_NS_PREFIX) +
                        attributes.UUID_PATTERN)
 
 

diff --git a/neutron/tests/unit/cmd/test_netns_cleanup.py b/neutron/tests/unit/cmd/test_netns_cleanup.py
index 2da02c77f74b7b50b85acc390d6ab9263123f2de..23eb2152c88cdb4c87dce16f7cff6eb24689af10 100644 (file)
--- a/neutron/tests/unit/cmd/test_netns_cleanup.py
+++ b/neutron/tests/unit/cmd/test_netns_cleanup.py
@@ -78,6 +78,9 @@ class TestNetnsCleanup(base.BaseTestCase):
     def test_eligible_for_deletion_fip_namespace(self):
         self._test_eligible_for_deletion_helper('fip-', False, True, True)
 
+    def test_eligible_for_deletion_lbaas_namespace(self):
+        self._test_eligible_for_deletion_helper('qlbaas-', False, True, True)
+
     def test_eligible_for_deletion_snat_namespace(self):
         self._test_eligible_for_deletion_helper('snat-', False, True, True)