X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=create-topo-attributes.py;h=6d64d99c2e23709116eff25bfa153b6fe13d00c5;hb=6f3e93b60a0293a320cc71947461ad1ffab984d1;hp=380a147a1b98be9edd56b365cd1d38a5f3e43027;hpb=e4d85917a4dc6fe4cd3dd55abb8eb1f957468d15;p=nodemanager-topo.git

diff --git a/create-topo-attributes.py b/create-topo-attributes.py
index 380a147..6d64d99 100755
--- a/create-topo-attributes.py
+++ b/create-topo-attributes.py
@@ -114,11 +114,10 @@ for slice in GetSlices():
         """
         for node in slicenodes:
             topo = []
-            site = get_site(node)
-            for adj in adjacencies[site]:
+            for adj in adjacencies[get_site(node)]:
                 for adj_node in get_sitenodes(adj):
                     if node != adj_node and adj_node in slicenodes:
-                        link = adj_node, get_ipaddr(adj_node)
+                        link = adj_node, get_ipaddr(adj_node), "1Mbit"
                         topo.append(link)
             topo_str = "%s" % topo
             print node, topo_str
@@ -129,9 +128,10 @@ for slice in GetSlices():
                 id = slice['slice_id']
                 AddSliceAttribute(id, 'topo_rspec', topo_str, node)
 
-        """ Remove old topo_rspec entries """
-        for node in topo_attr:
-            DeleteSliceAttribute(topo_attr[node])
-
     else:
         print "No EGRE key for %s" % slice['name']
+
+    """ Remove old topo_rspec entries """
+    for node in topo_attr:
+        DeleteSliceAttribute(topo_attr[node])
+