Generate Quagga config files for each sliver

diff --git a/topo.py b/topo.py
index 502b605..f87a270 100755 (executable)
--- a/topo.py
+++ b/topo.py
@@ -12,6 +12,7 @@ import sioc
 import re
 import vserver
 import os
 import re
 import vserver
 import os

+from time import strftime

 
 dryrun = 0
 vinidir = "/usr/share/vini/"
 
 dryrun = 0
 vinidir = "/usr/share/vini/"


@@ -40,6 +41,12 @@ def virtual_link(key, nodeid):
     else:
         return False
 
     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.
 
 """
 Create a "virtual link" for slice between here and nodeid.


@@ -47,11 +54,7 @@ The key is used to create the EGRE tunnel.
 """
 def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr):
     logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))
 """
 def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr):
     logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))

-    if myid < nodeid:
-        virtip = "10.%d.%d.2" % (myid, nodeid)
-    else:
-        virtip = "10.%d.%d.3" % (nodeid, myid)
-        
+    virtip = get_virt_ip(myid, nodeid)

     run(setup_link_cmd + " %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
                                                  key, rate, virtip))
     return
     run(setup_link_cmd + " %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
                                                  key, rate, virtip))
     return


@@ -146,7 +149,7 @@ def convert_topospec_to_list(rspec):
 """
 Update virtual links for the slice
 """
 """
 Update virtual links for the slice
 """

-def update(slice, myid, topospec, key, netns):
+def update_links(slice, myid, topospec, key, netns):

     topolist = convert_topospec_to_list(topospec)
     for (nodeid,ipaddr,rate) in topolist:
         if not virtual_link(key, nodeid):
     topolist = convert_topospec_to_list(topospec)
     for (nodeid,ipaddr,rate) in topolist:
         if not virtual_link(key, nodeid):


@@ -174,7 +177,7 @@ def writeConf(slicename, value):
             try:
                 os.mkdir(SPACESDIR)
             except os.error:
             try:
                 os.mkdir(SPACESDIR)
             except os.error:

-                logger.log("netns: could not create %s\n" % SPACESDIR)
+                logger.log("topo: could not create %s\n" % SPACESDIR)

                 return
         f = open("%s/net" % SPACESDIR, "w")
         f.write("%s\n" % value)
                 return
         f = open("%s/net" % SPACESDIR, "w")
         f.write("%s\n" % value)


@@ -185,6 +188,133 @@ def writeConf(slicename, value):
         logger.log("%s: network namespace %s\n" % (slicename, STATUS))
 
 
         logger.log("%s: network namespace %s\n" % (slicename, STATUS))
 
 

+"""
+Generate information for each interface in the sliver, in order to configure
+Quagga.
+"""
+def get_ifaces(hostname, myid, topospec, key):
+    ifaces = {}
+    topolist = convert_topospec_to_list(topospec)
+    for (nodeid, ipaddr, rate) 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]['short-name'] = hostname.replace('.vini-veritas.net', '')
+    return ifaces
+
+
+def write_header(f, myname, password):
+    f.write ("""! Configuration for %s
+! Generated at %s
+
+hostname %s
+password %s
+
+""" % (myname, strftime("%Y-%m-%d %H:%M:%S"), myname, password))
+    return
+
+
+"""
+Write zebra.conf file for Quagga
+"""
+def write_zebra(filename, myname, ifaces):
+    f = open(filename, 'w')
+    password = "zebra"
+    write_header(f, myname, password)
+
+    f.write ("""enable password %s
+!
+""" % password)
+
+    for name in ifaces:
+        f.write ("""!     
+     interface %s
+     link-detect
+""" %  name)
+
+    f.write ("""!
+!
+ access-list vty permit 127.0.0.1/32
+!
+ line vty
+!
+""")
+    f.close()
+    return
+
+
+"""
+Write ospfd.conf file for Quagga.  
+"""
+def write_ospf(filename, myname, ifaces):
+    f = open(filename, 'w')
+    password = "zebra"
+    write_header(f, myname, password)
+
+    for name in ifaces:
+        f.write ("""!
+     interface %s
+     ip ospf cost 10
+     ip ospf hello-interval 5
+     ip ospf dead-interval 10
+     ip ospf network non-broadcast
+""" % name)
+
+    f.write ("""!
+     router ospf
+     ospf router-id %s
+""" % ifaces[name]['local-ip'])
+
+    for name in 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)
+
+    f.write("""!
+access-list vty permit 127.0.0.1/32
+!
+line vty
+""")
+    return
+
+
+"""
+Write config files directly into the slice's file system.
+"""
+def update_quagga_configs(slicename, hostname, myid, topo, key, netns):
+    ifaces = get_ifaces(hostname, myid, topo, key)
+
+    quagga_dir = "/vservers/%s/etc/quagga/" % slicename
+    if not os.path.exists(quagga_dir):
+        try:
+            # Quagga not installed.  Install it here?  Chkconfig, sym links.
+            os.mkdir(quagga_dir)
+        except os.error:
+            logger.log("topo: could not create %s\n" % quagga_dir)
+            return
+
+    write_zebra(quagga_dir + "zebra.conf.generated", hostname, ifaces)
+    write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
+
+    # Start up Quagga if we installed it earlier and netns = 1.
+
+    return
+
+
+"""
+Write /etc/hosts in the sliver
+"""
+def update_hosts(slicename, hosts):
+    hosts_file = "/vservers/%s/etc/hosts" % slicename
+    f = open(hosts_file, 'w')
+    f.write(hosts)
+    f.close()
+    return
+
+

 def start(options, config):
     pass
 
 def start(options, config):
     pass
 


@@ -210,17 +340,22 @@ def GetSlivers(data):
         else:
             netns = 0
 
         else:
             netns = 0
 

-        try:
-            if vserver.VServer(sliver['name']).is_running():
-                if 'egre_key' in attrs and 'topo_rspec' in attrs:
-                    logger.log("topo: Update topology for slice %s" % \
-                                   sliver['name'])
-                    update(sliver['name'], data['node_id'], 
-                           attrs['topo_rspec'], attrs['egre_key'], netns)
-        except:
+        if vserver.VServer(sliver['name']).is_running():
+            if 'egre_key' in attrs and 'topo_rspec' in attrs:
+                logger.log("topo: Update topology for slice %s" % \
+                               sliver['name'])
+                update_links(sliver['name'], data['node_id'], 
+                             attrs['topo_rspec'], attrs['egre_key'], netns)
+                update_quagga_configs(sliver['name'], data['hostname'],
+                               data['node_id'], attrs['topo_rspec'], 
+                               attrs['egre_key'], netns)
+            if 'hosts' in attrs:
+                update_hosts(sliver['name'], attrs['hosts'])
+        else:

             logger.log("topo: sliver %s not running yet. Deferring." % \
                            sliver['name'])
 
     clean_up_old_virtual_links()
             logger.log("topo: sliver %s not running yet. Deferring." % \
                            sliver['name'])
 
     clean_up_old_virtual_links()

+    return