1 files changed, 17 insertions, 24 deletions
diff --git a/examples/two-layers.py b/examples/two-layers.py
index 3f50037..5f6600c 100755
--- a/examples/two-layers.py
+++ b/examples/two-layers.py
@@ -6,15 +6,10 @@ from rumba.model import *
 from rumba.storyboard import *
 
 # import testbed plugins
-import rumba.testbeds.emulab as emulab
-import rumba.testbeds.jfed as jfed
 import rumba.testbeds.local as local
-import rumba.testbeds.qemu as qemu
 
 # import prototype plugins
 import rumba.prototypes.ouroboros as our
-import rumba.prototypes.rlite as rl
-import rumba.prototypes.irati as irati
 
 import rumba.log as log
 from rumba.utils import ExperimentManager
@@ -22,36 +17,34 @@ from rumba.utils import ExperimentManager
 log.set_logging_level('DEBUG')
 
 
-n1 = NormalDIF("n1")
-n2 = NormalDIF("n2")
-n3 = NormalDIF("n3")
-n4 = NormalDIF("n4")
+n1 = UnicastLayer("n1")
+n2 = UnicastLayer("n2")
+n3 = UnicastLayer("n3")
+n4 = UnicastLayer("n4")
 
-e1 = ShimEthDIF("e1")
-e2 = ShimEthDIF("e2")
-e3 = ShimEthDIF("e3")
+e1 = EthDixLayer("e1")
+e2 = EthDixLayer("e2")
+e3 = EthDixLayer("e3")
 
 a = Node("a",
-         difs = [n3, n4, n1, e1],
-         dif_registrations = {n4: [n1], n3: [n1], n1 : [e1]})
+         layers = [n3, n4, n1, e1],
+         registrations = {n4: [n1], n3: [n1], n1 : [e1]})
 
 b = Node("b",
-         difs = [n1, e1, e2],
-         dif_registrations = {n1 : [e1, e2]})
+         layers = [n1, e1, e2],
+         registrations = {n1 : [e1, e2]})
 
 c = Node("c",
-         difs = [n3, n4, n1, n2, e2, e3],
-         dif_registrations = {n4: [n1], n3: [n1, n2], n1 : [e2], n2: [e3]})
+         layers = [n3, n4, n1, n2, e2, e3],
+         registrations = {n4: [n1], n3: [n1, n2], n1 : [e2], n2: [e3]})
 
 d = Node("d",
-         difs = [n3, n2, e3],
-         dif_registrations = {n3: [n2], n2 : [e3]})
+         layers = [n3, n2, e3],
+         registrations = {n3: [n2], n2 : [e3]})
 
-tb = qemu.Testbed(exp_name = "twolayers",
-                  username = "root",
-                  password = "root")
+tb = local.Testbed(exp_name="twolayers")
 
-exp = rl.Experiment(tb, nodes = [a, b, c, d])
+exp = our.Experiment(tb, nodes = [a, b, c, d])
 
 print(exp)