X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;h=6a557b8eeec9b1f0258eea9dc5b06d08a17b5658;hb=c56fd0606516c61a935b0faff8d4511fe8b5fb70;hp=8d4f34cccc05782189583e6c56e029c02e0e2055;hpb=55afbcaa2f8e9646bec3962e406f150f5d31b47b;p=nodemanager.git

diff --git a/plugins/vsys.py b/plugins/vsys.py
index 8d4f34c..6a557b8 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -1,7 +1,10 @@
 """vsys configurator.  Maintains ACLs and script pipes inside vservers based on slice attributes."""
 
-import logger
 import os
+import subprocess
+
+import logger
+import tools
 
 VSYSCONF="/etc/vsys.conf"
 VSYSBKEND="/vsys"
@@ -40,9 +43,16 @@ def GetSlivers(data, config=None, plc=None):
     _restart = writeConf(slices, parseConf()) or _restart
     # Write out the ACLs
     if writeAcls(scripts, parseAcls()) or _restart:
-        logger.log("vsys: restarting vsys service")
-        logger.log_call(["/etc/init.d/vsys", "restart", ])
+        restartService()
 
+# check for systemctl, use it if present
+def restartService ():
+    if tools.has_systemctl():
+        logger.log("vsys: restarting vsys service through systemctl")
+        logger.log_call(["systemctl", "restart", "vsys"])
+    else:
+        logger.log("vsys: restarting vsys service through /etc/init.d/vsys")
+        logger.log_call(["/etc/init.d/vsys", "restart", ])
 
 def createVsysDir(sliver):
     '''Create /vsys directory in slice.  Update vsys conf file.'''
@@ -146,3 +156,25 @@ def parseConf():
         f.close()
     except: logger.log_exc("vsys: failed parseConf")
     return slicesinconf
+
+
+# before shutting down slivers, it is safe to first remove them from vsys's scope
+# so that we are sure that no dangling open file remains
+# this will also restart vsys if needed
+def removeSliverFromVsys (sliver):
+    current_slivers=parseConf()
+    new_slivers= [ s for s in current_slivers if s != sliver ]
+    if writeConf (current_slivers, new_slivers):
+        restartService()
+        trashVsysHandleInSliver (sliver)
+    else:
+        logger.log("vsys.removeSliverFromConf: no need to remove %s"%sliver)
+
+
+def trashVsysHandleInSliver (sliver):
+    slice_vsys_area = "/vservers/%s/vsys"%sliver
+    if not os.path.exists(slice_vsys_area):
+        logger.log("vsys.trashVsysHandleInSliver: no action needed, %s not found"%slice_vsys_area)
+        return
+    ret=subprocess.call([ 'rm', '-rf' , slice_vsys_area])
+    logger.log ("vsys.trashVsysHandleInSliver: Removed %s (retcod=%s)"%(slice_vsys_area,retcod))