Updated 1st version working of Openflow with examples. It still need to merge the...

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

diff --git a/examples/openvswitch/ovs_ping_exp.py b/examples/openvswitch/ovs_ping_2switches.py
similarity index 83%
rename from examples/openvswitch/ovs_ping_exp.py
rename to examples/openvswitch/ovs_ping_2switches.py
index 18c2f15..6b1c314 100644 (file)
--- a/examples/openvswitch/ovs_ping_exp.py
+++ b/examples/openvswitch/ovs_ping_2switches.py
@@ -29,6 +29,7 @@
 
 from nepi.execution.ec import ExperimentController
 import os, time
+import sys
 
 def add_node(ec, host, user, pl_user, pl_password):
     node = ec.register_resource("PlanetlabNode")
@@ -88,6 +89,7 @@ switch2 = "planetlab2.upc.es"
 host1 = "planetlab2.ionio.gr"
 host2 = "iraplab2.iralab.uni-karlsruhe.de"
 
+ip_controller = "194.254.215.12"
 network = "192.168.3.0"
 
 slicename = "inria_nepi"
@@ -99,8 +101,8 @@ s1_node = add_node(ec, switch1, slicename, pl_user, pl_password)
 s2_node = add_node(ec, switch2, slicename, pl_user, pl_password)
 
 # Add switches 
-ovs1 = add_ovs(ec, "nepi_bridge", "192.168.3.1/24", "85.23.168.77", "6633", s1_node)
-ovs2 = add_ovs(ec, "nepi_bridge", "192.168.3.2/24", "85.23.168.77", "6633", s2_node)
+ovs1 = add_ovs(ec, "nepi_bridge_1", "192.168.3.1/24", ip_controller, "6633", s1_node)
+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)
@@ -153,24 +155,36 @@ ping10 = ec.trace(app10, 'stdout')
 ping11 = ec.trace(app11, 'stdout')
 ping12 = ec.trace(app12, 'stdout')
 
-
-f = open("examples/openvswitch/ping_res.txt", 'w')
-
 if not ping12:
   ec.shutdown()
+  sys.exit("No ping found")
 
+f = open("examples/openvswitch/ovs_ping_2switches.txt", 'w')
+f.write("************ Ping From Switch 1 : 192.168.3.1 ********************\n\n")
 f.write(ping1)
+f.write("----------------------------------------\n\n")
 f.write(ping2)
+f.write("----------------------------------------\n\n")
 f.write(ping3)
+f.write("************ Ping From Switch 2 : 192.168.3.2 ********************\n\n")
 f.write(ping4)
+f.write("----------------------------------------\n\n")
 f.write(ping5)
+f.write("----------------------------------------\n\n")
 f.write(ping6)
+f.write("************ Ping From Host 1 : 192.168.3.3 ********************\n\n")
 f.write(ping7)
+f.write("----------------------------------------\n\n")
 f.write(ping8)
+f.write("----------------------------------------\n\n")
 f.write(ping9)
+f.write("************ Ping From Host 2 : 192.168.3.4 ********************\n\n")
 f.write(ping10)
+f.write("----------------------------------------\n\n")
 f.write(ping11)
+f.write("----------------------------------------\n\n")
 f.write(ping12)
+
 f.close()
 
 # Delete the overlay network