Utilities for building/parsing netns names to facilitate testing

Creating these utilities allows functional tests to mock them out more
easily to in order to change the namespace identification and cleanup
behavior.

Change-Id: I76cb2dc43a0ca4a7ea27c2ea71b27068b92154ce
Related-Bug: #1446261

diff --git a/neutron/agent/l3/dvr.py b/neutron/agent/l3/dvr.py
index 64c75f7f3903023724d0215612d657bda158ebc8..99735df526a24bc301c46c0c318f94beedeec06e 100644 (file)
--- a/neutron/agent/l3/dvr.py
+++ b/neutron/agent/l3/dvr.py
@@ -18,6 +18,7 @@ from oslo_log import log as logging
 
 from neutron.agent.l3 import dvr_fip_ns
 from neutron.agent.l3 import dvr_snat_ns
+from neutron.agent.l3 import namespaces
 
 LOG = logging.getLogger(__name__)
 
@@ -50,7 +51,7 @@ class AgentMixin(object):
         return fip_ns
 
     def _destroy_fip_namespace(self, ns):
-        ex_net_id = ns[len(dvr_fip_ns.FIP_NS_PREFIX):]
+        ex_net_id = namespaces.get_id_from_ns_name(ns)
         fip_ns = self.get_fip_ns(ex_net_id)
         fip_ns.delete()
 

diff --git a/neutron/agent/l3/dvr_fip_ns.py b/neutron/agent/l3/dvr_fip_ns.py
index 78b0a2b9a37d7d24a6ed21d77cc45ca65dfbf206..b959e5016bf685ada7abf2cab670714c2ecfda5b 100644 (file)
--- a/neutron/agent/l3/dvr_fip_ns.py
+++ b/neutron/agent/l3/dvr_fip_ns.py
@@ -39,7 +39,7 @@ FIP_PR_END = FIP_PR_START + 40000
 class FipNamespace(namespaces.Namespace):
 
     def __init__(self, ext_net_id, agent_conf, driver, use_ipv6):
-        name = FIP_NS_PREFIX + ext_net_id
+        name = self._get_ns_name(ext_net_id)
         super(FipNamespace, self).__init__(
             name, agent_conf, driver, use_ipv6)
 
@@ -57,8 +57,12 @@ class FipNamespace(namespaces.Namespace):
         self.local_subnets = lla.LinkLocalAllocator(path, FIP_LL_SUBNET)
         self.destroyed = False
 
+    @classmethod
+    def _get_ns_name(cls, ext_net_id):
+        return namespaces.build_ns_name(FIP_NS_PREFIX, ext_net_id)
+
     def get_name(self):
-        return (FIP_NS_PREFIX + self._ext_net_id)
+        return self._get_ns_name(self._ext_net_id)
 
     def get_ext_device_name(self, port_id):
         return (FIP_EXT_DEV_PREFIX + port_id)[:self.driver.DEV_NAME_LEN]

diff --git a/neutron/agent/l3/dvr_snat_ns.py b/neutron/agent/l3/dvr_snat_ns.py
index 194f2a8c2362444d44b8421103f555eac0e511e8..63478cbb8939e6c9dc8a0e48abeab282f6d07064 100644 (file)
--- a/neutron/agent/l3/dvr_snat_ns.py
+++ b/neutron/agent/l3/dvr_snat_ns.py
@@ -30,7 +30,7 @@ class SnatNamespace(namespaces.Namespace):
 
     @classmethod
     def get_snat_ns_name(cls, router_id):
-        return (SNAT_NS_PREFIX + router_id)
+        return namespaces.build_ns_name(SNAT_NS_PREFIX, router_id)
 
     def delete(self):
         ns_ip = ip_lib.IPWrapper(namespace=self.name)

diff --git a/neutron/agent/l3/namespace_manager.py b/neutron/agent/l3/namespace_manager.py
index 0f552d78c5a40ccd9e7a84b33d62497465d73e3b..2f35b86ba6cb8f46602db672c4067e14a8f0d1f3 100644 (file)
--- a/neutron/agent/l3/namespace_manager.py
+++ b/neutron/agent/l3/namespace_manager.py
@@ -100,9 +100,10 @@ class NamespaceManager(object):
         :param ns_name: The name of the namespace
         :returns: tuple with prefix and id or None if no prefix matches
         """
-        for prefix in [namespaces.NS_PREFIX, dvr_snat_ns.SNAT_NS_PREFIX]:
-            if ns_name.startswith(prefix):
-                return (prefix, ns_name[len(prefix):])
+        prefix = namespaces.get_prefix_from_ns_name(ns_name)
+        if prefix in (namespaces.NS_PREFIX, dvr_snat_ns.SNAT_NS_PREFIX):
+            identifier = namespaces.get_id_from_ns_name(ns_name)
+            return (prefix, identifier)
 
     def is_managed(self, ns_name):
         """Return True if the namespace name passed belongs to this manager."""

diff --git a/neutron/agent/l3/namespaces.py b/neutron/agent/l3/namespaces.py
index e1c6813d31176d516ace2a4bcf637e7d5c3fbde2..1f85fc149d3cbfa85e7016c1d2d7fa34f9e84b7f 100644 (file)
--- a/neutron/agent/l3/namespaces.py
+++ b/neutron/agent/l3/namespaces.py
@@ -27,6 +27,37 @@ EXTERNAL_DEV_PREFIX = 'qg-'
 ROUTER_2_FIP_DEV_PREFIX = 'rfp-'
 
 
+def build_ns_name(prefix, identifier):
+    """Builds a namespace name from the given prefix and identifier
+
+    :param prefix: The prefix which must end with '-' for legacy reasons
+    :param identifier: The id associated with the namespace
+    """
+    return prefix + identifier
+
+
+def get_prefix_from_ns_name(ns_name):
+    """Parses prefix from prefix-identifier
+
+    :param ns_name: The name of a namespace
+    :returns: The prefix ending with a '-' or None if there is no '-'
+    """
+    dash_index = ns_name.find('-')
+    if 0 <= dash_index:
+        return ns_name[:dash_index + 1]
+
+
+def get_id_from_ns_name(ns_name):
+    """Parses identifier from prefix-identifier
+
+    :param ns_name: The name of a namespace
+    :returns: Identifier or None if there is no - to end the prefix
+    """
+    dash_index = ns_name.find('-')
+    if 0 <= dash_index:
+        return ns_name[dash_index + 1:]
+
+
 class Namespace(object):
 
     def __init__(self, name, agent_conf, driver, use_ipv6):
@@ -61,9 +92,9 @@ class RouterNamespace(Namespace):
         super(RouterNamespace, self).__init__(
             name, agent_conf, driver, use_ipv6)
 
-    @staticmethod
-    def _get_ns_name(router_id):
-        return (NS_PREFIX + router_id)
+    @classmethod
+    def _get_ns_name(cls, router_id):
+        return build_ns_name(NS_PREFIX, router_id)
 
     def delete(self):
         ns_ip = ip_lib.IPWrapper(namespace=self.name)

diff --git a/neutron/tests/fullstack/test_l3_agent.py b/neutron/tests/fullstack/test_l3_agent.py
index b527d064e460fcaf2e1d7fa2090532f5e7a8b904..3c41571f46fcb6310188c833133227c5cfa90572 100644 (file)
--- a/neutron/tests/fullstack/test_l3_agent.py
+++ b/neutron/tests/fullstack/test_l3_agent.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 from neutron.agent.l3 import agent as l3_agent
+from neutron.agent.l3 import namespaces
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
 from neutron.openstack.common import uuidutils
@@ -46,7 +47,7 @@ class TestLegacyL3Agent(base.BaseFullStackTestCase):
             SingleNodeEnvironment(), *args, **kwargs)
 
     def _get_namespace(self, router_id):
-        return "%s%s" % (l3_agent.NS_PREFIX, router_id)
+        return namespaces.build_ns_name(l3_agent.NS_PREFIX, router_id)
 
     def _assert_namespace_exists(self, ns_name):
         ip = ip_lib.IPWrapper(ns_name)