Changeset 836 for vanHelsing/trunk

Timestamp:

Mar 12, 2010, 2:28:51 PM (15 years ago)

Author:

slederer

Message:

Funktionierender SOAP-Server mit einer Methode

Location:

vanHelsing/trunk/src

Files:

• VanHelsingServer.py (modified) (2 diffs)
• VanHelsingWrapper.py (moved) (moved from vanHelsing/trunk/src/VanHelsingSOAP.py ) (3 diffs)
• bcfg.py (modified) (1 diff)

vanHelsing/trunk/src/VanHelsingServer.py

@@ -2 +2 @@
 from ZSI.schema import LocalElementDeclaration, ElementDeclaration, TypeDefinition, GTD, GED
 from VanHelsing_server import VanHelsing
+from VanHelsing_types import ns0
+import VanHelsingWrapper
+import sys
 
 ResourceInfo= GTD("http://www.dass-it.de/VanHelsing/", "ResourceInfo")(None).pyclass()
-print ResourceInfo
+listResourcesType= GTD("http://www.dass-it.de/VanHelsing/", "listResourcesType")(None).pyclass()
+#print dir(ResourceInfo)
 
 class VanSOAPRequestHandler(SOAPRequestHandler):
@@ -23 +27 @@
     def soap_listResources(self, ps, **kw):
         request,response=VanHelsing.soap_listResources(self,ps)
-        resInf=ResourceInfo()
-        response._resourceList=[ resInf ]
 
-        print response._resourceList
+        resType=request.get_element_resourceType()
+        resDirector=request.get_element_director()
+        
+        result=VanHelsingWrapper.getResources(resDirector,resType)
+
+        rList=[]
+
+        for rid,name in result:
+
+            resInf=response.new_resourceList()
+            resInf.set_element_director(resDirector)
+            resInf.set_element_resId(rid)
+            resInf.set_element_resType(resType)
+            resInf.set_element_resName(name)
+            rList.append(resInf)
+
+        response.set_element_resourceList(rList)
+
         return request,response
 
 if 1:
+    if len(sys.argv) < 2:
+        filename="test.conf"
+    else:
+        filename=sys.argv[1]   
+
+    VanHelsingWrapper.loadDirectorConfig(filename)
+
     AsServer(port=8080,services=[ RealVanHelsing() ], RequestHandlerClass=VanSOAPRequestHandler)
 

vanHelsing/trunk/src/VanHelsingWrapper.py

@@ -5 +5 @@
 import directive
 import ResourceInfo
-
-import ZSI
-import ZSI.dispatch
 
 import sys
@@ -85 +82 @@
     return dirdcfg.getRoot().getByName(name,resType)[0]   
 
-def listResources(listResourcesType):
-    print listResourcesType
-    return [ r1,r2 ]
-
 # main
 if __name__ == "__main__":
@@ -100 +93 @@
     print getResources("bacula-dir","Client")
 
-    ZSI.dispatch.AsServer(port=8080,docstyle=True)

vanHelsing/trunk/src/bcfg.py

@@ -159 +159 @@
 #
 # nur zum Testen
-from VanHelsingSOAP import *
+from VanHelsingWrapper import *
 
 if __name__ == "__main__":