Merge branch 'vincenzo' into 'master'

rumba: simplify cooperation between prototype and testbed plugins

See merge request !20

2 files changed, 9 insertions, 7 deletions

diff --git a/examples/example.py b/examples/example.py
index e173ef0..0d8fcd9 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -30,12 +30,12 @@ b = Node("b",
          difs = [e1, n1],
          dif_registrations = {n1 : [e1]})
 
-tb = jfed.Testbed(exp_name = "letest",
-                  username = "sander",
-                  cert_file = "cert.pem",
-                  jfed_jar = "jfed_cli/experimenter-cli.jar")
+tb = qemu.Testbed(exp_name = "example1",
+                  username = "vmaffione",
+                  bzimage = '/home/vmaffione/git/rlite/demo/buildroot/bzImage',
+                  initramfs = '/home/vmaffione/git/rlite/demo/buildroot/rootfs.cpio')
 
-exp = irati.Experiment(tb, nodes = [a, b])
+exp = rl.Experiment(tb, nodes = [a, b])
 
 print(exp)
 
diff --git a/examples/two-layers.py b/examples/two-layers.py
index 29faebe..687c99f 100755
--- a/examples/two-layers.py
+++ b/examples/two-layers.py
@@ -43,9 +43,11 @@ d = Node("d",
          dif_registrations = {n3: [n2], n2 : [e3]})
 
 tb = qemu.Testbed(exp_name = "twolayers",
-                  username = "vmaffio")
+                  username = "vmaffione",
+                  bzimage = '/home/vmaffione/git/rlite/demo/buildroot/bzImage',
+                  initramfs = '/home/vmaffione/git/rlite/demo/buildroot/rootfs.cpio')
 
-exp = irati.Experiment(tb, nodes = [a, b, c, d])
+exp = rl.Experiment(tb, nodes = [a, b, c, d])
 
 print(exp)