X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;h=8d4f34cccc05782189583e6c56e029c02e0e2055;hb=23735d93362da4ab1cd84f40d9c6e7fdb005f4ff;hp=e6c4b126361f89d09d3cba01a572f3e6f7fb2c18;hpb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863;p=nodemanager.git

diff --git a/plugins/vsys.py b/plugins/vsys.py
index e6c4b12..8d4f34c 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 """vsys configurator.  Maintains ACLs and script pipes inside vservers based on slice attributes."""
 
 import logger
@@ -9,7 +6,7 @@ import os
 VSYSCONF="/etc/vsys.conf"
 VSYSBKEND="/vsys"
 
-def start(options, conf):
+def start():
     logger.log("vsys: plugin starting up...")
 
 def GetSlivers(data, config=None, plc=None):
@@ -88,13 +85,16 @@ def writeAcls(currentscripts, oldscripts):
     # and length of non intersection along new scripts is not 0,
     # then dicts are different.
     for (acl, oldslivers) in oldscripts.iteritems():
-        if (len(oldslivers) != len(currentscripts[acl])) or \
-        (len(set(oldslivers) - set(currentscripts[acl])) != 0):
-            _restartvsys = True
-            logger.log("vsys: Updating %s.acl w/ slices %s" % (acl, currentscripts[acl]))
-            f = open("%s/%s.acl" % (VSYSBKEND, acl), "w")
-            for slice in currentscripts[acl]: f.write("%s\n" % slice)
-            f.close()
+        try:
+            if (len(oldslivers) != len(currentscripts[acl])) or \
+            (len(set(oldslivers) - set(currentscripts[acl])) != 0):
+                _restartvsys = True
+                logger.log("vsys: Updating %s.acl w/ slices %s" % (acl, currentscripts[acl]))
+                f = open("%s/%s.acl" % (VSYSBKEND, acl), "w")
+                for slice in currentscripts[acl]: f.write("%s\n" % slice)
+                f.close()
+        except KeyError:
+            logger.log("vsys: #:)# Warning,Not a valid Vsys script,%s"%acl)
     # Trigger a restart
     return _restartvsys