def GetSlivers(data):
"""For each sliver with the vsys attribute, set the script ACL, create the vsys directory in the slice, and restart vsys."""
# Touch ACLs and create dict of available
- # XXX ...Sigh... fromkeys will use an immutable
- #scripts = dict.fromkeys(touchAcls(),[])A
scripts = {}
for script in touchAcls(): scripts[script] = []
# slices that need to be written to the conf
slices = []
+ _restart = False
# Parse attributes and update dict of scripts
for sliver in data['slivers']:
for attribute in sliver['attributes']:
- if attribute['name'] == 'vsys':
- # add to conf
- slices.append(sliver['name'])
- # As the name implies, when we find an attribute, we
- createVsysDir(sliver['name'])
- # add it to our list of slivers that need vsys
+ if attribute['tagname'] == 'vsys':
+ if sliver['name'] not in slices:
+ # add to conf
+ slices.append(sliver['name'])
+ _restart = createVsysDir(sliver['name']) or _restart
if attribute['value'] in scripts.keys():
scripts[attribute['value']].append(sliver['name'])
# Write the conf
- writeConf(slices, parseConf())
+ _restart = writeConf(slices, parseConf()) or _restart
# Write out the ACLs
- if writeAcls(scripts, parseAcls()):
+ if writeAcls(scripts, parseAcls()) or _restart:
logger.log("vsys: restarting vsys service")
os.system("/etc/init.d/vsys restart")
def createVsysDir(sliver):
'''Create /vsys directory in slice. Update vsys conf file.'''
- try: os.makedirs("/vservers/%s/vsys" % sliver)
- except OSError: pass
+ try:
+ os.mkdir("/vservers/%s/vsys" % sliver)
+ return True
+ except OSError:
+ return False
def touchAcls():
scripts = []
for (root, dirs, files) in os.walk(VSYSBKEND):
for file in files:
+ # ingore scripts that start with local_
+ if file.startswith("local_"): continue
if file.endswith(".acl"):
- acls.append(file.rstrip(".acl"))
+ acls.append(file.replace(".acl", ""))
else:
scripts.append(file)
for new in (Set(scripts) - Set(acls)):
scriptacls = {}
for (root, dirs, files) in os.walk(VSYSBKEND):
for file in files:
- if file.endswith(".acl"):
+ if file.endswith(".acl") and not file.startswith("local_"):
f = open(root+"/"+file,"r+")
- scriptname = file.rstrip(".acl")
+ scriptname = file.replace(".acl", "")
scriptacls[scriptname] = []
for slice in f.readlines():
scriptacls[scriptname].append(slice.rstrip())
f.write("/vservers/%(name)s/vsys %(name)s\n" % {"name": sliver})
f.truncate()
f.close()
+ return True
+ else:
+ return False
def parseConf():
f.close()
except: logger.log_exc()
return slicesinconf
-
-