From a79578988cb2bc7e08a516aca93a3816d996072d Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Fri, 3 Feb 2017 14:25:52 +0100
Subject: rhumba: Remove experiment name and add more info

This removes the experiment name in the different experiments. It also
adds some more info to the Node class, such as the full URL of the
node after swap-in.
---
 main.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'main.py')

diff --git a/main.py b/main.py
index 49508e9..3200f77 100755
--- a/main.py
+++ b/main.py
@@ -4,28 +4,21 @@
 
 from rhumba import *
 
-n1 = NormalDIF("n1", policies = {"rmt.pff": "lfa",
-                                 "security-manager": "passwd"})
-
 e1 = ShimEthDIF("e1")
 
 a = Node("a",
-         difs = [n1, e1],
-         dif_registrations = {n1 : [e1]},
-         registrations = {"a.crap" : [n1]},
-         bindings = {"a.crap" : "/usr/bin/crap"})
+         difs = [e1],
+         registrations = {"cbr.a" : [e1]},
+         bindings = {"cbr.a" : "/usr/bin/cbr"})
 
 b = Node("b",
-         difs = [e1, n1],
-         dif_registrations = {n1 : [e1]})
+         difs = [e1])
 
-tb = jFedTestbed(exp_name = "letest",
-                 username = "sander",
-                 cert_file = "cert.pem",
-                 jfed_jar = "jfed_cli/experimenter-cli.jar")
+tb = EmulabTestbed(exp_name = "test001",
+                   username = "sander",
+                   url = "wall2.ilabt.iminds.be")
 
-exp = IRATIExperiment("paperino", tb,
-                      nodes = [a, b])
+exp = OuroborosExperiment(tb, nodes = [a, b])
 
 print(exp)
 
-- 
cgit v1.2.3


From b1c002e96c54df211fbc4dfeec188cbf31a56fda Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Sat, 4 Feb 2017 10:33:44 +0100
Subject: rhumba: Revert to old example file

The old example file was modified for testing purposes, but should
stay as an example for people using Rhumba. This commit also renames
it to example.py
---
 example.py | 31 +++++++++++++++++++++++++++++++
 main.py    | 25 -------------------------
 2 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 example.py
 delete mode 100755 main.py

(limited to 'main.py')

diff --git a/example.py b/example.py
new file mode 100644
index 0000000..931eb73
--- /dev/null
+++ b/example.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+# An example script using rhumba.py
+
+from rhumba import *
+
+n1 = NormalDIF("n1", policies = {"rmt.pff": "lfa",
+                                 "security-manager": "passwd"})
+
+e1 = ShimEthDIF("e1")
+
+a = Node("a",
+         difs = [n1, e1],
+         dif_registrations = {n1 : [e1]},
+         registrations = {"a.crap" : [n1]},
+         bindings = {"a.crap" : "/usr/bin/crap"})
+
+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")
+
+exp = IRATIExperiment(tb, nodes = [a, b])
+
+print(exp)
+
+exp.run()
diff --git a/main.py b/main.py
deleted file mode 100755
index 3200f77..0000000
--- a/main.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-
-# An example script using rhumba.py
-
-from rhumba import *
-
-e1 = ShimEthDIF("e1")
-
-a = Node("a",
-         difs = [e1],
-         registrations = {"cbr.a" : [e1]},
-         bindings = {"cbr.a" : "/usr/bin/cbr"})
-
-b = Node("b",
-         difs = [e1])
-
-tb = EmulabTestbed(exp_name = "test001",
-                   username = "sander",
-                   url = "wall2.ilabt.iminds.be")
-
-exp = OuroborosExperiment(tb, nodes = [a, b])
-
-print(exp)
-
-exp.run()
-- 
cgit v1.2.3