From 658a41da85783d0ea06b91e5c72f755144b2e449 Mon Sep 17 00:00:00 2001 From: Marco Capitani Date: Wed, 10 Jan 2018 12:41:25 +0100 Subject: storyboard: re-add run_command method Also: logging fix in ssh_support, Enabling changes: storyboard: refactor 'start' method, it was getting big some more minor storyboard refactoring for decoupling update examples to new syntax --- examples/converged-operator-network.py | 2 +- examples/example.py | 2 +- examples/two-layers.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/converged-operator-network.py b/examples/converged-operator-network.py index 57609fc..d0da907 100755 --- a/examples/converged-operator-network.py +++ b/examples/converged-operator-network.py @@ -198,5 +198,5 @@ with ExperimentManager(exp): c1 = Client("rinaperf", options ="-i 10000 -s 1000 -c 0 -d overlay") s1 = Server("rinaperf", arrival_rate=2, mean_duration=5, options = "-l -d overlay", nodes = [c1n1], clients = [c1]) - sb = StoryBoard(exp, duration=3600, servers = [s1]) + sb = StoryBoard(experiment=exp, duration=3600, servers = [s1]) sb.start() diff --git a/examples/example.py b/examples/example.py index a26ab3b..eee966b 100755 --- a/examples/example.py +++ b/examples/example.py @@ -66,7 +66,7 @@ server = Server("rinaperf", options="-l", arrival_rate=0.5, # (This can be done anytime before storyboard.start()) storyboard.set_experiment(exp) -storyboard.add_server((server, a)) +storyboard.add_server_on_node(server, a) client1.add_node(b) client2.add_node(b) diff --git a/examples/two-layers.py b/examples/two-layers.py index d2e4007..c375088 100755 --- a/examples/two-layers.py +++ b/examples/two-layers.py @@ -58,7 +58,7 @@ print(exp) with ExperimentManager(exp): exp.swap_in() exp.bootstrap_prototype() - sb = StoryBoard(exp, duration=15, servers=[]) + sb = StoryBoard(experiment=exp, duration=15, servers=[]) sb.run_command(7.5, a, 'echo "7.5 secs in. We are at $(hostname)"') sb.run_command(12, b, 'echo "12 secs in. We are at $(hostname)"') sb.start() -- cgit v1.2.3