Changeset 816

Timestamp:

Jan 15, 2010, 4:56:01 PM (14 years ago)

Author:

slederer

Message:

Aufräumen, Funktionen zum Filtern nach Ressourcen-Typ

Location:

vanHelsing/trunk/src

Files:

• bcfg.py (modified) (10 diffs)
• resource.py (modified) (7 diffs)

vanHelsing/trunk/src/bcfg.py

@@ -13 +13 @@
 
 rxp_item = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=(.*)') # xxx = xxx matchen
-rxp_item2 = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=\\s*{(.*)}\\s*') # match key = { a = 1; b= 2}
+rxp_item2 = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=\\s*{(.*)}\\s*') # match type = { a = 1; b= 2}
 rxp_openbrace = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*\\=?\\s*\\{\\s*')    # match xxx {
 rxp_open = re.compile('^\\s*(\\w[\\w ]*\\w+)\\s*$')    # match xxx 
@@ -29 +29 @@
         self.filename = filename
         self.resources = resource.Root(level=0)
-        self.resources.name="<root>"
+        self.resources.type="<root>"
 
     def read(self):
@@ -42 +42 @@
         f.close()
 
-    def getResourceById(self,theid):
-        return self.resources.getById(theid)
-
-    def getResourceByName(self,name):
-        return self.resources.getByName(name)
-
     def getRoot(self):
         return self.resources
@@ -58 +52 @@
 
         newRes=resClass(level+1)
-        newRes.name=resname
+        newRes.type=resname
         curRes.add_item(newRes);
         return newRes
 
     def parse(self,curRes,f,level):
-        #print "START",curRes.name
+        #print "START",curRes.type
 
         while True:
@@ -95 +89 @@
                 #print "item:",name,value
                 newRes=resource.Resource(level+1)
-                newRes.name=name
+                newRes.type=name
                 newRes.value="{"+value+"}"
                 curRes.add_item(newRes)
@@ -121 +115 @@
                 #print "item:",name,value
                 newRes=resource.Resource(level+1)
-                newRes.name=name
+                newRes.type=name
                 newRes.value=value
                 curRes.add_item(newRes)
@@ -162 +156 @@
     pass
 
-def createClient(clientname,clientaddr,catalog,password):
-    newclient=resource.Client(1,"Client")
-    newclient.add("Name",clientname)
-    newclient.add("Address",clientaddr)
-    #newclient.add("FDPort",fdport)
-    newclient.add("Catalog",catalog)
-    newclient.add("Password",'"'+password+'"')
-    return newclient
-
 def genpasswd(len=32):
     charset="01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!/%()=?@"
@@ -178 +163 @@
     return password
 
+
+def createClientConfig(dirdcfg,clientName,clientPassword=genpasswd()):
+    director=dirdcfg.getRoot().getByType("Director")[0]
+    dirdName=director.getName()
+    r=dirdcfg.getRoot().getByName(clientName)
+    if len(r)==1:
+        client=r[0]
+    else:
+        return
+    
+    filename=clientName+".conf"
+    fdcfg=FiledConfig(filename)
+    fdcfg.setDefaults(dirdName,clientPassword,clientName)
+    fdcfg.write()
+
 def createAllClientConfigs(dirdcfg):
-    clients=dirdcfg.getResourceByName("Client")
-    director=dirdcfg.getResourceByName("Director")[0]
+    clients=dirdcfg.getRoot().getByType("Client",1)
+    director=dirdcfg.getRoot().getByType("Director")[0]
     dirdName=director.getName()
 
     for c in clients:
+        print c
         clientName=c.getName()
         if clientName!=None:
-            r=c.getByName("Password")
+            r=c.getByType("Password")
             if len(r)>0:
                 clientPassword=r[0].value
@@ -199 +200 @@
  
 if __name__ == "__main__":
-
     if len(sys.argv) < 2:
         filename="test.conf"
     else:
         filename=sys.argv[1]   
- 
+
     dirdcfg = DirdConfig(filename)
     dirdcfg.read()
 
+    root=dirdcfg.getRoot()
+
     job=resource.Job(1,"Job")
-    job.add("Name",'"test2"')
-    job.add("Client",'"test2"')
-    job.add("JobDefs",'"testdefs"')
-    job.add("FileSet",'"Full Set"')
-
-    root=dirdcfg.getRoot()
+    job.setDefaults("test2-job","test2","testdefs","Full Set")
+
     root.add_item(job)
 
     pwd=genpasswd()
-    newclient=createClient("test-fd","testclient","MyCatalog",pwd)
+    newclient=resource.Client(1,"Client")
+    newclient.setDefaults("test-fd","testclient","MyCatalog",pwd)
     root.add_item(newclient)
 
@@ -227 +226 @@
     fdcfg.write()
 
+
+    createClientConfig(dirdcfg,"gaffel-fd")
+    createClientConfig(dirdcfg,"test-fd")
+
     createAllClientConfigs(dirdcfg)
-
     sys.exit(0)

vanHelsing/trunk/src/resource.py

@@ -9 +9 @@
 
 class Resource(object):
-    DIRECTIVE="Resource"
     serial=0
 
@@ -17 +16 @@
         self.comments = []
         self._recurselevel = level
-        self.name = name
+        self.type = name
         self.value = None
         self.id=Resource.serial
@@ -30 +29 @@
 
         if len(self.items)==0:
-                return indent+self.name+" = "+self.value+"\n";
+                return indent+self.type+" = "+self.value+"\n";
 
-        if self.name.lower() in equalsign_hack:
-            s += indent+self.name + " = {\n";
+        if self.type.lower() in equalsign_hack:
+            s += indent+self.type + " = {\n";
         else:
-            s += indent+self.name + " {\n"
+            s += indent+self.type + " {\n"
         for d in self.items:
             s += str(d)
@@ -49 +48 @@
         self.items.append(item)
 
-    def add(self,key,value):
+    def add(self,type,value):
         newRes=Resource()
-        newRes.name=key
+        newRes.type=type
         newRes.value=value
         newRes._recurselevel=self._recurselevel+1
@@ -66 +65 @@
         return None
 
-    def getByName(self,name):
+    def getByType(self,name,depth=10000):
         result=[]
-        if self.name==name:
+        if self.type==name:
                 result.append(self)
-        for i in self.items:
-                r=i.getByName(name)
+        if depth>0:
+            for i in self.items:
+                r=i.getByType(name,depth-1)
                 if len(r)!=0:
                     for a in r:
@@ -79 +79 @@
     def getName(self):
         for i in self.items:
-            if i.name=="Name":
+            if i.type=="Name":
                 return i.value
         return None
+
+    def getByName(self,name):
+        result=[]
+        if self.getName()==name:
+            result.append(self)
+        for i in self.items:
+            r=i.getByName(name)
+            if len(r)!=0:
+                for a in r:
+                    result.append(a)
+        return result
 
 class Root(Resource):
@@ -91 +102 @@
 
 class Director(Resource):
-    DIRECTIVE="Director"
     pass
 
 class Job(Resource):
-    DIRECTIVE="Job"
-
+    def setDefaults(self,jobName,clientName,jobDefs,fileset):
+        self.add("Name",'"'+jobName+'"')
+        self.add("Client",clientName)
+        self.add("JobDefs",'"'+jobDefs+'"')
+        self.add("FileSet",'"'+fileset+'"')
+        
 class JobDefs(Resource):
-    DIRECTIVE="JobDefs"
+    pass
 
 class Schedule(Resource):
-    DIRECTIVE="Schedule"
+    pass
 
 class FileSet(Resource):
-    DIRECTIVE="FileSet"
+    pass
 
 class Client(Resource):
-    DIRECTIVE="Client"
+    def setDefaults(self,clientname,clientaddr,catalog,password):
+        self.add("Name",clientname)
+        self.add("Address",clientaddr)
+        self.add("Catalog",catalog)
+        self.add("Password",'"'+password+'"')
 
 class Storage(Resource):
-    DIRECTIVE="Storage"
+    pass
 
 class Pool(Resource):
-    DIRECTIVE="Pool"
+    pass
 
 class Catalog(Resource):
-   # ITEMS_DIRD = cdef.dird_cat_items
-    DIRECTIVE="Catalog" 
+    pass
 
 class Messages(Resource):
-    DIRECTIVE="Messages"
+    pass
 
 class Console(Resource):
-    DIRECTIVE="Console"
+    pass
 
 class Counter(Resource):
-    DIRECTIVE="Counter"
+    pass
 
 class Device(Resource):
-    DIRECTIVE="Device"
+    pass
 
 class Autochanger(Resource):
-    DIRECTIVE="Autochanger"
+    pass
 
 class FileDaemon(Resource):
-    DIRECTIVE="FileDaemon"
+    pass
 
-__cls = locals().copy()
-
-directives = [v.DIRECTIVE for k,v in __cls.iteritems() 
-              if k != "Resource" and getattr(v, "DIRECTIVE", None)]