X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;h=17a7bafe506bf72940595d420d89d517acc70994;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=b836dc5ddc41b23547488f762e15c0b9db4298fb;hpb=04832c4525d0b35dc3f1d48e64a632b26f120639;p=nodemanager.git

diff --git a/plugins/vsys.py b/plugins/vsys.py
index b836dc5..17a7baf 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -1,10 +1,10 @@
-# $Id$
-# $URL$
-
 """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"
@@ -13,7 +13,10 @@ def start():
     logger.log("vsys: plugin starting up...")
 
 def GetSlivers(data, config=None, plc=None):
-    """For each sliver with the vsys attribute, set the script ACL, create the vsys directory in the slice, and restart vsys."""
+    """
+    For each sliver with the vsys attribute:
+    set the script ACL, create the vsys directory in the slice, and restart vsys
+    """
 
     if 'slivers' not in data:
         logger.log_missing_data("vsys.GetSlivers",'slivers')
@@ -43,12 +46,27 @@ 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
+# keyword being 'start', 'stop' or 'restart'
+def handleService(keyword):
+    if tools.has_systemctl():
+        logger.log("vsys: %s'ing vsys service through systemctl"%keyword)
+        return logger.log_call(["systemctl", keyword, "vsys"], timeout=5)
+    else:
+        logger.log("vsys: %s'ing vsys service through /etc/init.d/vsys"%keyword)
+        return logger.log_call(["/etc/init.d/vsys", keyword], timeout=5)
 
+def startService():
+    return handleService ('start')
+def stopService():
+    return handleService ('stop')
+def restartService():
+    return handleService ('restart')
 
 def createVsysDir(sliver):
-    '''Create /vsys directory in slice.  Update vsys conf file.'''
+    """Create /vsys directory in slice.  Update vsys conf file."""
     try:
         os.mkdir("/vservers/%s/vsys" % sliver)
         return True
@@ -149,3 +167,26 @@ 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 stop vsys if needed (in which case it return True to tell caller to restart vsys once done)
+def removeSliverFromVsys (sliver):
+    current_slivers=parseConf()
+    new_slivers= [ s for s in current_slivers if s != sliver ]
+    if writeConf (current_slivers, new_slivers):
+        stopService()
+        trashVsysHandleInSliver (sliver)
+        return True
+    else:
+        logger.log("vsys.removeSliverFromConf: no need to remove %s"%sliver)
+        return False
+
+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
+    retcod=subprocess.call([ 'rm', '-rf' , slice_vsys_area])
+    logger.log ("vsys.trashVsysHandleInSliver: Removed %s (retcod=%s)"%(slice_vsys_area,retcod))