From a79578988cb2bc7e08a516aca93a3816d996072d Mon Sep 17 00:00:00 2001 From: Sander Vrijders 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