1 files changed, 7 insertions, 24 deletions
diff --git a/examples/example.py b/examples/example.py
index 2887cd5..9febd6e 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -7,59 +7,42 @@ from rumba.utils import ExperimentManager
 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
 
 log.set_logging_level('DEBUG')
 
 
-n1 = NormalDIF("n1")
+n1 = UnicastLayer("n1")
 
 n1.add_policy("rmt.pff", "lfa")
 n1.add_policy("security-manager", "passwd")
 
-e1 = ShimEthDIF("e1")
+e1 = EthDixLayer("e1")
 
 a = Node("a",
-         difs=[n1, e1],
-         dif_registrations={n1: [e1]})
+         layers=[n1, e1],
+         registrations={n1: [e1]})
 
 b = Node("b",
-         difs=[e1, n1],
-         dif_registrations={n1: [e1]})
+         layers=[e1, n1],
+         registrations={n1: [e1]})
 
 tb = jfed.Testbed(exp_name="example1",
                   username="user1",
                   cert_file="/home/user1/cert.pem")
 
-exp = rl.Experiment(tb, nodes=[a, b])
+exp = our.Experiment(tb, nodes=[a, b])
 
 print(exp)
 
 # General setup (can be reused in other scripts as-is)
 storyboard = StoryBoard(duration=30)
 
-# Clients can be applications that just keep running, and will be
-# stopped by a SIGINT...
-client1 = Client("rinaperf",
-                 options="-t perf -s 1000 -c 0")
-
-# ... or a custom shutdown method can be provided.
-client2 = Client("rinaperf",
-                 options="-t perf -s 1000 -D <duration>",
-                 shutdown="")
-
-server = Server("rinaperf", options="-l", arrival_rate=0.5,
-                mean_duration=5, clients=[client1, client2])
 
 
 # Experiment-specific configuration: