git://git.onelab.eu
/
nodemanager-topo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for OpenVPN support
[nodemanager-topo.git]
/
topo.py
diff --git
a/topo.py
b/topo.py
index
e142802
..
7bf8bf7
100755
(executable)
--- a/
topo.py
+++ b/
topo.py
@@
-31,6
+31,13
@@
def run(cmd):
return subprocess.call(cmd, shell=True);
return subprocess.call(cmd, shell=True);
+"""
+Subnet used for virtual interfaces by setup-egre-link script
+"""
+def iias_network():
+ return "192.168.0.0 255.255.0.0"
+
+
"""
Check for existence of interface d<key>x<nodeid>
"""
"""
Check for existence of interface d<key>x<nodeid>
"""
@@
-71,6
+78,14
@@
def refresh_virtual_link(nodeid, key):
return
return
+"""
+IP address of the NAT interface created inside the slice by the
+setup-nat script.
+"""
+def nat_inner_ip(key):
+ return "10.0.%s.2" % key
+
+
"""
Check for existence of interface natx<key>
"""
"""
Check for existence of interface natx<key>
"""
@@
-211,17
+226,16
@@
password %s
"""
"""
-Network used by OpenVPN on this node
+IP address of NAT gateway to outside world
"""
"""
-def openvpn_net(myid):
- return "10.%s.0.0/16" % myid
-
+def nat_gw(key):
+ return "10.0.%s.1" % key
"""
"""
-IP address of
NAT gateway to outside world
+IP address of
the NAT interface inside the slice
"""
"""
-def nat_
gw(key, myid
):
- return "10.
%s.%s.1" % (key, myid)
+def nat_
inner(key
):
+ return "10.
0.%s.2" % key
"""
"""
@@
-241,13
+255,11
@@
link-detect
""" % name)
f.write ("""!
""" % name)
f.write ("""!
-ip route %s %s
-!
access-list vty permit 127.0.0.1/32
!
line vty
!
access-list vty permit 127.0.0.1/32
!
line vty
!
-"""
% (openvpn_net(myid), nat_gw(key, myid))
)
+""")
f.close()
return
f.close()
return
@@
-281,7
+293,7
@@
def write_ospf(filename, myname, ifaces):
net = ifaces[name]['network']
f.write (" network %s area 0\n" % net)
net = ifaces[name]['network']
f.write (" network %s area 0\n" % net)
- f.write(""" redistribute
static
+ f.write(""" redistribute
kernel
!
access-list vty permit 127.0.0.1/32
!
!
access-list vty permit 127.0.0.1/32
!