Change the name of ip4 and prefix4 into endpoint_ip and endpoint_prefix

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

diff --git a/test/resources/linux/gretunnel.py b/test/resources/linux/gretunnel.py
index cb55760..6317ae0 100755 (executable)
--- a/test/resources/linux/gretunnel.py
+++ b/test/resources/linux/gretunnel.py
@@ -26,6 +26,8 @@ import os
 import time
 import unittest
 
+## TODO: VALIDATE THIS TEST!
+
 class LinuxGRETunnelTestCase(unittest.TestCase):
     def setUp(self):
         self.host1 = "roseval.pl.sophia.inria.fr"
@@ -49,8 +51,8 @@ class LinuxGRETunnelTestCase(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 +63,8 @@ class LinuxGRETunnelTestCase(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)
 
         gretun = ec.register_resource("LinuxGRETunnel")
@@ -104,8 +106,8 @@ class LinuxGRETunnelTestCase(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")
@@ -116,8 +118,8 @@ class LinuxGRETunnelTestCase(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("LinuxGRETunnel")