X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=topo.py;h=3bda6bb8d35eae06c2adf8813c6c518718fddc5f;hb=efc048541e28a0c102a9ce7026754e3bc3d3e085;hp=5cdc7c10cdfc3f292c575e260f13d460f2e4532a;hpb=c266c5ee9ca642923f2e94c72a3c7e1de9824e97;p=nodemanager-topo.git

diff --git a/topo.py b/topo.py
index 5cdc7c1..3bda6bb 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
@@ -351,7 +351,28 @@ 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
@@ -368,10 +389,14 @@ 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['tagname']] = 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'])
@@ -395,6 +420,7 @@ def GetSlivers(data):
                            sliver['name'])
 
     clean_up_old_virtual_links()
+    write_egre_keys(slicekeys)
     return