oops, too much messing about

[nodemanager.git] / plugins / vsys.py

diff --git a/plugins/vsys.py b/plugins/vsys.py
index f631d95..17a7baf 100644 (file)
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -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')
@@ -46,16 +49,24 @@ 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"], timeout=5)
     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], 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
@@ -160,16 +171,17 @@ 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