reviewed Guilherme's code

[nodemanager.git] / plugins / update_ipv6addr_slivertag.py

diff --git a/plugins/update_ipv6addr_slivertag.py b/plugins/update_ipv6addr_slivertag.py
index c10c83d..e96bb63 100644 (file)
--- a/plugins/update_ipv6addr_slivertag.py
+++ b/plugins/update_ipv6addr_slivertag.py
@@ -1,3 +1,5 @@
+# -*- python-indent: 4 -*-
+
 """
 Description: Update the IPv6 Address sliver tag accordingly to the IPv6 address set
 update_ipv6addr_slivertag nodemanager plugin
@@ -25,15 +27,15 @@ def start():
 
 
 def getSliverTagId(slivertags):
-        for slivertag in slivertags:
-                       if slivertag['tagname']==ipv6addrtag:
-                        return slivertag['slice_tag_id']
-       return None
+    for slivertag in slivertags:
+        if slivertag['tagname']==ipv6addrtag:
+            return slivertag['slice_tag_id']
+    return None
 
 def SetSliverTag(plc, data, tagname):
 
     for slice in data['slivers']:
-       logger.log("update_ipv6addr_slivertag: starting the update procedure for slice=%s" % (slice['name']) )
+       logger.log("update_ipv6addr_slivertag: starting with slice=%s" % (slice['name']) )
 
        # TODO: what about the prefixlen? should we add on it as well?
        # here, I'm just taking the ipv6addr (value)
@@ -46,39 +48,45 @@ def SetSliverTag(plc, data, tagname):
        #       logger.log(repr(str(tag)))
 
     ipv6addr = plc.GetSliceIPv6Address(slice['name'])
-    logger.log("update_ipv6addr_slivertag: slice=%s getSliceIPv6Address=%s" % (slice['name'],ipv6addr) )
-       # if the value to set is null...
+    logger.log("update_ipv6addr_slivertag: slice=%s getSliceIPv6Address=%s" % \
+               (slice['name'],ipv6addr) )
+    # if the value to set is null...
     if value is None:
-               if ipv6addr is not None:
-                       # then, let's remove the slice tag
-                       slivertag_id = getSliverTagId(slivertags)
-                       if slivertag_id:
-                               try:
-                                       plc.DeleteSliceTag(slivertag_id)
-                                       logger.log("update_ipv6addr_slivertag: slice tag deleted for slice=%s" % (slice['name']) )
-                               except:
-                                       logger.log("update_ipv6addr_slivertag: slice tag not deleted for slice=%s" % (slice['name']) )
-               # if there's no ipv6 address anymore, then remove everything from the /etc/hosts
-               tools.remove_all_ipv6addr_hosts(slice['name'], data['hostname'])
+        if ipv6addr is not None:
+            # then, let's remove the slice tag
+            slivertag_id = getSliverTagId(slivertags)
+            if slivertag_id:
+                try:
+                    plc.DeleteSliceTag(slivertag_id)
+                    logger.log("update_ipv6addr_slivertag: slice tag deleted for slice=%s" % \
+                               (slice['name']) )
+                except:
+                    logger.log("update_ipv6addr_slivertag: slice tag not deleted for slice=%s" % \
+                               (slice['name']) )
+        # if there's no ipv6 address anymore, then remove everything from the /etc/hosts
+        tools.remove_all_ipv6addr_hosts(slice['name'], data['hostname'])
     else:
-               # if the ipv6 addr set on the slice does not exist yet, so, let's add it
-               if (ipv6addr is None) and len(value)>0:
-                       try:
-                               logger.log("update_ipv6addr_slivertag: slice name=%s" % (slice['name']) )
-                               slivertag_id=plc.AddSliceTag(slice['name'],tagname,value,node_id)
-                               logger.log("update_ipv6addr_slivertag: slice tag added to slice %s" % (slice['name']) )
-                       except:
-                               logger.log("update_ipv6addr_slivertag: could not set ipv6 addr tag to the sliver. slice=%s tag=%s node_id=%d" % (slice['name'],tagname,node_id) )
-               # if the ipv6 addr set on the slice is different on the value provided, let's update it
-               if (ipv6addr is not None) and (len(value)>0) and (ipv6addr!=value):
-                       slivertag_id = getSliverTagId(slivertags)
-                       plc.UpdateSliceTag(slivertag_id,value)
-               # ipv6 entry on /etc/hosts of each slice
-               result = tools.search_ipv6addr_hosts(slice['name'], value)
-               if not result:
-                       tools.remove_all_ipv6addr_hosts(slice['name'], data['hostname'])
-                       tools.add_ipv6addr_hosts_line(slice['name'], data['hostname'], value)
-    logger.log("update_ipv6addr_slivertag: finishing the update process for slice=%s" % (slice['name']) )
+        # if the ipv6 addr set on the slice does not exist yet, so, let's add it
+        if (ipv6addr is None) and len(value)>0:
+            try:
+                logger.log("update_ipv6addr_slivertag: slice name=%s" % (slice['name']) )
+                slivertag_id=plc.AddSliceTag(slice['name'],tagname,value,node_id)
+                logger.log("update_ipv6addr_slivertag: slice tag added to slice %s" % \
+                           (slice['name']) )
+            except:
+                logger.log("update_ipv6addr_slivertag: could not set ipv6 addr tag to sliver. "+
+                           "slice=%s tag=%s node_id=%d" % (slice['name'],tagname,node_id) )
+        # if the ipv6 addr set on the slice is different on the value provided, let's update it
+        if (ipv6addr is not None) and (len(value)>0) and (ipv6addr!=value):
+            slivertag_id = getSliverTagId(slivertags)
+            plc.UpdateSliceTag(slivertag_id,value)
+        # ipv6 entry on /etc/hosts of each slice
+        result = tools.search_ipv6addr_hosts(slice['name'], value)
+        if not result:
+            tools.remove_all_ipv6addr_hosts(slice['name'], data['hostname'])
+            tools.add_ipv6addr_hosts_line(slice['name'], data['hostname'], value)
+    logger.log("update_ipv6addr_slivertag: finishing the update process for " +
+               "slice=%s" % (slice['name']) )
 
 def GetSlivers(data, config, plc):