X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fopenvswitch%2Fovs_ping_2switches.py;h=47789117217304705fe9f182f55eaa38cc9e3341;hb=327c0ed98930e561cf240a2e4d0b2ddd2d4c1c84;hp=6b1c314248d4763f8081387e27603e7de62ce5b4;hpb=c2acc774e82685942698b64e8ca7b4a27200e5dc;p=nepi.git

diff --git a/examples/openvswitch/ovs_ping_2switches.py b/examples/openvswitch/ovs_ping_2switches.py
index 6b1c3142..47789117 100644
--- a/examples/openvswitch/ovs_ping_2switches.py
+++ b/examples/openvswitch/ovs_ping_2switches.py
@@ -16,10 +16,12 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-#         Alexandros Kouvakas <alexandros.kouvakas@gmail.com>
+# Authors :  Julien Tribino <julien.tribino@inria.fr>
+#          Alina Quereilhac <alina.quereilhac@inria.fr>
 #
-#         Switch1 ------- Switch2         
+# Topology :
+# 
+#         Switch1 -------- Switch2         
 #            /                \           
 #           /                  \          
 #          /                    \         
@@ -45,7 +47,7 @@ def add_node(ec, host, user, pl_user, pl_password):
     return node
 
 def add_ovs(ec, bridge_name, virtual_ip_pref, controller_ip, controller_port, node):
-    ovs = ec.register_resource("OVSWitch")
+    ovs = ec.register_resource("OVSSwitch")
     ec.set(ovs, "bridge_name", bridge_name)
     ec.set(ovs, "virtual_ip_pref", virtual_ip_pref)
     ec.set(ovs, "controller_ip", controller_ip)
@@ -53,24 +55,24 @@ def add_ovs(ec, bridge_name, virtual_ip_pref, controller_ip, controller_port, no
     ec.register_connection(ovs, node)
     return ovs
 
-def add_port(ec, port_name, ovs):
+def add_port(ec, port_name, network, ovs):
     port = ec.register_resource("OVSPort")
     ec.set(port, "port_name", port_name)
+    ec.set(port, "network", network)
     ec.register_connection(port, ovs)
     return port
 
-def add_tap(ec, ip4, prefix4, pointopoint, node):
+def add_tap(ec, endpoint_ip, endpoint_prefix, pointopoint, node):
     tap = ec.register_resource("PlanetlabTap")
-    ec.set(tap, "ip4", ip4)
-    ec.set(tap, "prefix4", prefix4)
+    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_tunnel(ec, network, port0, tap):
-    tunnel = ec.register_resource("OVSTunnel")
-    ec.set(tunnel, "network", network)
+def add_tunnel(ec, port0, tap):
+    tunnel = ec.register_resource("LinuxUdpTunnel")
     ec.register_connection(port0, tunnel)
     ec.register_connection(tunnel, tap)
     return tunnel
@@ -84,14 +86,18 @@ def add_app(ec, command, node):
 # Create the EC
 ec = ExperimentController(exp_id = "test")
 
+#XXX : Need to put 4 working nodes or to let Nepi find for you
 switch1 = "planetlab2.virtues.fi"
 switch2 = "planetlab2.upc.es"
 host1 = "planetlab2.ionio.gr"
 host2 = "iraplab2.iralab.uni-karlsruhe.de"
 
-ip_controller = "194.254.215.12"
+ip_controller = "1.1.1.1"
+
+#XXX : Depends on the Vsys_tag of your slice
 network = "192.168.3.0"
 
+#XXX : Name of your slice
 slicename = "inria_nepi"
 
 pl_user = os.environ.get("PL_USER")
@@ -105,10 +111,10 @@ ovs1 = add_ovs(ec, "nepi_bridge_1", "192.168.3.1/24", ip_controller, "6633", s1_
 ovs2 = add_ovs(ec, "nepi_bridge_2", "192.168.3.2/24", ip_controller, "6633", s2_node)
 
 # Add ports on ovs
-port1 = add_port(ec, "nepi_port1", ovs1)
-port3 = add_port(ec, "nepi_port3", ovs1)
-port2 = add_port(ec, "nepi_port2", ovs2)
-port4 = add_port(ec, "nepi_port4", ovs2)
+port1 = add_port(ec, "nepi_port1", network, ovs1)
+port3 = add_port(ec, "nepi_port3", network, ovs1)
+port2 = add_port(ec, "nepi_port2", network, ovs2)
+port4 = add_port(ec, "nepi_port4", network, ovs2)
 
 h1_node = add_node(ec, host1, slicename, pl_user, pl_password)
 h2_node = add_node(ec, host2, slicename, pl_user, pl_password)
@@ -118,9 +124,9 @@ tap1 = add_tap(ec, "192.168.3.3", 24, "192.168.3.1", h1_node)
 tap2 = add_tap(ec, "192.168.3.4", 24, "192.168.3.2", h2_node)
 
 # Connect the nodes
-tunnel1 = add_tunnel(ec, network, port1, tap1)
-tunnel2 = add_tunnel(ec, network, port2, tap2)
-tunnel3 = add_tunnel(ec, network, port3, port4)
+tunnel1 = add_tunnel(ec, port1, tap1)
+tunnel2 = add_tunnel(ec, port2, tap2)
+tunnel3 = add_tunnel(ec, port3, port4)
 
 # Add ping commands
 app1 = add_app(ec, "ping -c5 192.168.3.2", s1_node)