Do not erase manual topology

[nodemanager-topo.git] / create-topo-attributes.py

diff --git a/create-topo-attributes.py b/create-topo-attributes.py
index 2fe6ee3..5f42684 100755 (executable)
--- a/create-topo-attributes.py
+++ b/create-topo-attributes.py
@@ -167,7 +167,7 @@ class Slice:
                 if cap == "CAP_NET_ADMIN":
                     return
             else:
-                newcaps = "CAP_NET_ADMIN," + caps
+                newcaps = "CAP_NET_ADMIN," + tag.value
                 self.update_tag('capabilities', newcaps, slicetags)
         else:
             self.add_tag('capabilities', 'CAP_NET_ADMIN', slicetags)
@@ -378,9 +378,10 @@ for i in slices:
             print "Slice %s not using IIAS" % slice.name
 
     if topo_type == 'manual' and slice.get_tag('egre_key', slicetags):
-        topo_tag = slice.get_tag('topo_rspec', slicetags)
-        if topo_tag:
-            topo_tag.updated = True
+        for node in slice.get_nodes(nodes):
+            topo_tag = slice.get_tag('topo_rspec', slicetags, node)
+            if topo_tag:
+                topo_tag.updated = True
             
 # Update the tag values in the database
 for i in slicetags: