git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get defaults from bwlimit. Also remove checks before issuing bwlimit commands. ...
[nodemanager.git]
/
vsys.py
diff --git
a/vsys.py
b/vsys.py
index
17b3b59
..
b11b959
100644
(file)
--- a/
vsys.py
+++ b/
vsys.py
@@
-24,7
+24,7
@@
def GetSlivers(data):
# Parse attributes and update dict of scripts
for sliver in data['slivers']:
for attribute in sliver['attributes']:
# Parse attributes and update dict of scripts
for sliver in data['slivers']:
for attribute in sliver['attributes']:
- if attribute['name'] == 'vsys':
+ if attribute['
tag
name'] == 'vsys':
if sliver['name'] not in slices:
# add to conf
slices.append(sliver['name'])
if sliver['name'] not in slices:
# add to conf
slices.append(sliver['name'])
@@
-56,6
+56,8
@@
def touchAcls():
scripts = []
for (root, dirs, files) in os.walk(VSYSBKEND):
for file in files:
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"))
else:
if file.endswith(".acl"):
acls.append(file.rstrip(".acl"))
else:
@@
-95,7
+97,7
@@
def parseAcls():
scriptacls = {}
for (root, dirs, files) in os.walk(VSYSBKEND):
for file in files:
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")
scriptacls[scriptname] = []
f = open(root+"/"+file,"r+")
scriptname = file.rstrip(".acl")
scriptacls[scriptname] = []