git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the name of ip4 and prefix4 into endpoint_ip and endpoint_prefix
[nepi.git]
/
test
/
resources
/
planetlab
/
gretunnel.py
diff --git
a/test/resources/planetlab/gretunnel.py
b/test/resources/planetlab/gretunnel.py
index
d0396a5
..
98ad803
100755
(executable)
--- a/
test/resources/planetlab/gretunnel.py
+++ b/
test/resources/planetlab/gretunnel.py
@@
-54,8
+54,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("PlanetlabTap")
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("PlanetlabTap")
- ec.set(tap1, "
ip4
", "%s.1" % self.netblock)
- ec.set(tap1, "
prefix4
", 24)
+ ec.set(tap1, "
endpoint_ip
", "%s.1" % self.netblock)
+ ec.set(tap1, "
endpoint_prefix
", 24)
ec.register_connection(tap1, node1)
node2 = ec.register_resource("PlanetlabNode")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("PlanetlabNode")
@@
-67,8
+67,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("PlanetlabTap")
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("PlanetlabTap")
- ec.set(tap2, "
ip4
", "%s.2" % self.netblock)
- ec.set(tap2, "
prefix4
", 24)
+ ec.set(tap2, "
endpoint_ip
", "%s.2" % self.netblock)
+ ec.set(tap2, "
endpoint_prefix
", 24)
ec.register_connection(tap2, node2)
gretun = ec.register_resource("LinuxGRETunnel")
ec.register_connection(tap2, node2)
gretun = ec.register_resource("LinuxGRETunnel")
@@
-111,8
+111,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
- ec.set(tun1, "
ip4
", "%s.1" % self.netblock)
- ec.set(tun1, "
prefix4
", 24)
+ ec.set(tun1, "
endpoint_ip
", "%s.1" % self.netblock)
+ ec.set(tun1, "
endpoint_prefix
", 24)
ec.register_connection(tun1, node1)
node2 = ec.register_resource("PlanetlabNode")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("PlanetlabNode")
@@
-124,8
+124,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("PlanetlabTun")
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("PlanetlabTun")
- ec.set(tun2, "
ip4
", "%s.2" % self.netblock)
- ec.set(tun2, "
prefix4
", 24)
+ ec.set(tun2, "
endpoint_ip
", "%s.2" % self.netblock)
+ ec.set(tun2, "
endpoint_prefix
", 24)
ec.register_connection(tun2, node2)
udptun = ec.register_resource("LinuxGRETunnel")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("LinuxGRETunnel")
@@
-168,8
+168,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("PlanetlabTun")
- ec.set(tun1, "
ip4
", "%s.1" % self.netblock)
- ec.set(tun1, "
prefix4
", 24)
+ ec.set(tun1, "
endpoint_ip
", "%s.1" % self.netblock)
+ ec.set(tun1, "
endpoint_prefix
", 24)
ec.register_connection(tun1, node1)
node2 = ec.register_resource("LinuxNode")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("LinuxNode")
@@
-181,8
+181,8
@@
class PlanetLabGRETunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("LinuxTun")
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("LinuxTun")
- ec.set(tun2, "
ip4
", "%s.2" % self.netblock)
- ec.set(tun2, "
prefix4
", 24)
+ ec.set(tun2, "
endpoint_ip
", "%s.2" % self.netblock)
+ ec.set(tun2, "
endpoint_prefix
", 24)
ec.register_connection(tun2, node2)
gretun = ec.register_resource("LinuxGRETunnel")
ec.register_connection(tun2, node2)
gretun = ec.register_resource("LinuxGRETunnel")