Changeset 855

Timestamp:

Mar 26, 2010, 6:42:38 PM (15 years ago)

Author:

tobias

Message:

node replacement added.

Location:

vanHelsing/trunk/src

Files:

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

vanHelsing/trunk/src/VanHelsing.wsdl

@@ -3 +3 @@
   <wsdl:types>
     <xsd:schema targetNamespace="http://www.dass-it.de/VanHelsing/">
-      <xsd:element name="listResources" type="tns:listResourcesType">
-      </xsd:element>
-      <xsd:element name="listResourcesResponse" type="tns:resourceListType">
-      </xsd:element>
+      <xsd:element name="listResources" type="tns:listResourcesType"></xsd:element>
+      <xsd:element name="listResourcesResponse" type="tns:resourceListType"></xsd:element>
       <xsd:complexType name="listResourcesType">
         <xsd:sequence>
@@ -51 +49 @@
         </xsd:sequence>
       </xsd:complexType>
+      <xsd:element name="setSimpleResource">
+              <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:element name="setSimpleResourceResponse">
+              <xsd:complexType>
+                      <xsd:sequence>
+                              <xsd:element name="resId" type="xsd:int"></xsd:element>
+                              <xsd:element name="status" type="xsd:string"></xsd:element>
+                      </xsd:sequence>
+              </xsd:complexType>
+      </xsd:element>
     </xsd:schema>
   </wsdl:types>
@@ -65 +79 @@
         <wsdl:part name="parameters" element="tns:getSimpleResourceResponse"></wsdl:part>
   </wsdl:message>
+  <wsdl:message name="setSimpleResourceRequest">
+          <wsdl:part name="newResource" element="tns:setSimpleResource"></wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="setSimpleResourceResponse">
+          <wsdl:part name="setResponse" element="tns:setSimpleResourceResponse"></wsdl:part>
+  </wsdl:message>
   <wsdl:portType name="VanHelsing">
+
     <wsdl:operation name="listResources">
       <wsdl:input message="tns:listResourcesRequest"/>
@@ -73 +94 @@
         <wsdl:input message="tns:getSimpleResourceRequest"></wsdl:input>
         <wsdl:output message="tns:getSimpleResourceResponse"></wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="setSimpleResource">
+        <wsdl:input message="tns:setSimpleResourceRequest"></wsdl:input>
+        <wsdl:output message="tns:setSimpleResourceResponse"></wsdl:output>
     </wsdl:operation>
   </wsdl:portType>
@@ -98 +123 @@
                 </wsdl:output>
         </wsdl:operation>
+        <wsdl:operation name="setSimpleResource">
+                <soap:operation 
+                        soapAction="http://www.dass-it.de/VanHelsing/setResource" />
+                <wsdl:input>
+                        <soap:body use="literal" />
+                </wsdl:input>
+                <wsdl:output>
+                        <soap:body use="literal" />
+                </wsdl:output>
+        </wsdl:operation>l
   </wsdl:binding>
   <wsdl:service name="VanHelsing">

vanHelsing/trunk/src/VanHelsingServer.py

@@ -79 +79 @@
         return request,response
 
+    def soap_setSimpleResource(self, ps, **kw):
+        request,response=VanHelsing.soap_setSimpleResource(self, ps)
 
+        resInfo = request.get_element_resInfo()
+        resId = resInfo.get_element_resId()
+        director = resInfo.get_element_director()
+        attributes = request.get_element_resAttribute()
 
+        resId, status = VanHelsingWrapper.setResourceById(resId, director, attributes, resInfo)
+        response.set_element_resId(resId)
+        response.set_element_status(status)
+
+        return request, response
 
 if 1:

vanHelsing/trunk/src/VanHelsingWrapper.py

@@ -13 +13 @@
     password=""
     for a in xrange(0,len):
-       password += random.choice(charset)
+        password += random.choice(charset)
     return password
 
@@ -86 +86 @@
 def getResourceById(directorName,resId):
     dirdcfg=getDirectorConfig(directorName)
-    return dirdcfg.getRoot().getById(resId)    
+    return dirdcfg.getRoot().getById(resId)
+
+def setResourceById(resId, directorName, attributes, resInfo):
+    if resId > 0:
+        myResource = getResourceById(directorName, resId)
+        myResource.items = []
+        for a in attributes:
+            k = a.get_element_key()
+            v = a.get_element_value()
+            myResource.add(k, v)
+
+    else:
+        resource = resource.Resource()
+        resource.name = resInfo.get_element_resName()
+        setResourceById(resource.getId, directorName, attributes, resInfo)
+        
+    status = "wtf"
+    
+    return resId, status
 
 def getResourceByName(directorName,resType,name):
@@ -103 +121 @@
     clientIds=getResources("bacula-dir","Client")
         
-    c=getResourceById("bacula-dir",clientIds[0][0])
-    print c
-    print keyValueList(c)
-
+    #c=getResourceById("bacula-dir",clientIds[0][0])
+    #print c
+    #print keyValueList(c)
+    attList = [("name", "klaus"), ("director", "bernd"), ("FileSet","homeAll")]
+    resId, status = setResourceById(100, "bacula-dir", attList)

vanHelsing/trunk/src/VanHelsing_server.py

@@ -3 +3 @@
 #
 # skeleton generated by "ZSI.generate.wsdl2dispatch.ServiceModuleWriter"
-#      /usr/bin/wsdl2py -b VanHelsing.wsdl
+#      /usr/local/bin/wsdl2py -b VanHelsing.wsdl
 #
 ##################################################
@@ -20 +20 @@
 
 getSimpleResourceResponse = GED("http://www.dass-it.de/VanHelsing/", "getSimpleResourceResponse").pyclass
+
+setSimpleResourceRequest = GED("http://www.dass-it.de/VanHelsing/", "setSimpleResource").pyclass
+
+setSimpleResourceResponse = GED("http://www.dass-it.de/VanHelsing/", "setSimpleResourceResponse").pyclass
 
 
@@ -44 +48 @@
     root[(getSimpleResourceRequest.typecode.nspname,getSimpleResourceRequest.typecode.pname)] = 'soap_getSimpleResource'
 
+    def soap_setSimpleResource(self, ps, **kw):
+        request = ps.Parse(setSimpleResourceRequest.typecode)
+        return request,setSimpleResourceResponse()
+
+    soapAction['http://www.dass-it.de/VanHelsing/setResource'] = 'soap_setSimpleResource'
+    root[(setSimpleResourceRequest.typecode.nspname,setSimpleResourceRequest.typecode.pname)] = 'soap_setSimpleResource'
+

vanHelsing/trunk/src/VanHelsing_types.py

@@ -3 +3 @@
 #
 # schema types generated by "ZSI.generate.wsdl2python.WriteServiceModule"
-#    /usr/bin/wsdl2py -b VanHelsing.wsdl
+#    /usr/local/bin/wsdl2py -b VanHelsing.wsdl
 #
 ##################################################
@@ -192 +192 @@
             self.pyclass = Holder
 
+    class setSimpleResource_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration):
+        literal = "setSimpleResource"
+        schema = "http://www.dass-it.de/VanHelsing/"
+        def __init__(self, **kw):
+            ns = ns0.setSimpleResource_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/","setSimpleResource")
+            kw["aname"] = "_setSimpleResource"
+            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__ = "setSimpleResource_Holder"
+            self.pyclass = Holder
+
+    class setSimpleResourceResponse_Dec(ZSI.TCcompound.ComplexType, ElementDeclaration):
+        literal = "setSimpleResourceResponse"
+        schema = "http://www.dass-it.de/VanHelsing/"
+        def __init__(self, **kw):
+            ns = ns0.setSimpleResourceResponse_Dec.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="status", aname="_status", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
+            kw["pname"] = ("http://www.dass-it.de/VanHelsing/","setSimpleResourceResponse")
+            kw["aname"] = "_setSimpleResourceResponse"
+            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._resId = None
+                    self._status = None
+                    return
+            Holder.__name__ = "setSimpleResourceResponse_Holder"
+            self.pyclass = Holder
+
 # end class ns0 (tns: http://www.dass-it.de/VanHelsing/)