From: Julien Tribino Date: Tue, 20 May 2014 08:21:33 +0000 (+0200) Subject: last modifications about Openflow after merging X-Git-Tag: nepi-3.1.0~78 X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=7806c69939ce7c606492107fe2d2588864531db1 last modifications about Openflow after merging --- diff --git a/examples/openvswitch/ovs_ping_2switches.py b/examples/openvswitch/ovs_ping_2switches.py index 7fbb74b4..d1e41357 100644 --- a/examples/openvswitch/ovs_ping_2switches.py +++ b/examples/openvswitch/ovs_ping_2switches.py @@ -86,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") diff --git a/examples/openvswitch/ovs_ping_3switches_line.py b/examples/openvswitch/ovs_ping_3switches_line.py index ca1ebeed..6adc9242 100644 --- a/examples/openvswitch/ovs_ping_3switches_line.py +++ b/examples/openvswitch/ovs_ping_3switches_line.py @@ -28,7 +28,6 @@ # Host1 Host3 Host2 - from nepi.execution.ec import ExperimentController import os, time @@ -85,6 +84,7 @@ def add_app(ec, command, node): # Create the EC ec = ExperimentController(exp_id = "test-tr") +#XXX : Need to put 6 working nodes or to let Nepi find for you switch1 = "planetlab2.virtues.fi" switch2 = "planetlab2.upc.es" switch3 = "planetlab2.cs.aueb.gr" @@ -92,9 +92,12 @@ host1 = "planetlab2.ionio.gr" host2 = "iraplab2.iralab.uni-karlsruhe.de" host3 = "planetlab2.diku.dk" -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") @@ -115,10 +118,8 @@ port4 = add_port(ec, "nepi_port4", ovs1) port7 = add_port(ec, "nepi_port7", ovs1) port2 = add_port(ec, "nepi_port2", ovs2) port5 = add_port(ec, "nepi_port5", ovs2) -#port8 = add_port(ec, "nepi_port8", ovs2) port3 = add_port(ec, "nepi_port3", ovs3) port6 = add_port(ec, "nepi_port6", ovs3) -#port9 = add_port(ec, "nepi_port9", ovs3) h1_node = add_node(ec, host1, slicename, pl_user, pl_password) h2_node = add_node(ec, host2, slicename, pl_user, pl_password) diff --git a/examples/openvswitch/ovs_ping_3switches_loop.py b/examples/openvswitch/ovs_ping_3switches_loop.py index 54b2083d..2b04dd9c 100644 --- a/examples/openvswitch/ovs_ping_3switches_loop.py +++ b/examples/openvswitch/ovs_ping_3switches_loop.py @@ -94,6 +94,7 @@ def add_app(ec, command, node): # Create the EC ec = ExperimentController(exp_id = "test-tr") +#XXX : Need to put 6 working nodes or to let Nepi find for you switch1 = "planetlab2.virtues.fi" switch2 = "planetlab2.upc.es" switch3 = "planetlab2.cs.aueb.gr" @@ -101,9 +102,13 @@ host1 = "planetlab2.ionio.gr" host2 = "iraplab2.iralab.uni-karlsruhe.de" host3 = "planetlab2.diku.dk" -ip_controller = "194.254.215.12" +#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") @@ -165,8 +170,7 @@ ec.deploy() ec.wait_finished([app1, app2, app3, app4, app5, app6, app7, app8, app9, app10, app11, app12]) -# Retreive ping results and save -# them in a file +# Retreive ping results and save them in a file ping1 = ec.trace(app1, 'stdout') ping2 = ec.trace(app2, 'stdout') ping3 = ec.trace(app3, 'stdout') diff --git a/src/nepi/resources/planetlab/openvswitch/ovs.py b/src/nepi/resources/planetlab/openvswitch/ovs.py index 39567b3f..3594a8c5 100644 --- a/src/nepi/resources/planetlab/openvswitch/ovs.py +++ b/src/nepi/resources/planetlab/openvswitch/ovs.py @@ -15,8 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Author: Alina Quereilhac +# Authors: Alina Quereilhac # Alexandros Kouvakas +# Julien Tribino from nepi.execution.resource import ResourceManager, clsinit_copy, \ diff --git a/src/nepi/resources/planetlab/openvswitch/ovsport.py b/src/nepi/resources/planetlab/openvswitch/ovsport.py index 481fe05f..65713583 100644 --- a/src/nepi/resources/planetlab/openvswitch/ovsport.py +++ b/src/nepi/resources/planetlab/openvswitch/ovsport.py @@ -15,8 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Author: Alina Quereilhac -# Alexandros Kouvakas +# Authors: Alina Quereilhac +# Alexandros Kouvakas +# Julien Tribino from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.resource import ResourceManager, clsinit_copy, \ diff --git a/src/nepi/resources/planetlab/openvswitch/tunnel.py b/src/nepi/resources/planetlab/openvswitch/tunnel.py index a26f4415..62575650 100644 --- a/src/nepi/resources/planetlab/openvswitch/tunnel.py +++ b/src/nepi/resources/planetlab/openvswitch/tunnel.py @@ -15,8 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Author: Alina Quereilhac -# Alexandros Kouvakas +# Authors: Alina Quereilhac +# Alexandros Kouvakas +# Julien Tribino from nepi.execution.attribute import Attribute, Flags, Types