spaces after comma

[nodemanager.git] / plugins / update_ipv6addr_slivertag.py

diff --git a/plugins/update_ipv6addr_slivertag.py b/plugins/update_ipv6addr_slivertag.py
index 859b13d..8182eb2 100644 (file)
--- a/plugins/update_ipv6addr_slivertag.py
+++ b/plugins/update_ipv6addr_slivertag.py
@@ -1,7 +1,7 @@
 """
 Description: Update the IPv6 Address sliver tag accordingly to the IPv6 address set
 update_ipv6addr_slivertag nodemanager plugin
-Version: 0.5
+Version: 0.6
 Author: Guilherme Sperb Machado <gsm@machados.org>
 """
 
@@ -11,11 +11,17 @@ import socket
 import re
 
 import tools
-import libvirt
 import uuid
-from sliver_libvirt import Sliver_Libvirt
 from xml.dom.minidom import parseString
 
+# TODO: is there anything better to do if the "libvirt", "sliver_libvirt",
+# and are not in place in the VS distro?
+try:
+    import libvirt
+    from sliver_libvirt import Sliver_Libvirt
+except:
+    logger.log("Could not import 'sliver_lxc' or 'libvirt'.")
+
 priority=150
 
 ipv6addrtag = 'ipv6_address'
@@ -31,25 +37,38 @@ def get_sliver_tag_id_value(slivertags):
 
 def SetSliverTag(plc, data, tagname):
 
+    virt=tools.get_node_virt()
+    if virt!='lxc':
+        return
+
     for slice in data['slivers']:
-        logger.log("update_ipv6addr_slivertag: starting with slice=%s" % (slice['name']) )
+        #logger.log("update_ipv6addr_slivertag: starting with slice=%s" % (slice['name']) )
+
+        # Check if the slice to be processed in a "system" slice
+        # If so, just loop to the next slice
+        system_slice = False
+        for attribute in slice['attributes']:
+            if attribute['tagname']=='system' and attribute['value']=='1':
+                system_slice = True
+                break
+        if system_slice: continue
 
-        # TODO: what about the prefixlen? should we add on it as well?
+        # TODO: what about the prefixlen? Should we also inform the prefixlen?
         # here, I'm just taking the ipv6addr (value)
-        value,prefixlen = tools.get_sliver_ipv6(slice['name'])
+        value, prefixlen = tools.get_sliver_ipv6(slice['name'])
 
         node_id = tools.node_id()
-        slivertags = plc.GetSliceTags({"name":slice['name'],"node_id":node_id,"tagname":tagname})
+        slivertags = plc.GetSliceTags({"name":slice['name'], "node_id":node_id, "tagname":tagname})
         #logger.log(repr(str(slivertags)))
         #for tag in slivertags:
-            #    logger.log(repr(str(tag)))
+        #    logger.log(repr(str(tag)))
 
         try:
-            slivertag_id,ipv6addr = get_sliver_tag_id_value(slivertags)
+            slivertag_id, ipv6addr = get_sliver_tag_id_value(slivertags)
         except:
-            slivertag_id,ipv6addr = None,None
+            slivertag_id, ipv6addr = None, None
         logger.log("update_ipv6addr_slivertag: slice=%s getSliceIPv6Address=%s" % \
-               (slice['name'],ipv6addr) )
+               (slice['name'], ipv6addr) )
         # if the value to set is null...
         if value is None:
             if ipv6addr is not None:
@@ -71,23 +90,22 @@ def SetSliverTag(plc, data, tagname):
             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)
+                    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) )
+                           "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):
-                plc.UpdateSliceTag(slivertag_id,value)
+                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']) )
+            #logger.log("update_ipv6addr_slivertag: finishing the update process for " +
+            #   "slice=%s" % (slice['name']) )
 
 def GetSlivers(data, config, plc):
     SetSliverTag(plc, data, ipv6addrtag)
-    logger.log("update_ipv6addr_slivertag: all done!")