From d29fb5bd5245670d8b8148ecbf35d4eef82b9b0c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 17 Dec 2018 10:38:02 -0500 Subject: [PATCH] topotests: Move linux specific config into Linux config section As part of the class rework, move the linux specific config into the LinuxRouter.config section instead of being in the Router class. Signed-off-by: Donald Sharp --- tests/topotests/lib/topotest.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 101f1776aa..30079874bf 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -663,17 +663,6 @@ class Router(Node): if params.get('routertype') is not None: self.routertype = self.params.get('routertype') - # Enable forwarding on the router - assert_sysctl(self, 'net.ipv4.ip_forward', 1) - assert_sysctl(self, 'net.ipv6.conf.all.forwarding', 1) - # Enable coredumps - assert_sysctl(self, 'kernel.core_uses_pid', 1) - assert_sysctl(self, 'fs.suid_dumpable', 1) - #this applies to the kernel not the namespace... - #original on ubuntu 17.x, but apport won't save as in namespace - # |/usr/share/apport/apport %p %s %c %d %P - corefile = '%e_core-sig_%s-pid_%p.dmp' - assert_sysctl(self, 'kernel.core_pattern', corefile) self.cmd('ulimit -c unlimited') # Set ownership of config files self.cmd('chown {0}:{0}vty /etc/{0}'.format(self.routertype)) @@ -1080,6 +1069,15 @@ class LinuxRouter(Router): # Enable forwarding on the router assert_sysctl(self, 'net.ipv4.ip_forward', 1) assert_sysctl(self, 'net.ipv6.conf.all.forwarding', 1) + # Enable coredumps + assert_sysctl(self, 'kernel.core_uses_pid', 1) + assert_sysctl(self, 'fs.suid_dumpable', 1) + #this applies to the kernel not the namespace... + #original on ubuntu 17.x, but apport won't save as in namespace + # |/usr/share/apport/apport %p %s %c %d %P + corefile = '%e_core-sig_%s-pid_%p.dmp' + assert_sysctl(self, 'kernel.core_pattern', corefile) + def terminate(self): """ Terminate generic LinuxRouter Mininet instance -- 2.39.5