summaryrefslogtreecommitdiff
path: root/tests/topotests/lib/topogen.py
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2020-10-08 19:38:44 +0300
committerGitHub <noreply@github.com>2020-10-08 19:38:44 +0300
commitebe39ad5d1c4787cf74836c8b453fa4464051a5e (patch)
treef6c52ae4a6c8498c9fe501d8e0170981c273350f /tests/topotests/lib/topogen.py
parent75bc27898db9347ef6ffa4734cfb9f88e25c7b85 (diff)
parent74d5f2543c89bdea7b9a3dcb43dd62c38dfd2ed7 (diff)
Merge pull request #7260 from qlyoung/reformat-python
Reformat python
Diffstat (limited to 'tests/topotests/lib/topogen.py')
-rw-r--r--tests/topotests/lib/topogen.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index ffdcb683e7..3e92bd7565 100644
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -703,11 +703,9 @@ class TopoRouter(TopoGear):
Stop router, private internal version
* Kill daemons
"""
- self.logger.debug("stopping: wait {}, assert {}".format(
- wait, assertOnError))
+ self.logger.debug("stopping: wait {}, assert {}".format(wait, assertOnError))
return self.tgen.net[self.name].stopRouter(wait, assertOnError)
-
def stop(self):
"""
Stop router cleanly:
@@ -724,7 +722,7 @@ class TopoRouter(TopoGear):
* Start daemons (e.g. FRR)
* Configure daemon logging files
"""
- self.logger.debug('starting')
+ self.logger.debug("starting")
nrouter = self.tgen.net[self.name]
result = nrouter.startRouterDaemons(daemons)
@@ -734,10 +732,12 @@ class TopoRouter(TopoGear):
for d in daemons:
if enabled == 0:
continue
- self.vtysh_cmd('configure terminal\nlog commands\nlog file {}.log'.\
- format(daemon), daemon=daemon)
+ self.vtysh_cmd(
+ "configure terminal\nlog commands\nlog file {}.log".format(daemon),
+ daemon=daemon,
+ )
- if result != '':
+ if result != "":
self.tgen.set_error(result)
return result
@@ -747,7 +747,7 @@ class TopoRouter(TopoGear):
Kill specific daemon(user defined daemon only)
forcefully using SIGKILL
"""
- self.logger.debug('Killing daemons using SIGKILL..')
+ self.logger.debug("Killing daemons using SIGKILL..")
return self.tgen.net[self.name].killRouterDaemons(daemons, wait, assertOnError)
def vtysh_cmd(self, command, isjson=False, daemon=None):
@@ -1070,7 +1070,7 @@ def diagnose_env_linux():
"isisd",
"pimd",
"ldpd",
- "pbrd"
+ "pbrd",
]:
path = os.path.join(frrdir, fname)
if not os.path.isfile(path):