X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=topo.py;h=e142802772f22312d41298905c439a19f52ab4b9;hb=b85ce57f4a68f553ba2dd4c368963f80ed5529c7;hp=f87a2709e333ad0417063c9c16c3e1edf74322e5;hpb=ca47a9756ea2389b8666ad8d6c6c7421083c08b0;p=nodemanager-topo.git

diff --git a/topo.py b/topo.py
index f87a270..e142802 100755
--- a/topo.py
+++ b/topo.py
@@ -41,22 +41,14 @@ def virtual_link(key, nodeid):
     else:
         return False
 
-def get_virt_ip(myid, nodeid):
-    if myid < nodeid:
-        virtip = "10.%d.%d.2" % (myid, nodeid)
-    else:
-        virtip = "10.%d.%d.3" % (nodeid, myid)
-    return virtip
-
 """
 Create a "virtual link" for slice between here and nodeid.
 The key is used to create the EGRE tunnel.
 """
-def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr):
+def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr, virtip, vnet):
     logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))
-    virtip = get_virt_ip(myid, nodeid)
-    run(setup_link_cmd + " %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
-                                                 key, rate, virtip))
+    run(setup_link_cmd + " %s %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
+                                                 key, rate, virtip, vnet))
     return
 
 
@@ -151,16 +143,18 @@ Update virtual links for the slice
 """
 def update_links(slice, myid, topospec, key, netns):
     topolist = convert_topospec_to_list(topospec)
-    for (nodeid,ipaddr,rate) in topolist:
+    for (nodeid, ipaddr, rate, myvirtip, remvirtip, virtnet) in topolist:
         if not virtual_link(key, nodeid):
             if netns:
-                setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr)
+                setup_virtual_link(slice, key, rate, myid, nodeid, 
+                                   ipaddr, myvirtip, virtnet)
         else:
             logger.log("%s: virtual link to node %s exists" % (slice, nodeid))
             refresh_virtual_link(nodeid, key)
 
     if not nat_exists(key):
-        setup_nat(slice, myid, key)
+        if netns:
+            setup_nat(slice, myid, key)
     else:
         logger.log("%s: NAT exists" % slice)
         refresh_nat(key)
@@ -195,11 +189,12 @@ Quagga.
 def get_ifaces(hostname, myid, topospec, key):
     ifaces = {}
     topolist = convert_topospec_to_list(topospec)
-    for (nodeid, ipaddr, rate) in topolist:
+    for (nodeid, ipaddr, rate, myvirtip, remvirtip, virtnet) in topolist:
         name = "a%sx%s" % (key, nodeid)
         ifaces[name] = {}
-        ifaces[name]['remote-ip'] = get_virt_ip(nodeid, myid)
-        ifaces[name]['local-ip'] = get_virt_ip(myid, nodeid)
+        ifaces[name]['remote-ip'] = remvirtip
+        ifaces[name]['local-ip'] = myvirtip
+        ifaces[name]['network'] = virtnet
         ifaces[name]['short-name'] = hostname.replace('.vini-veritas.net', '')
     return ifaces
 
@@ -215,31 +210,44 @@ password %s
     return
 
 
+"""
+Network used by OpenVPN on this node
+"""
+def openvpn_net(myid):
+    return "10.%s.0.0/16" % myid
+
+
+"""
+IP address of NAT gateway to outside world
+"""
+def nat_gw(key, myid):
+    return "10.%s.%s.1" % (key, myid)
+
+
 """
 Write zebra.conf file for Quagga
 """
-def write_zebra(filename, myname, ifaces):
+def write_zebra(filename, myname, ifaces, myid, key):
     f = open(filename, 'w')
     password = "zebra"
     write_header(f, myname, password)
 
-    f.write ("""enable password %s
-!
-""" % password)
+    f.write ("enable password %s\n" % password)
 
     for name in ifaces:
         f.write ("""!     
-     interface %s
-     link-detect
+interface %s
+link-detect
 """ %  name)
 
     f.write ("""!
+ip route %s %s
 !
- access-list vty permit 127.0.0.1/32
+access-list vty permit 127.0.0.1/32
 !
- line vty
+line vty
 !
-""")
+""" % (openvpn_net(myid), nat_gw(key, myid)))
     f.close()
     return
 
@@ -270,10 +278,11 @@ def write_ospf(filename, myname, ifaces):
         f.write ("     neighbor %s\n" % ifaces[name]['remote-ip'])
 
     for name in ifaces:
-        net = ifaces[name]['local-ip'].rstrip('23')+'0'
-        f.write ("     network %s/24 area 0\n" % net)
+        net = ifaces[name]['network']
+        f.write ("     network %s area 0\n" % net)
 
-    f.write("""!
+    f.write("""     redistribute static
+!
 access-list vty permit 127.0.0.1/32
 !
 line vty
@@ -296,7 +305,8 @@ def update_quagga_configs(slicename, hostname, myid, topo, key, netns):
             logger.log("topo: could not create %s\n" % quagga_dir)
             return
 
-    write_zebra(quagga_dir + "zebra.conf.generated", hostname, ifaces)
+    write_zebra(quagga_dir + "zebra.conf.generated", hostname, ifaces, 
+                myid, key)
     write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
 
     # Start up Quagga if we installed it earlier and netns = 1.