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
Changed the endpoint_ip and endpoint_prefix attributes of TAP/TUN endpoints for ip...
[nepi.git]
/
test
/
resources
/
linux
/
gretunnel.py
diff --git
a/test/resources/linux/gretunnel.py
b/test/resources/linux/gretunnel.py
index
0d55fc7
..
a4f7d01
100755
(executable)
--- a/
test/resources/linux/gretunnel.py
+++ b/
test/resources/linux/gretunnel.py
@@
-51,8
+51,8
@@
class LinuxGRETunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
- ec.set(tap1, "
endpoint_
ip", "%s.1" % self.netblock)
- ec.set(tap1, "
endpoint_prefix", 32
)
+ ec.set(tap1, "ip", "%s.1" % self.netblock)
+ ec.set(tap1, "
prefix", "32"
)
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
@@
-63,8
+63,8
@@
class LinuxGRETunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
- ec.set(tap2, "
endpoint_
ip", "%s.2" % self.netblock)
- ec.set(tap2, "
endpoint_prefix", 32
)
+ ec.set(tap2, "ip", "%s.2" % self.netblock)
+ ec.set(tap2, "
prefix", "32"
)
ec.register_connection(tap2, node2)
gretun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tap2, node2)
gretun = ec.register_resource("linux::GRETunnel")
@@
-106,8
+106,8
@@
class LinuxGRETunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
- ec.set(tun1, "
endpoint_
ip", "%s.1" % self.netblock)
- ec.set(tun1, "
endpoint_prefix", 32
)
+ ec.set(tun1, "ip", "%s.1" % self.netblock)
+ ec.set(tun1, "
prefix", "32"
)
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
@@
-118,8
+118,8
@@
class LinuxGRETunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
- ec.set(tun2, "
endpoint_
ip", "%s.2" % self.netblock)
- ec.set(tun2, "
endpoint_prefix", 32
)
+ ec.set(tun2, "ip", "%s.2" % self.netblock)
+ ec.set(tun2, "
prefix", "32"
)
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::GRETunnel")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::GRETunnel")