X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fopenvswitch%2Fovs_ping_2switches.py;h=5b7a20865958109f60f0207e5003e7a1f5dc533f;hb=38575a0f27f26511965771dde8320060b10252dd;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..5b7a2086 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)
@@ -59,10 +61,10 @@ def add_port(ec, port_name, ovs):
     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)
@@ -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 = "xxx.yyy.zzz.ttt"
+
+#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")