Small fixes

This commit is contained in:
Wojciech Kozlowski 2019-04-06 23:17:54 +02:00
parent dc8764f8b6
commit 8bbd3d07ad

View File

@ -12,7 +12,7 @@ from topology.two_nodes.topo import NetTopo as TwoNodes
from scenario import Basic, Plain, Isis from scenario import Basic, Plain, Isis
def start_deamon(node, daemon, conf_dir): def start_daemon(node, daemon, conf_dir):
"""Start one FRR daemon on a given node. """Start one FRR daemon on a given node.
""" """
@ -49,10 +49,8 @@ def run(topo, scenario):
for node in net.switches: for node in net.switches:
for daemon in daemons: for daemon in daemons:
if node in getattr(scenario, daemon): if node in getattr(scenario, daemon):
start_deamon(node, conf_dir = getattr(scenario, "{}_conf".format(daemon))
daemon, start_daemon(node, daemon, conf_dir)
getattr(scenario,
"{}_conf".format(daemon)))
if node.name.startswith('R'): if node.name.startswith('R'):
# Enable IP forwarding # Enable IP forwarding