Changeset 824

Timestamp:

Feb 17, 2010, 5:49:19 PM (15 years ago)

Author:

slederer

Message:

Generierter Server-Code

Location:

vanHelsing/trunk/src

Files:

• ResourceInfo.py (added)
• VanHelsing.wsdl (modified) (2 diffs)
• VanHelsingSOAP.py (added)
• VanHelsingServer.py (added)
• bcfg.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="ResourceName" type="tns:ResourceNameType">
+      <xsd:element name="listResources" type="tns:listResourcesType">
       </xsd:element>
-      <xsd:element name="ResourceResponse"
-        type="tns:Resource">
+      <xsd:element name="listResourcesResponse" type="tns:resourceListType">
       </xsd:element>
-
-      <xsd:complexType name="Resource">
-
+      <xsd:complexType name="listResourcesType">
         <xsd:sequence>
-                <xsd:element name="attributes" type="tns:Attribute"></xsd:element>
+                <xsd:element name="resourceType" type="xsd:string"></xsd:element>
+                <xsd:element name="director" type="xsd:string"></xsd:element>
         </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:int"></xsd:attribute>
-        <xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="director" type="xsd:string"></xsd:attribute>
       </xsd:complexType>
-
-      <xsd:complexType name="Attribute">
-        <xsd:attribute name="key" type="xsd:string"></xsd:attribute>
-        <xsd:attribute name="value" type="xsd:string"></xsd:attribute>
+      <xsd:complexType name="resourceListType">
+        <xsd:sequence>
+                <xsd:element name="resourceList" type="tns:ResourceInfo" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+        </xsd:sequence>
       </xsd:complexType>
-            <xsd:element name="in" type="xsd:string"></xsd:element>
-            <xsd:element name="getResourceByIdResponse">
-                <xsd:complexType>
-                        <xsd:sequence>
-                                <xsd:element name="out" type="xsd:string"></xsd:element>
-                        </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:complexType name="ResourceIdType">
-                <xsd:attribute name="id" type="xsd:int"></xsd:attribute>
-                <xsd:attribute name="director" type="xsd:string"></xsd:attribute>
-            </xsd:complexType>
-            <xsd:element name="ResourceId" type="tns:ResourceIdType"></xsd:element>
-            <xsd:complexType name="ResourceNameType">
-                <xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-                <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-                <xsd:attribute name="director" type="xsd:string"></xsd:attribute>
-            </xsd:complexType>
     
-            <xsd:complexType name="ResourceInfo">
-                <xsd:attribute name="id" type="xsd:int"></xsd:attribute>
-                <xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-                <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-                <xsd:attribute name="director" type="xsd:string"></xsd:attribute>
-            </xsd:complexType>
-    
-            <xsd:attribute name="NewAttribute" type="xsd:string"></xsd:attribute>
-        
-
-    
-            <xsd:element name="in1" type="xsd:string"></xsd:element>
-            <xsd:element name="getResourcesByTypeResponse">
-                <xsd:complexType>
-                        <xsd:sequence>
-                                <xsd:element name="out" type="xsd:string"></xsd:element>
-                        </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="ResourceType" type="tns:ResourceType"></xsd:element>
-            
-            <xsd:complexType name="ResourceType">
-                <xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-                <xsd:attribute name="director" type="xsd:string"></xsd:attribute>
-            </xsd:complexType>
-            <xsd:element name="ResourceListResponse"
-                type="tns:ResourceList">
-            </xsd:element>
-
-            <xsd:complexType name="ResourceList">
-                <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-                        <xsd:element name="resources" type="tns:ResourceInfo"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
+      <xsd:complexType name="ResourceInfo">
+        <xsd:sequence>
+                <xsd:element name="resId" type="xsd:int"></xsd:element>
+                <xsd:element name="resType" type="xsd:string"></xsd:element>
+                <xsd:element name="resName" type="xsd:string"></xsd:element>
+                <xsd:element name="director" type="xsd:string"></xsd:element>
+        </xsd:sequence>
+      </xsd:complexType>
     </xsd:schema>
   </wsdl:types>
-  <wsdl:message name="getResourceByNameRequest">
-    <wsdl:part element="tns:ResourceName" name="resourceName" />
-  </wsdl:message>
-  <wsdl:message name="getResourceByNameResponse">
-    <wsdl:part name="resourceResult" element="tns:ResourceResponse"/>
-  </wsdl:message>
-  <wsdl:message name="getResourceByIdRequest">
-        <wsdl:part name="resourceId" element="tns:ResourceId"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getResourceByIdResponse">
-        <wsdl:part name="resourceResult" element="tns:ResourceResponse"></wsdl:part>
-  </wsdl:message>
   <wsdl:message name="listResourcesRequest">
-        <wsdl:part name="resourceType" element="tns:ResourceType"></wsdl:part>
+    <wsdl:part name="resourceType" element="tns:listResources"/>
   </wsdl:message>
   <wsdl:message name="listResourcesResponse">
-        <wsdl:part name="resourcesResult" element="tns:ResourceListResponse"></wsdl:part>
+    <wsdl:part element="tns:listResourcesResponse" name="resultList"/>
   </wsdl:message>
   <wsdl:portType name="VanHelsing">
-    <wsdl:operation name="getResourceByName">
-      <wsdl:input message="tns:getResourceByNameRequest"/>
-      <wsdl:output message="tns:getResourceByNameResponse"/>
-    </wsdl:operation>
-    <wsdl:operation name="getResourceById">
-        <wsdl:input message="tns:getResourceByIdRequest"></wsdl:input>
-        <wsdl:output message="tns:getResourceByIdResponse"></wsdl:output>
-    </wsdl:operation>
     <wsdl:operation name="listResources">
-        <wsdl:input message="tns:listResourcesRequest"></wsdl:input>
-        <wsdl:output message="tns:listResourcesResponse"></wsdl:output>
+      <wsdl:input message="tns:listResourcesRequest"/>
+      <wsdl:output message="tns:listResourcesResponse"/>
     </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="getResourceByName">
+    <wsdl:operation name="listResources">
       <soap:operation soapAction="http://www.dass-it.de/VanHelsing/NewOperation"/>
       <wsdl:input>
@@ -125 +55 @@
   <wsdl:service name="VanHelsing">
     <wsdl:port binding="tns:VanHelsingSOAP" name="VanHelsingSOAP">
-      <soap:address location="http://www.dass-it.de/VanHelsing"/>
+      <soap:address location="http://localhost:8080/"/>
     </wsdl:port>
   </wsdl:service>

vanHelsing/trunk/src/bcfg.py

@@ -8 +8 @@
 import resource
 import directive
-import random
+
 
 RESOURCE_TYPES = ('dird', 'console', 'filed', 'stored')
@@ -157 +157 @@
     pass
 
-def genpasswd(len=32):
-    charset="01234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!/%()=?@"
-    password=""
-    for a in xrange(0,len):
-       password += random.choice(charset)
-    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.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.getByType("Password")
-            if len(r)>0:
-                clientPassword=r[0].value
-                clientPassword=clientPassword.replace('"','')
-            else:
-                clientPassword=""
-            filename=clientName+".conf"
-            fdcfg=FiledConfig(filename)
-            fdcfg.setDefaults(dirdName,clientPassword,clientName)
-            fdcfg.write()
-
-def getDirectors():
-    return [ "bacula-dir" ];
-
-def loadDirectorConfig(filename):
-    global currentConfig
-    currentConfig=DirdConfig(filename)
-    currentConfig.read()
-
-def getDirectorConfig(directorName):
-    global currentConfig
-    return currentConfig
-
-def getClients(directorName):
-    return getResources(directorName,"Client")
-
-def getResources(directorName,resType):
-    dirdcfg=getDirectorConfig(directorName)
-    resources=dirdcfg.getRoot().getByType(resType,1)
-    result=[]
-    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__":
     if len(sys.argv) < 2: