Chown .ssh to user:slices. SSH will bail otherwise.

[nodemanager.git] / vsys.py

diff --git a/vsys.py b/vsys.py
index 22dd5ed..b11b959 100644 (file)
--- a/vsys.py
+++ b/vsys.py
@@ -17,8 +17,6 @@ def start(options, config):
 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
@@ -26,11 +24,12 @@ def GetSlivers(data):
     # 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'])
+            if attribute['tagname'] == 'vsys':
+                if sliver['name'] not in slices:
+                    # 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['value'] in scripts.keys():
                     scripts[attribute['value']].append(sliver['name'])
@@ -38,7 +37,7 @@ def GetSlivers(data):
     # Write the conf
     writeConf(slices, parseConf())
     # Write out the ACLs
-    if writeAcls(scripts, parseAcls()): 
+    if writeAcls(scripts, parseAcls()):
         logger.log("vsys: restarting vsys service")
         os.system("/etc/init.d/vsys restart")
 
@@ -57,6 +56,8 @@ 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"))
             else:
@@ -96,7 +97,7 @@ def parseAcls():
     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] = []
@@ -134,5 +135,3 @@ def parseConf():
         f.close()
     except: logger.log_exc()
     return slicesinconf
-
-