Merge pull request #8182 from mjstapp/topotest_start_tgen

tests: make the topogen object available when starting daemons
This commit is contained in:
Donald Sharp 2021-08-04 08:48:06 -04:00 committed by GitHub
commit 22e135b451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1452,7 +1452,7 @@ class Router(Node):
logger.info("BFD Test, but no bfdd compiled or installed") logger.info("BFD Test, but no bfdd compiled or installed")
return "BFD Test, but no bfdd compiled or installed" return "BFD Test, but no bfdd compiled or installed"
return self.startRouterDaemons() return self.startRouterDaemons(tgen=tgen)
def getStdErr(self, daemon): def getStdErr(self, daemon):
return self.getLog("err", daemon) return self.getLog("err", daemon)
@ -1463,7 +1463,7 @@ class Router(Node):
def getLog(self, log, daemon): def getLog(self, log, daemon):
return self.cmd("cat {}/{}/{}.{}".format(self.logdir, self.name, daemon, log)) return self.cmd("cat {}/{}/{}.{}".format(self.logdir, self.name, daemon, log))
def startRouterDaemons(self, daemons=None): def startRouterDaemons(self, daemons=None, tgen=None):
"Starts all FRR daemons for this router." "Starts all FRR daemons for this router."
asan_abort = g_extra_config["asan_abort"] asan_abort = g_extra_config["asan_abort"]