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

diff --git a/plugins/vsys.py b/plugins/vsys.py
index 6a557b8..c4f25e0 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -46,13 +46,17 @@ def GetSlivers(data, config=None, plc=None):
         restartService()
 
 # check for systemctl, use it if present
-def restartService ():
+# keyword being 'start', 'stop' or 'restart'
+def handleService (keyword):
     if tools.has_systemctl():
-        logger.log("vsys: restarting vsys service through systemctl")
-        logger.log_call(["systemctl", "restart", "vsys"])
+        logger.log("vsys: %s'ing vsys service through systemctl"%keyword)
+        return logger.log_call(["systemctl", keyword, "vsys"])
     else:
-        logger.log("vsys: restarting vsys service through /etc/init.d/vsys")
-        logger.log_call(["/etc/init.d/vsys", "restart", ])
+        logger.log("vsys: %s'ing vsys service through /etc/init.d/vsys"%keyword)
+        return logger.log_call(["/etc/init.d/vsys", keyword])
+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.'''
@@ -160,21 +164,22 @@ def parseConf():
 
 # 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
+# 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):
-        restartService()
+        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
-    ret=subprocess.call([ 'rm', '-rf' , slice_vsys_area])
+    retcod=subprocess.call([ 'rm', '-rf' , slice_vsys_area])
     logger.log ("vsys.trashVsysHandleInSliver: Removed %s (retcod=%s)"%(slice_vsys_area,retcod))