X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fopenvswitch%2Fping_over_udpTapTunnel_performance_test_triangleTopo.py;h=51aa60dba1c529c82e8777cd3f89a16070ebbf7c;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=e85da45138dcb6352734e750e6d15516603560d1;hpb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;p=nepi.git

diff --git a/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py b/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
index e85da451..51aa60db 100644
--- a/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
+++ b/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
@@ -43,37 +43,37 @@ import time
 
 ### Useful Method to Create RM ##
 def add_node(ec, host, user):
-    node = ec.register_resource("PlanetlabNode")
+    node = ec.register_resource("planetlab::Node")
     ec.set(node, "hostname", host)
     ec.set(node, "username", user)
-    ec.set(node, "cleanHome", True)
+    ec.set(node, "cleanExperiment", True)
     ec.set(node, "cleanProcesses", True)
     return node
 
-def add_tap(ec, ip4, prefix4, pointopoint, node):
-    tap = ec.register_resource("PlanetlabTap")
-    ec.set(tap, "ip4", ip4)
-    ec.set(tap, "prefix4", prefix4)
+def add_tap(ec, endpoint_ip, endpoint_prefix, pointopoint, node):
+    tap = ec.register_resource("planetlab::Tap")
+    ec.set(tap, "endpoint_ip", endpoint_ip)
+    ec.set(tap, "endpoint_prefix", endpoint_prefix)
     ec.set(tap, "pointopoint", pointopoint)
     ec.set(tap, "up", True)
     ec.register_connection(tap, node)
     return tap
 
 def add_udptun(ec, tap1, tap2):
-    udptun = ec.register_resource("UdpTunnel")
+    udptun = ec.register_resource("udp::Tunnel")
     ec.register_connection(tap1, udptun)
     ec.register_connection(tap2, udptun)
     return udptun
 
 def add_vroute(ec, network, tap):
-    vroute = ec.register_resource("PlanetlabVroute")
+    vroute = ec.register_resource("planetlab::Vroute")
     ec.set(vroute, "action", "add")
     ec.set(vroute, "network", network)
     ec.register_connection(vroute, tap)
     return vroute
 
 def add_app(ec, command, node):
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
     ec.set(app, "command", command)
     ec.register_connection(app, node)
     return app
@@ -223,6 +223,3 @@ f.close()
 ec.shutdown()
 
 
-
-
-