diff options
Diffstat (limited to 'tests/topotests/lib/topotest.py')
| -rw-r--r-- | tests/topotests/lib/topotest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 1e6ef1b2b3..5cc1a6981d 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -1424,7 +1424,7 @@ class Router(Node): zebra_option = self.daemons_options["zebra"] self.cmd( "ASAN_OPTIONS=log_path=zebra.asan {0} {1} --log file:zebra.log --log-level debug -s 90000000 -d > zebra.out 2> zebra.err".format( - zebra_path, zebra_option, self.logdir, self.name + zebra_path, zebra_option ) ) logger.debug("{}: {} zebra started".format(self, self.routertype)) @@ -1439,7 +1439,7 @@ class Router(Node): staticd_option = self.daemons_options["staticd"] self.cmd( "ASAN_OPTIONS=log_path=staticd.asan {0} {1} --log file:staticd.log --log-level debug -d > staticd.out 2> staticd.err".format( - staticd_path, staticd_option, self.logdir, self.name + staticd_path, staticd_option ) ) logger.debug("{}: {} staticd started".format(self, self.routertype)) @@ -1723,7 +1723,7 @@ class Router(Node): interface = "" ll_per_if_count = 0 for line in ifaces: - m = re.search("[0-9]+: ([^:@]+)[@if0-9:]+ <", line) + m = re.search("[0-9]+: ([^:@]+)[-@a-z0-9:]+ <", line) if m: interface = m.group(1) ll_per_if_count = 0 @@ -1831,8 +1831,8 @@ class LinuxRouter(Router): class FreeBSDRouter(Router): "A FreeBSD Router Node with IPv4/IPv6 forwarding enabled." - def __init__(eslf, name, **params): - Router.__init__(Self, name, **params) + def __init__(self, name, **params): + Router.__init__(self, name, **params) class LegacySwitch(OVSSwitch): |