X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fopenvswitch%2Fping_over_udpTapTunnel_performance_test_triangleTopo.py;h=0f347e9ca20c3bb2db733ac25fb6dc5ff053b4e2;hb=9f095b0a5b3f063dbbec097278fad8ba3cb4f37c;hp=f5941f1ffb4278d474cdee34a19e5de327e78d31;hpb=38575a0f27f26511965771dde8320060b10252dd;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 f5941f1f..0f347e9c 100644 --- a/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py +++ b/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py @@ -43,37 +43,38 @@ 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, endpoint_ip, endpoint_prefix, pointopoint, node): - tap = ec.register_resource("PlanetlabTap") - ec.set(tap, "endpoint_ip", endpoint_ip) - ec.set(tap, "endpoint_prefix", endpoint_prefix) +def add_tap(ec, ip, prefix, pointopoint, node): + tap = ec.register_resource("planetlab::Tap") + ec.set(tap, "ip", ip) + ec.set(tap, "prefix", 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") - ec.set(vroute, "action", "add") +def add_vroute(ec, network, prefix, tap): + vroute = ec.register_resource("planetlab::Vroute") ec.set(vroute, "network", network) + ec.set(vroute, "prefix", prefix) + ec.set(vroute, "nexthop", ec.get(tap, "pointopoint")) 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 @@ -94,28 +95,28 @@ ec = ExperimentController(exp_id = "test-tap-tunnel") ## Create The topology ## host1 = add_node(ec, hostname_host1, user) -tap1 = add_tap(ec, "192.168.3.1", 24, "192.168.3.2", host1) +tap1 = add_tap(ec, "192.168.3.1", "24", "192.168.3.2", host1) switch1 = add_node(ec, hostname_switch1, user) -tap2 = add_tap(ec, "192.168.3.2", 24, "192.168.3.1", switch1) -tap102 = add_tap(ec, "192.168.3.102", 29, "192.168.3.104", switch1) -tap152 = add_tap(ec, "192.168.3.152", 29, "192.168.3.156", switch1) +tap2 = add_tap(ec, "192.168.3.2", "24", "192.168.3.1", switch1) +tap102 = add_tap(ec, "192.168.3.102", "29", "192.168.3.104", switch1) +tap152 = add_tap(ec, "192.168.3.152", "29", "192.168.3.156", switch1) host2 = add_node(ec, hostname_host2, user) -tap13 = add_tap(ec, "192.168.3.13", 24, "192.168.3.14", host2) +tap13 = add_tap(ec, "192.168.3.13", "24", "192.168.3.14", host2) switch2 = add_node(ec, hostname_switch2, user) -tap14 = add_tap(ec, "192.168.3.14", 24, "192.168.3.13", switch2) -tap104 = add_tap(ec, "192.168.3.104", 29, "192.168.3.102", switch2) -tap204 = add_tap(ec, "192.168.3.204", 29, "192.168.3.206", switch2) +tap14 = add_tap(ec, "192.168.3.14", "24", "192.168.3.13", switch2) +tap104 = add_tap(ec, "192.168.3.104", "29", "192.168.3.102", switch2) +tap204 = add_tap(ec, "192.168.3.204", "29", "192.168.3.206", switch2) host3 = add_node(ec, hostname_host3, user) -tap25 = add_tap(ec, "192.168.3.25", 24, "192.168.3.26", host3) +tap25 = add_tap(ec, "192.168.3.25", "24", "192.168.3.26", host3) switch3 = add_node(ec, hostname_switch3, user) -tap26 = add_tap(ec, "192.168.3.26", 24, "192.168.3.25", switch3) -tap156 = add_tap(ec, "192.168.3.156", 29, "192.168.3.152", switch3) -tap206 = add_tap(ec, "192.168.3.206", 29, "192.168.3.204", switch3) +tap26 = add_tap(ec, "192.168.3.26", "24", "192.168.3.25", switch3) +tap156 = add_tap(ec, "192.168.3.156", "29", "192.168.3.152", switch3) +tap206 = add_tap(ec, "192.168.3.206", "29", "192.168.3.204", switch3) ## Create the UDP Tunnel ## udptun1 = add_udptun(ec, tap1, tap2) @@ -127,16 +128,16 @@ udptun5 = add_udptun(ec, tap152, tap156) udptun6 = add_udptun(ec, tap204, tap206) ## Create the PlanetLab Route ## -vroute1 = add_vroute(ec, "192.168.3.0", tap1) -vroute2 = add_vroute(ec, "192.168.3.0", tap13) -vroute3 = add_vroute(ec, "192.168.3.0", tap25) +vroute1 = add_vroute(ec, "192.168.3.0", "24", tap1) +vroute2 = add_vroute(ec, "192.168.3.0", "24", tap13) +vroute3 = add_vroute(ec, "192.168.3.0", "24", tap25) -vroute7 = add_vroute(ec, "192.168.3.8", tap102) -vroute8 = add_vroute(ec, "192.168.3.0", tap104) -vroute9 = add_vroute(ec, "192.168.3.24", tap152) -vroute10 = add_vroute(ec, "192.168.3.0", tap156) -vroute11 = add_vroute(ec, "192.168.3.24", tap204) -vroute12 = add_vroute(ec, "192.168.3.8", tap206) +vroute7 = add_vroute(ec, "192.168.3.8", "29", tap102) +vroute8 = add_vroute(ec, "192.168.3.0", "29", tap104) +vroute9 = add_vroute(ec, "192.168.3.24", "29", tap152) +vroute10 = add_vroute(ec, "192.168.3.0", "29", tap156) +vroute11 = add_vroute(ec, "192.168.3.24", "29", tap204) +vroute12 = add_vroute(ec, "192.168.3.8", "29", tap206) ## Create all the Ping ## @@ -223,6 +224,3 @@ f.close() ec.shutdown() - - -