Delete the OVSTunnel to use the UdpTunnel instead. Just need to fix an issue with...

[nepi.git] / test / resources / linux / udptunnel.py

diff --git a/test/resources/linux/udptunnel.py b/test/resources/linux/udptunnel.py
index 22f4f3d..24ddf14 100755 (executable)
--- a/test/resources/linux/udptunnel.py
+++ b/test/resources/linux/udptunnel.py
@@ -49,8 +49,8 @@ class LinuxUdpTunnelTestCase(unittest.TestCase):
         ec.set(node1, "cleanProcesses", True)
 
         tap1 = ec.register_resource("LinuxTap")
-        ec.set(tap1, "ip4", "%s.1" % self.netblock)
-        ec.set(tap1, "prefix4", 32)
+        ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock)
+        ec.set(tap1, "endpoint_prefix", 32)
         ec.register_connection(tap1, node1)
 
         node2 = ec.register_resource("LinuxNode")
@@ -61,8 +61,8 @@ class LinuxUdpTunnelTestCase(unittest.TestCase):
         ec.set(node2, "cleanProcesses", True)
 
         tap2 = ec.register_resource("LinuxTap")
-        ec.set(tap2, "ip4", "%s.2" % self.netblock)
-        ec.set(tap2, "prefix4", 32)
+        ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock)
+        ec.set(tap2, "endpoint_prefix", 32)
         ec.register_connection(tap2, node2)
 
         udptun = ec.register_resource("LinuxUdpTunnel")
@@ -103,8 +103,8 @@ class LinuxUdpTunnelTestCase(unittest.TestCase):
         ec.set(node1, "cleanProcesses", True)
 
         tun1 = ec.register_resource("LinuxTun")
-        ec.set(tun1, "ip4", "%s.1" % self.netblock)
-        ec.set(tun1, "prefix4", 32)
+        ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
+        ec.set(tun1, "endpoint_prefix", 32)
         ec.register_connection(tun1, node1)
 
         node2 = ec.register_resource("LinuxNode")
@@ -115,8 +115,8 @@ class LinuxUdpTunnelTestCase(unittest.TestCase):
         ec.set(node2, "cleanProcesses", True)
 
         tun2 = ec.register_resource("LinuxTun")
-        ec.set(tun2, "ip4", "%s.2" % self.netblock)
-        ec.set(tun2, "prefix4", 32)
+        ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
+        ec.set(tun2, "endpoint_prefix", 32)
         ec.register_connection(tun2, node2)
 
         udptun = ec.register_resource("LinuxUdpTunnel")
@@ -144,11 +144,11 @@ class LinuxUdpTunnelTestCase(unittest.TestCase):
 
         ec.shutdown()
 
-    def ztest_tap_udp_tunnel(self):
+    def test_tap_udp_tunnel(self):
         self.t_tap_udp_tunnel(self.user1, self.host1, self.identity,
                 self.user2, self.host2, self.identity)
 
-    def test_tun_udp_tunnel(self):
+    def ztest_tun_udp_tunnel(self):
         self.t_tun_udp_tunnel(self.user1, self.host1, self.identity,
                 self.user2, self.host2, self.identity)