Changeset 839

Timestamp:

Mar 12, 2010, 5:11:50 PM (15 years ago)

Author:

slederer

Message:

neue SOAP-Operation getSimpleResource implementiert

Location:

vanHelsing/trunk/src

Files:

• VanHelsing.wsdl (modified) (3 diffs)
• VanHelsingServer.py (modified) (1 diff)
• VanHelsingWrapper.py (modified) (2 diffs)
• VanHelsing_server.py (modified) (2 diffs)
• VanHelsing_types.py (modified) (2 diffs)

vanHelsing/trunk/src/VanHelsing.wsdl

@@ -27 +27 @@
         </xsd:sequence>
       </xsd:complexType>
+      <xsd:element name="getSimpleResource" type="tns:getResourceType"></xsd:element>
+      <xsd:element name="getSimpleResourceResponse">
+        <xsd:complexType>
+                <xsd:sequence>
+                        <xsd:element name="resInfo" type="tns:ResourceInfo"></xsd:element>
+                        <xsd:element name="resAttribute" type="tns:ResourceAttributeType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+                </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    
+      <xsd:complexType name="ResourceAttributeType">
+        <xsd:sequence>
+                <xsd:element name="key" type="xsd:string"></xsd:element>
+                <xsd:element name="value" type="xsd:string"></xsd:element>
+        </xsd:sequence>
+      </xsd:complexType>
+    
+    
+      <xsd:complexType name="getResourceType">
+        <xsd:sequence>
+                <xsd:element name="resId" type="xsd:int"></xsd:element>
+                <xsd:element name="director" type="xsd:string"></xsd:element>
+        </xsd:sequence>
+      </xsd:complexType>
     </xsd:schema>
   </wsdl:types>
@@ -35 +59 @@
     <wsdl:part element="tns:listResourcesResponse" name="resultList"/>
   </wsdl:message>
+  <wsdl:message name="getSimpleResourceRequest">
+        <wsdl:part name="resourceId" element="tns:getSimpleResource"></wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getSimpleResourceResponse">
+        <wsdl:part name="parameters" element="tns:getSimpleResourceResponse"></wsdl:part>
+  </wsdl:message>
   <wsdl:portType name="VanHelsing">
     <wsdl:operation name="listResources">
@@ -40 +70 @@
       <wsdl:output message="tns:listResourcesResponse"/>
     </wsdl:operation>
+    <wsdl:operation name="getSimpleResource">
+        <wsdl:input message="tns:getSimpleResourceRequest"></wsdl:input>
+        <wsdl:output message="tns:getSimpleResourceResponse"></wsdl:output>
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="VanHelsingSOAP" type="tns:VanHelsing">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="listResources">
-      <soap:operation soapAction="http://localhost:8080/"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
+        <soap:binding style="document"
+                transport="http://schemas.xmlsoap.org/soap/http" />
+        <wsdl:operation name="listResources">
+                <soap:operation
+                        soapAction="http://www.dass-it.de/VanHelsing/listResources" />
+                <wsdl:input>
+                        <soap:body use="literal" />
+                </wsdl:input>
+                <wsdl:output>
+                        <soap:body use="literal" />
+                </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="getSimpleResource">
+                <soap:operation
+                        soapAction="http://www.dass-it.de/VanHelsing/getResource" />
+                <wsdl:input>
+                        <soap:body use="literal" />
+                </wsdl:input>
+                <wsdl:output>
+                        <soap:body use="literal" />
+                </wsdl:output>
+        </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="VanHelsing">

vanHelsing/trunk/src/VanHelsingServer.py

@@ -48 +48 @@
         return request,response
 
+    def soap_getSimpleResource(self, ps, **kw):
+        request,response=VanHelsing.soap_getSimpleResource(self,ps)
+
+        resId=request.get_element_resId()
+        resDirector=request.get_element_director()
+
+        print resId
+
+        resource=VanHelsingWrapper.getResourceById(resDirector,resId)
+        attributes=VanHelsingWrapper.keyValueList(resource)
+
+        resInf=response.new_resInfo()
+        print dir(response)
+        resInf.set_element_director(resDirector)
+        resInf.set_element_resId(resId)
+        resInf.set_element_resType("type")
+        resInf.set_element_resName("name")
+
+        response.set_element_resInfo(resInf)
+
+        attrlist=[]
+
+        for k,v in attributes:
+            resAttr=response.new_resAttribute()
+            resAttr.set_element_key(k)
+            resAttr.set_element_value(v)
+            attrlist.append(resAttr)
+        response.set_element_resAttribute(attrlist)
+
+        return request,response
+
+
+
+
 if 1:
     if len(sys.argv) < 2:

vanHelsing/trunk/src/VanHelsingWrapper.py

@@ -74 +74 @@
     return result
 
+def keyValueList(res):
+    result=[]
+    for i in res.items:
+        #if i.type=="Name":
+        #    continue
+
+        result.append((i.type,i.value))
+
+    return result
+
 def getResourceById(directorName,resId):
     dirdcfg=getDirectorConfig(directorName)
@@ -91 +101 @@
     loadDirectorConfig(filename)
 
-    print getResources("bacula-dir","Client")
+    clientIds=getResources("bacula-dir","Client")
+        
+    c=getResourceById("bacula-dir",clientIds[0][0])
+    print c
+    print keyValueList(c)
 

vanHelsing/trunk/src/VanHelsing_server.py

@@ -17 +17 @@
 listResourcesResponse = GED("http://www.dass-it.de/VanHelsing/", "listResourcesResponse").pyclass
 
+getSimpleResourceRequest = GED("http://www.dass-it.de/VanHelsing/", "getSimpleResource").pyclass
+
+getSimpleResourceResponse = GED("http://www.dass-it.de/VanHelsing/", "getSimpleResourceResponse").pyclass
+
 
 # Service Skeletons
@@ -30 +34 @@
         return request,listResourcesResponse()
 
-    soapAction['http://localhost:8080/'] = 'soap_listResources'
+    soapAction['http://www.dass-it.de/VanHelsing/listResources'] = 'soap_listResources'
     root[(listResourcesRequest.typecode.nspname,listResourcesRequest.typecode.pname)] = 'soap_listResources'
 
+    def soap_getSimpleResource(self, ps, **kw):
+        request = ps.Parse(getSimpleResourceRequest.typecode)
+        return request,getSimpleResourceResponse()
+
+    soapAction['http://www.dass-it.de/VanHelsing/getResource'] = 'soap_getSimpleResource'
+    root[(getSimpleResourceRequest.typecode.nspname,getSimpleResourceRequest.typecode.pname)] = 'soap_getSimpleResource'
+

vanHelsing/trunk/src/VanHelsing_types.py

@@ -84 +84 @@
             self.pyclass = Holder
 
+    class ResourceAttributeType_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
+        schema = "http://www.dass-it.de/VanHelsing/"
+        type = (schema, "ResourceAttributeType")
+        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
+            ns = ns0.ResourceAttributeType_Def.schema
+            TClist = [ZSI.TC.String(pname="key", aname="_key", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="value", aname="_value", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
+            self.attribute_typecode_dict = attributes or {}
+            if extend: TClist += ofwhat
+            if restrict: TClist = ofwhat
+            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
+            class Holder:
+                __metaclass__ = pyclass_type
+                typecode = self
+                def __init__(self):
+                    # pyclass
+                    self._key = None
+                    self._value = None
+                    return
+            Holder.__name__ = "ResourceAttributeType_Holder"
+            self.pyclass = Holder
+
+    class getResourceType_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
+        schema = "http://www.dass-it.de/VanHelsing/"
+        type = (schema, "getResourceType")
+        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
+            ns = ns0.getResourceType_Def.schema
+            TClist = [ZSI.TCnumbers.Iint(pname="resId", aname="_resId", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="director", aname="_director", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
+            self.attribute_typecode_dict = attributes or {}
+            if extend: TClist += ofwhat
+            if restrict: TClist = ofwhat
+            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
+            class Holder:
+                __metaclass__ = pyclass_type
+                typecode = self
+                def __init__(self):
+                    # pyclass
+                    self._resId = None
+                    self._director = None
+                    return
+            Holder.__name__ = "getResourceType_Holder"
+            self.pyclass = Holder
+
     class listResources_Dec(ElementDeclaration):
         literal = "listResources"
@@ -114 +156 @@
             if self.pyclass is not None: self.pyclass.__name__ = "listResourcesResponse_Dec_Holder"
 
+    class getSimpleResource_Dec(ElementDeclaration):
+        literal = "getSimpleResource"
+        schema = "http://www.dass-it.de/VanHelsing/"
+        substitutionGroup = None
+        def __init__(self, **kw):
+            kw["pname"] = ("http://www.dass-it.de/VanHelsing/","getSimpleResource")
+            kw["aname"] = "_getSimpleResource"
+            if ns0.getResourceType_Def not in ns0.getSimpleResource_Dec.__bases__:
+                bases = list(ns0.getSimpleResource_Dec.__bases__)
+                bases.insert(0, ns0.getResourceType_Def)
+                ns0.getSimpleResource_Dec.__bases__ = tuple(bases)
+
+            ns0.getResourceType_Def.__init__(self, **kw)
+            if self.pyclass is not None: self.pyclass.__name__ = "getSimpleResource_Dec_Holder"
+
+    class getSimpleResourceResponse_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration):
+        literal = "getSimpleResourceResponse"
+        schema = "http://www.dass-it.de/VanHelsing/"
+        def __init__(self, **kw):
+            ns = ns0.getSimpleResourceResponse_Dec.schema
+            TClist = [GTD("http://www.dass-it.de/VanHelsing/","ResourceInfo",lazy=False)(pname="resInfo", aname="_resInfo", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.dass-it.de/VanHelsing/","ResourceAttributeType",lazy=False)(pname="resAttribute", aname="_resAttribute", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))]
+            kw["pname"] = ("http://www.dass-it.de/VanHelsing/","getSimpleResourceResponse")
+            kw["aname"] = "_getSimpleResourceResponse"
+            self.attribute_typecode_dict = {}
+            ZSI.TCcompound.ComplexType.__init__(self,None,TClist,inorder=0,**kw)
+            class Holder:
+                __metaclass__ = pyclass_type
+                typecode = self
+                def __init__(self):
+                    # pyclass
+                    self._resInfo = None
+                    self._resAttribute = []
+                    return
+            Holder.__name__ = "getSimpleResourceResponse_Holder"
+            self.pyclass = Holder
+
 # end class ns0 (tns: http://www.dass-it.de/VanHelsing/)