]> git.puffer.fish Git - matthieu/frr.git/commitdiff
topotest: enable MPLS processing on all interfaces by default
authorRenato Westphal <renato@opensourcerouting.org>
Wed, 30 Oct 2019 22:23:41 +0000 (19:23 -0300)
committerRenato Westphal <renato@opensourcerouting.org>
Mon, 4 Nov 2019 16:05:47 +0000 (13:05 -0300)
This is necessary to make some tests work correctly. Only topologies
created using the topogen framework benefit from this change.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
tests/topotests/lib/topogen.py

index d7145c3be0ffb25c4a60943c08847f5d2e9f3953..6859f5a076820869c2005179040ba4ada08c9688 100644 (file)
@@ -61,6 +61,7 @@ from mininet.cli import CLI
 
 from lib import topotest
 from lib.topolog import logger, logger_config
+from lib.topotest import set_sysctl
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 
@@ -676,6 +677,10 @@ class TopoRouter(TopoGear):
 
         if result != '':
             self.tgen.set_error(result)
+        else:
+            # Enable MPLS processing on all interfaces.
+            for interface in self.links.keys():
+                set_sysctl(nrouter, 'net.mpls.conf.{}.input'.format(interface), 1)
 
         return result