X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;fp=plugins%2Fvsys.py;h=4e0a661c69bf7c7f1ac6b2635203672a02ec070d;hb=ac6786141feadccdc48b819ab21a825a54881ded;hp=17a7bafe506bf72940595d420d89d517acc70994;hpb=b885d5d47644343378129c3e38b5676c9b747aea;p=nodemanager.git

diff --git a/plugins/vsys.py b/plugins/vsys.py
index 17a7baf..4e0a661 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -19,7 +19,7 @@ def GetSlivers(data, config=None, plc=None):
     """
 
     if 'slivers' not in data:
-        logger.log_missing_data("vsys.GetSlivers",'slivers')
+        logger.log_missing_data("vsys.GetSlivers", 'slivers')
         return
 
     # Touch ACLs and create dict of available
@@ -30,7 +30,7 @@ def GetSlivers(data, config=None, plc=None):
     _restart = False
     # Parse attributes and update dict of scripts
     if 'slivers' not in data:
-        logger.log_missing_data("vsys.GetSlivers",'slivers')
+        logger.log_missing_data("vsys.GetSlivers", 'slivers')
         return
     for sliver in data['slivers']:
         for attribute in sliver['attributes']:
@@ -127,12 +127,11 @@ def parseAcls():
     for (root, dirs, files) in os.walk(VSYSBKEND):
         for file in files:
             if file.endswith(".acl") and not file.startswith("local_"):
-                f = open(root+"/"+file,"r+")
-                scriptname = file.replace(".acl", "")
-                scriptacls[scriptname] = []
-                for slice in f.readlines():
-                    scriptacls[scriptname].append(slice.rstrip())
-                f.close()
+                with open(root+"/"+file, "r+") as f:
+                    scriptname = file.replace(".acl", "")
+                    scriptacls[scriptname] = []
+                    for slice in f.readlines():
+                        scriptacls[scriptname].append(slice.rstrip())
     # return what scripts are configured for which slices.
     return scriptacls
 
@@ -145,7 +144,7 @@ def writeConf(slivers, oldslivers):
     if (len(slivers) != len(oldslivers)) or \
     (len(set(oldslivers) - set(slivers)) != 0):
         logger.log("vsys:  Updating %s" % VSYSCONF)
-        f = open(VSYSCONF,"w")
+        f = open(VSYSCONF, "w")
         for sliver in slivers:
             f.write("/vservers/%(name)s/vsys %(name)s\n" % {"name": sliver})
         f.truncate()
@@ -189,4 +188,4 @@ def trashVsysHandleInSliver (sliver):
         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))
+    logger.log ("vsys.trashVsysHandleInSliver: Removed %s (retcod=%s)"%(slice_vsys_area, retcod))