X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fupdate_ipv6addr_slivertag.py;h=302e500718b1e68ebab31e1e385415a574a53fe4;hb=29f6986a3fe454c286949577628e7a04f190706e;hp=ad728754f43ac866925e004e80e6b3df908a15ac;hpb=cbc6d01d813b85b78bc5268b469b46fc74e33cef;p=nodemanager.git

diff --git a/plugins/update_ipv6addr_slivertag.py b/plugins/update_ipv6addr_slivertag.py
index ad72875..302e500 100644
--- a/plugins/update_ipv6addr_slivertag.py
+++ b/plugins/update_ipv6addr_slivertag.py
@@ -1,5 +1,3 @@
-# -*- python-indent: 4 -*-
-
 """
 Description: Update the IPv6 Address sliver tag accordingly to the IPv6 address set
 update_ipv6addr_slivertag nodemanager plugin
@@ -13,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'
@@ -26,35 +30,40 @@ def start():
     logger.log("update_ipv6addr_slivertag: plugin starting up...")
 
 
-def getSliverTagId(slivertags):
+def get_sliver_tag_id_value(slivertags):
     for slivertag in slivertags:
         if slivertag['tagname']==ipv6addrtag:
-            return slivertag['slice_tag_id']
-    return None
+            return slivertag['slice_tag_id'], slivertag['value']
 
 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']) )
 
-	    # TODO: what about the prefixlen? should we add on it as well?
-	    # here, I'm just taking the ipv6addr (value)
+        # TODO: what about the prefixlen? should we add on it as well?
+        # here, I'm just taking the ipv6addr (value)
         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})
-	    #logger.log(repr(str(slivertags)))
-	    #for tag in slivertags:
-	    #	logger.log(repr(str(tag)))
-
-        ipv6addr = plc.GetSliceIPv6Address(slice['name'])
+        #logger.log(repr(str(slivertags)))
+        #for tag in slivertags:
+            #    logger.log(repr(str(tag)))
+
+        try:
+            slivertag_id,ipv6addr = get_sliver_tag_id_value(slivertags)
+        except:
+            slivertag_id,ipv6addr = None,None
         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)
@@ -63,8 +72,10 @@ def SetSliverTag(plc, data, tagname):
                     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'])
+            result = tools.search_ipv6addr_hosts(slice['name'], value)
+            if result:
+                # if there's any ipv6 address, 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:
@@ -78,18 +89,15 @@ def SetSliverTag(plc, data, tagname):
                            "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']) )
+#        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!")