Serious refactoring of TUN/TAP and tunnel code. Linux udp/gre tunnels not yet functional

[nepi.git] / test / resources / planetlab / ovs.py

diff --git a/test/resources/planetlab/ovs.py b/test/resources/planetlab/ovs.py
index d8c7a73..c52960e 100755 (executable)
--- a/test/resources/planetlab/ovs.py
+++ b/test/resources/planetlab/ovs.py
@@ -37,12 +37,13 @@ class OvsTestCase(unittest.TestCase):
     def setUp(self):
         self.switch1 = "planetlab2.virtues.fi"
         self.switch2 = "planetlab2.upc.es"
-        self.host1 = "planetlab2.ionio.gr"
-        self.host2 = "planetlab2.cs.aueb.gr"
+        self.host1 = "onelab4.warsaw.rd.tp.pl"
+        self.host2 = "inriarennes1.irisa.fr"
         self.user = "inria_nepi"
 
     @skipIfAnyNotAlive
     def t_ovs(self, user1, switch1, user2, switch2, user3, host1, user4, host2):
+        network = "192.168.3.0"
 
         ec = ExperimentController(exp_id = "test-ovs")
         
@@ -61,13 +62,15 @@ class OvsTestCase(unittest.TestCase):
 
         port1 = ec.register_resource("planetlab::OVSPort")
         ec.set(port1, "port_name", "port-1")
+        ec.set(port1, "network", network)
         ec.register_connection(port1, ovs1)
 
         port2 = ec.register_resource("planetlab::OVSPort")
         ec.set(port2, "port_name", "port-2")
+        ec.set(port2, "network", network)
         ec.register_connection(port2, ovs1)
 
-        node2 = ec.register_resource("planetlab::PlanetlabNode")
+        node2 = ec.register_resource("planetlab::Node")
         ec.set(node2, "hostname", switch2)
         ec.set(node2, "username", user2)
         ec.set(node2, "cleanExperiment", True)
@@ -82,10 +85,12 @@ class OvsTestCase(unittest.TestCase):
 
         port3 = ec.register_resource("planetlab::OVSPort")
         ec.set(port3, "port_name", "port-3")
+        ec.set(port3, "network", network)
         ec.register_connection(port3, ovs2)  
 
         port4 = ec.register_resource("planetlab::OVSPort")
         ec.set(port4, "port_name", "port-4")
+        ec.set(port4, "network", network)
         ec.register_connection(port4, ovs2)
 
         node3 = ec.register_resource("planetlab::Node")
@@ -95,9 +100,9 @@ class OvsTestCase(unittest.TestCase):
         ec.set(node3, "cleanProcesses", True)
 
         tap1 = ec.register_resource("planetlab::Tap")
-        ec.set(tap1, "ip4", "192.168.3.3")
+        ec.set(tap1, "ip", "192.168.3.3")
         ec.set(tap1, "pointopoint", "192.168.3.1")
-        ec.set(tap1, "prefix4", 24)
+        ec.set(tap1, "prefix", "24")
         ec.register_connection(tap1, node3)
 
         node4 = ec.register_resource("planetlab::Node")
@@ -107,20 +112,20 @@ class OvsTestCase(unittest.TestCase):
         ec.set(node4, "cleanProcesses", True)
 
         tap2 = ec.register_resource("planetlab::Tap")
-        ec.set(tap2, "ip4", "192.168.3.4")
+        ec.set(tap2, "ip", "192.168.3.4")
         ec.set(tap2, "pointopoint", "192.168.3.2")
-        ec.set(tap2, "prefix4", 24)
+        ec.set(tap2, "prefix", "24")
         ec.register_connection(tap2, node4)
 
-        ovstun1 = ec.register_resource("planetlab::OVSTunnel")
+        ovstun1 = ec.register_resource("linux::UdpTunnel")
         ec.register_connection(port1, ovstun1)
         ec.register_connection(tap1, ovstun1)
 
-        ovstun2 = ec.register_resource("plantelab::OVSTunnel")
+        ovstun2 = ec.register_resource("linux::UdpTunnel")
         ec.register_connection(port3, ovstun2)
         ec.register_connection(tap2, ovstun2)
 
-        ovstun3 = ec.register_resource("planetlab::OVSTunnel")
+        ovstun3 = ec.register_resource("linux::UdpTunnel")
         ec.register_connection(port2, ovstun3)
         ec.register_connection(port4, ovstun3)