X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;h=ee806e7e2054a5fc999797a512e28c520a2b1032;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=927c7c10ea9e14eceed8271f3f0cfde4a92b7b93;hpb=7acb378c1b5448d23bd1eb0e6583a530604d0511;p=nodemanager.git diff --git a/plugins/vsys.py b/plugins/vsys.py index 927c7c1..ee806e7 100644 --- a/plugins/vsys.py +++ b/plugins/vsys.py @@ -11,10 +11,15 @@ VSYSCONF="/etc/vsys.conf" VSYSBKEND="/vsys" def start(options, conf): - logger.log("vsys plugin starting up...") + 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.""" + + if 'slivers' not in data: + logger.log_missing_data("vsys.GetSlivers",'slivers') + return + # Touch ACLs and create dict of available scripts = {} for script in touchAcls(): scripts[script] = [] @@ -22,6 +27,9 @@ def GetSlivers(data, config=None, plc=None): slices = [] _restart = False # Parse attributes and update dict of scripts + if 'slivers' not in data: + logger.log_missing_data("vsys.GetSlivers",'slivers') + return for sliver in data['slivers']: for attribute in sliver['attributes']: if attribute['tagname'] == 'vsys': @@ -137,5 +145,5 @@ def parseConf(): (path, slice) = line.split() slicesinconf.append(slice) f.close() - except: logger.log_exc() + except: logger.log_exc("vsys: failed parseConf") return slicesinconf