FdNetDevice working with PlanetLab TAPs

[nepi.git] / examples / openvswitch / ping_over_udpTapTunnel_performance_test_triangleTopo.py

diff --git a/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py b/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
index 5032822..0f347e9 100644 (file)
--- a/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
+++ b/examples/openvswitch/ping_over_udpTapTunnel_performance_test_triangleTopo.py
@@ -65,10 +65,11 @@ def add_udptun(ec, tap1, tap2):
     ec.register_connection(tap2, udptun)
     return udptun
 
-def add_vroute(ec, network, tap):
+def add_vroute(ec, network, prefix, tap):
     vroute = ec.register_resource("planetlab::Vroute")
-    ec.set(vroute, "action", "add")
     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
 
@@ -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)
-
-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)
+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", "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 ##