1 files changed, 34 insertions, 34 deletions
diff --git a/examples/isps.py b/examples/isps.py
index 62a17ad..335c43b 100755
--- a/examples/isps.py
+++ b/examples/isps.py
@@ -15,23 +15,23 @@ import time
 
 log.set_logging_level('DEBUG')
 
-n0 = NormalDIF("n0")
+n0 = UnicastLayer("n0")
 
-n1 = NormalDIF("n1")
+n1 = UnicastLayer("n1")
 
-n2 = NormalDIF("n2")
+n2 = UnicastLayer("n2")
 n2.add_policy("routing", "lfa")
 n2.add_policy("pff", "alternate")
 
-e0 = ShimEthDIF("e0")
-e1 = ShimEthDIF("e1")
-e2 = ShimEthDIF("e2")
-e3 = ShimEthDIF("e3")
-e4 = ShimEthDIF("e4")
-e5 = ShimEthDIF("e5")
-e6 = ShimEthDIF("e6")
-e7 = ShimEthDIF("e7")
-e8 = ShimEthDIF("e8")
+e0 = EthDixLayer("e0")
+e1 = EthDixLayer("e1")
+e2 = EthDixLayer("e2")
+e3 = EthDixLayer("e3")
+e4 = EthDixLayer("e4")
+e5 = EthDixLayer("e5")
+e6 = EthDixLayer("e6")
+e7 = EthDixLayer("e7")
+e8 = EthDixLayer("e8")
 
 es = [e0, e1, e2, e3, e4, e5, e6, e7, e8]
 
@@ -39,50 +39,50 @@ for e in es:
     e.set_delay(5)
 
 end0 = Node("end0",
-            difs = [e0, e8, n2],
-            dif_registrations = {n2: [e0, e8]})
+            layers = [e0, e8, n2],
+            registrations = {n2: [e0, e8]})
 
 end1 = Node("end1",
-            difs = [e4, e5, n2],
-            dif_registrations = {n2: [e4, e5]})
+            layers = [e4, e5, n2],
+            registrations = {n2: [e4, e5]})
 
 isp10 = Node("isp10",
-             difs = [e0, e1, n2, n1],
-             dif_registrations = {n2: [e0, n1], n1: [e1]})
+             layers = [e0, e1, n2, n1],
+             registrations = {n2: [e0, n1], n1: [e1]})
 
 isp11 = Node("isp11",
-             difs = [e1, e2, n1],
-             dif_registrations = {n1: [e1, e2]})
+             layers = [e1, e2, n1],
+             registrations = {n1: [e1, e2]})
 
 isp12 = Node("isp12",
-             difs = [e2, e3, n1],
-             dif_registrations = {n1: [e2, e3]})
+             layers = [e2, e3, n1],
+             registrations = {n1: [e2, e3]})
 
 isp13 = Node("isp13",
-             difs = [e3, e4, n2, n1],
-             dif_registrations = {n2: [e4, n1], n1: [e3]})
+             layers = [e3, e4, n2, n1],
+             registrations = {n2: [e4, n1], n1: [e3]})
 
 isp00 = Node("isp00",
-             difs = [e8, e7, n2, n0],
-             dif_registrations = {n2: [e8, n0], n0: [e7]})
+             layers = [e8, e7, n2, n0],
+             registrations = {n2: [e8, n0], n0: [e7]})
 
 isp01 = Node("isp01",
-             difs = [e7, e6, n0],
-             dif_registrations = {n0: [e7, e6]})
+             layers = [e7, e6, n0],
+             registrations = {n0: [e7, e6]})
 
 isp02 = Node("isp02",
-             difs = [e6, e5, n2, n0],
-             dif_registrations = {n2: [e5, n0], n0: [e6]})
+             layers = [e6, e5, n2, n0],
+             registrations = {n2: [e5, n0], n0: [e6]})
 
 tb = jfed.Testbed(exp_name = 'case3',
-                  cert_file = '/home/sander/cert.pem',
-                  username = 'sander',
+                  cert_file = '/path/to/cert.pem',
+                  username = 'username',
                   exp_hours = '1')
 
 nodes = [end0, end1, isp10, isp11, isp12, isp13, isp00, isp01, isp02]
 
 exp = our.Experiment(tb, nodes=nodes,
-                     git_repo='https://bitbucket.org/sandervrijders/ouroboros.git',
+                     git_repo='https://codeberg.org/o7s/ouroboros',
                      git_branch='rand3')
 
 duration = 120
@@ -97,7 +97,7 @@ s = Server(
     arrival_rate=0.01,
     mean_duration=duration + 4,
     s_id='oping',
-    difs=n2
+    layers=n2
 )
 
 sb.add_server_on_node(s, end1)