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

diff --git a/plugins/vsys.py b/plugins/vsys.py
index bac56a9..6a557b8 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -1,7 +1,9 @@
 """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"
@@ -163,16 +165,16 @@ def removeSliverFromVsys (sliver):
     current_slivers=parseConf()
     new_slivers= [ s for s in current_slivers if s != sliver ]
     if writeConf (current_slivers, new_slivers):
-        trashSliverVsys (sliver)
         restartService()
+        trashVsysHandleInSliver (sliver)
     else:
         logger.log("vsys.removeSliverFromConf: no need to remove %s"%sliver)
 
 
-def trashSliverVsys (sliver):
+def trashVsysHandleInSliver (sliver):
     slice_vsys_area = "/vservers/%s/vsys"%sliver
     if not os.path.exists(slice_vsys_area):
-        logger.log("vsys.trashSliverVsys: no action needed, %s not found"%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.trashSliverVsys: Removed %s (retcod=%s)"%(slice_vsys_area,retcod))
+    logger.log ("vsys.trashVsysHandleInSliver: Removed %s (retcod=%s)"%(slice_vsys_area,retcod))