X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fvsys.py;h=38187633b025a5e1e393644c310ae7855220df77;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hp=6d0ad6cbcec462196f91b3ffdf82121147af0917;hpb=08d6f2b70b86a10b222a5afe80945598296196ad;p=nodemanager.git diff --git a/plugins/vsys.py b/plugins/vsys.py index 6d0ad6c..3818763 100644 --- a/plugins/vsys.py +++ b/plugins/vsys.py @@ -1,10 +1,10 @@ -# $Id$ -# $URL$ - """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" VSYSBKEND="/vsys" @@ -13,10 +13,13 @@ 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') + logger.log_missing_data("vsys.GetSlivers", 'slivers') return # Touch ACLs and create dict of available @@ -27,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']: @@ -36,19 +39,34 @@ def GetSlivers(data, config=None, plc=None): # add to conf slices.append(sliver['name']) _restart = createVsysDir(sliver['name']) or _restart - if attribute['value'] in scripts.keys(): + if attribute['value'] in list(scripts.keys()): scripts[attribute['value']].append(sliver['name']) # Write the conf _restart = writeConf(slices, parseConf()) or _restart # Write out the ACLs if writeAcls(scripts, parseAcls()) or _restart: - logger.log("vsys: restarting vsys service") - logger.log_call(["/etc/init.d/vsys", "restart", ]) + restartService() + +# check for systemctl, use it if present +# keyword being 'start', 'stop' or 'restart' +def handleService(keyword): + if tools.has_systemctl(): + logger.log("vsys: %s'ing vsys service through systemctl"%keyword) + return logger.log_call(["systemctl", keyword, "vsys"], timeout=5) + else: + 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 @@ -87,14 +105,17 @@ def writeAcls(currentscripts, oldscripts): # not the same as length of values of new scripts, # 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() + for (acl, oldslivers) in oldscripts.items(): + 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 @@ -106,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 @@ -124,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() @@ -146,3 +166,26 @@ def parseConf(): f.close() except: logger.log_exc("vsys: failed parseConf") return slicesinconf + + +# 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 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): + 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 + if not os.path.exists(slice_vsys_area): + 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))