Merge branch 'master-vincenzo' into 'master'

Master vincenzo

See merge request !6

1 files changed, 13 insertions, 5 deletions

diff --git a/example.py b/example.py
index 6013173..b13f0ce 100644..100755
--- a/example.py
+++ b/example.py
@@ -3,6 +3,13 @@
 # An example script using rhumba.py
 
 from rhumba import *
+
+# import testbed plugins
+import rhumba_emulab as emulab
+import rhumba_jfed as jfed
+import rhumba_faketestbed as fake
+
+# import prototype plugins
 import rhumba_ouroboros as our
 import rhumba_rlite as rl
 import rhumba_irati as irati
@@ -22,12 +29,13 @@ b = Node("b",
          difs = [e1, n1],
          dif_registrations = {n1 : [e1]})
 
-tb = jFedTestbed(exp_name = "letest",
-                 username = "sander",
-                 cert_file = "cert.pem",
-                 jfed_jar = "jfed_cli/experimenter-cli.jar")
+tb = jfed.jFedTestbed(exp_name = "letest",
+                      username = "sander",
+                      cert_file = "cert.pem",
+                      jfed_jar = "jfed_cli/experimenter-cli.jar")
+#tb = fake.FakeTestbed(exp_name = "x", username = "yy")
 
-exp = IRATIExperiment(tb, nodes = [a, b])
+exp = irati.IRATIExperiment(tb, nodes = [a, b])
 
 print(exp)