X-Git-Url: http://git.onelab.eu/?p=nodemanager-topo.git;a=blobdiff_plain;f=topo.py;h=03c2636d94cd470aaef0cd002ab6d80c2e2acd8a;hp=7bf8bf73e5424621c521ebee27852e34ba62cec6;hb=4e42a4f26fd3ff1784ebd98159cc5a92ade779d2;hpb=e0ef68a4f4784d3bcb13a688650e79aec099980c

diff --git a/topo.py b/topo.py
index 7bf8bf7..03c2636 100755
--- a/topo.py
+++ b/topo.py
@@ -53,7 +53,7 @@ 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, virtip, vnet):
-    logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))
+    logger.log("%s: Set up virtual link to node %s" % (slice, nodeid))
     run(setup_link_cmd + " %s %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
                                                  key, rate, virtip, vnet))
     return
@@ -135,13 +135,13 @@ def clean_up_old_virtual_links():
     for iface in old_ifaces:
         m = re.match(pattern1, iface)
         if m:
-            key = int(m.group(1))
-            node = int(m.group(2))
+            key = m.group(1)
+            node = m.group(2)
             teardown_virtual_link(key, node)
 
         m = re.match(pattern2, iface)
         if m:
-            key = int(m.group(1))
+            key = m.group(1)
             teardown_nat(key)
     return
 
@@ -167,6 +167,11 @@ def update_links(slice, myid, topospec, key, netns):
             logger.log("%s: virtual link to node %s exists" % (slice, nodeid))
             refresh_virtual_link(nodeid, key)
 
+
+"""
+Update NAT interface for the slice
+"""
+def update_nat(slice, myid, key, netns):
     if not nat_exists(key):
         if netns:
             setup_nat(slice, myid, key)
@@ -176,11 +181,12 @@ def update_links(slice, myid, topospec, key, netns):
 
 
 """
-Write /etc/vservers/<slicename>/spaces/net
+Write /etc/vservers/<slicename>/spaces/net.  If the vserver is running and the spaces/net file is modified, we need to restart it.
 """
-def writeConf(slicename, value):
+def write_conf_and_restart(slicename, value):
     SLICEDIR="/etc/vservers/%s/" % slicename
     SPACESDIR="%s/spaces/" % SLICEDIR
+    FILENAME="%s/net" % SPACESDIR
     if os.path.exists(SLICEDIR):
         if not os.path.exists(SPACESDIR):
             try:
@@ -188,13 +194,27 @@ def writeConf(slicename, value):
             except os.error:
                 logger.log("topo: could not create %s\n" % SPACESDIR)
                 return
-        f = open("%s/net" % SPACESDIR, "w")
-        f.write("%s\n" % value)
-        f.close()
-        STATUS="OFF"
-        if value:
-            STATUS="ON"
-        logger.log("%s: network namespace %s\n" % (slicename, STATUS))
+            
+        if os.path.exists(FILENAME) != value:
+            sliver = vserver.VServer(slicename)
+            restart = sliver.is_running()
+            
+            if (restart):
+                sliver.stop()
+                
+            if value:
+                STATUS="ON"
+                f = open(FILENAME, "w")
+                f.close()
+            else:
+                STATUS="OFF"
+                os.remove(FILENAME)
+                
+            logger.log("%s: network namespace %s\n" % (slicename, STATUS))
+
+            if (restart):
+                logger.log("topo: restarting sliver %s\n" % slicename)
+                sliver.start()
 
 
 """
@@ -271,6 +291,7 @@ def write_ospf(filename, myname, ifaces):
     f = open(filename, 'w')
     password = "zebra"
     write_header(f, myname, password)
+    name = None
 
     for name in ifaces:
         f.write ("""!
@@ -281,7 +302,8 @@ def write_ospf(filename, myname, ifaces):
      ip ospf network non-broadcast
 """ % name)
 
-    f.write ("""!
+    if name:
+        f.write ("""!
      router ospf
      ospf router-id %s
 """ % ifaces[name]['local-ip'])
@@ -336,8 +358,30 @@ def update_hosts(slicename, hosts):
     f.close()
     return
 
+"""
+Write /etc/vini/egre-keys.txt, used by vsys topo scripts
+"""
+def write_egre_keys(slicekeys):
+    vini_dir = "/etc/vini" 
+    if not os.path.exists(vini_dir):
+        try:
+            os.mkdir(vini_dir)
+        except os.error:
+            logger.log("topo: could not create %s\n" % vini_dir)
+            return
+    keys_file = "%s/egre-keys.txt" % vini_dir
+    f = open(keys_file, 'w')
+    for slice in slicekeys:
+        f.write("%s %s\n" % (slice, slicekeys[slice]))
+    f.close()
+    return
+
 
+"""
+Executed on NM startup
+"""
 def start(options, config):
+    run ("echo 1 > /proc/sys/net/ipv4/ip_forward")
     pass
 
 
@@ -352,25 +396,32 @@ def GetSlivers(data):
     global ifaces, old_ifaces
     ifaces = old_ifaces = sioc.gifconf()
 
+    slicekeys = {}
     for sliver in data['slivers']:
         attrs = {}
-        for attribute in sliver['attributes']:
-            attrs[attribute['name']] = attribute['value']
+        for tag in sliver['attributes']:
+            attrs[tag['tagname']] = tag['value']
+            if tag['tagname'] == 'egre_key':
+                slicekeys[sliver['name']] = tag['value']
+                
+
         if 'netns' in attrs:
             netns = int(attrs['netns'])
-            writeConf(sliver['name'], netns)
         else:
             netns = 0
+        write_conf_and_restart(sliver['name'], netns)
 
         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 'egre_key' in attrs:
+                logger.log("topo: Update slice %s" % sliver['name'])
+                update_nat(sliver['name'], data['node_id'], attrs['egre_key'],
+                           netns)
+                if 'topo_rspec' in attrs:
+                    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:
@@ -378,6 +429,7 @@ def GetSlivers(data):
                            sliver['name'])
 
     clean_up_old_virtual_links()
+    write_egre_keys(slicekeys)
     return