git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8647de3
)
Support for local_ scripts
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Fri, 1 Aug 2008 16:36:28 +0000
(16:36 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Fri, 1 Aug 2008 16:36:28 +0000
(16:36 +0000)
vsys.py
patch
|
blob
|
history
diff --git
a/vsys.py
b/vsys.py
index
a2a6b9f
..
c72941c
100644
(file)
--- a/
vsys.py
+++ b/
vsys.py
@@
-30,8
+30,6
@@
def GetSlivers(data):
# add to conf
slices.append(sliver['name'])
_restart = createVsysDir(sliver['name']) or _restart
# add to conf
slices.append(sliver['name'])
_restart = createVsysDir(sliver['name']) or _restart
- # As the name implies, when we find an attribute, we
- # add it to our list of slivers that need vsys
if attribute['value'] in scripts.keys():
scripts[attribute['value']].append(sliver['name'])
if attribute['value'] in scripts.keys():
scripts[attribute['value']].append(sliver['name'])
@@
-60,6
+58,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.replace(".acl", ""))
else:
if file.endswith(".acl"):
acls.append(file.replace(".acl", ""))
else:
@@
-99,7
+99,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.replace(".acl", "")
scriptacls[scriptname] = []
f = open(root+"/"+file,"r+")
scriptname = file.replace(".acl", "")
scriptacls[scriptname] = []