aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNick Aerts <nick.aerts@ugent.be>2018-02-24 12:27:36 +0100
committerNick Aerts <nick.aerts@ugent.be>2018-03-20 11:30:07 +0100
commita7cd88d752b72ea85ccefa5e1f3dceba13fb1fc2 (patch)
tree9c29f08693d577c81959c3194aec04e9bc1ba195 /tools
parent24bed306b5a67fc682b04cae017b0d0f3ac55a00 (diff)
downloadrumba-a7cd88d752b72ea85ccefa5e1f3dceba13fb1fc2.tar.gz
rumba-a7cd88d752b72ea85ccefa5e1f3dceba13fb1fc2.zip
testbeds: Add docker testbed
This adds support for a testbed based on Docker containers running on the local host. Bridging the containers can be done using built-in Linux bridging or using OpenVSwitch bridges. A new resource 'executor' has been added to abstract away command execution on nodes on the testbed. Executors have been created for local command execution, docker exec based command execution and SSH-based command execution. This has also been changed in the prototypes to execute using the correct executor.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/democonf2rumba.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index dc2f0a4..e398308 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -241,9 +241,9 @@ if __name__ == '__main__':
for a in qemu_p._actions
if a.dest != 'help'
and getattr(args, a.dest) is not None}
- elif args.testbed == 'fake':
- import rumba.testbeds.faketestbed as fake
- test_class = fake.Testbed
+ elif args.testbed == 'local':
+ import rumba.testbeds.local as local
+ test_class = local.Testbed
testbed_args = {a.dest: getattr(args, a.dest)
for a in fake_p._actions
if a.dest != 'help'