Changeset 823

Timestamp:

Feb 12, 2010, 2:50:32 PM (15 years ago)

Author:

slederer

Message:

Funktionen für SOAP-API hinzugefügt, Entwurf für WSDL-File

Location:

vanHelsing/trunk/src

Files:

• VanHelsing.wsdl (added)
• bcfg.py (modified) (2 diffs)
• resource.py (modified) (1 diff)
• test.conf (added)

vanHelsing/trunk/src/bcfg.py

@@ -212 +212 @@
 
 def getClients(directorName):
+    return getResources(directorName,"Client")
+
+def getResources(directorName,resType):
     dirdcfg=getDirectorConfig(directorName)
-    clients=dirdcfg.getRoot().getByType("Client",1)
+    resources=dirdcfg.getRoot().getByType(resType,1)
     result=[]
-    for c in clients:
-        result.append((c.id,c.getName()))
+    for r in resources:
+        result.append((r.id,r.getName()))
     return result
+
+def getResourceById(directorName,resId):
+    dirdcfg=getDirectorConfig(directorName)
+    return dirdcfg.getRoot().getById(resId)    
+
+def getResourceByName(directorName,resType,name):
+    dirdcfg=getDirectorConfig(directorName)
+    return dirdcfg.getRoot().getByName(name,resType)[0]   
+
 
 if __name__ == "__main__":
@@ -228 +240 @@
 
     print getClients("bacula-dir")
-
+    print getResources("bacula-dir","Client")
+    print getResources("bacula-dir","Job")
+    print getResourceById("bacula-dir",100)
+    print getResourceByName("Bacula-dir","Client","cryptoserver-fd")
     sys.exit(0)

vanHelsing/trunk/src/resource.py

@@ -83 +83 @@
         return None
 
-    def getByName(self,name):
+    def getByName(self,name,type=None):
         result=[]
-        if self.getName()==name:
+        if self.getName()==name and (type==None or self.type==type):
             result.append(self)
         for i in self.items:
-            r=i.getByName(name)
+            r=i.getByName(name,type)
             if len(r)!=0:
                 for a in r: