minor fix to sfa2wsdl

[sfa.git] / wsdl / sfa2wsdl.py

diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py
index 21e0995..741cbdf 100755 (executable)
--- a/wsdl/sfa2wsdl.py
+++ b/wsdl/sfa2wsdl.py
@@ -16,7 +16,6 @@ import inspect
 from types import *
 from optparse import OptionParser
 
-from sfa.trust.auth import Auth
 from sfa.util.parameter import Parameter,Mixed
 
 import globals
@@ -42,6 +41,17 @@ class WSDLGen:
     def __init__(self, interface_options):
         self.interface_options = interface_options
 
+    def interface_name (self):
+         if self.interface_options.aggregate and \
+                  self.interface_options.slicemgr and \
+                  self.interface_options.registry:
+              return "complete"
+         if self.interface_options.aggregate: return "aggregate"
+         elif self.interface_options.slicemgr: return "slicemgr"
+         elif self.interface_options.registry: return "registry"
+         elif self.interface_options.component: return "component"
+         else: return "unknown"
+
     def filter_argname(self,argname):
         if (not self.interface_options.lite or (argname!="cred")):
             if (argname.find('(') != -1):
@@ -173,7 +183,7 @@ class WSDLGen:
             #print
 
             
-            in_el = self.wsdl.firstChild.appendChild(self.wsdl.createElement("message"))
+            in_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("message"))
             in_el.setAttribute("name", method + "_in")
 
             for service_name in function.interfaces:
@@ -195,7 +205,7 @@ class WSDLGen:
                     
             # Return type            
             return_type = function.returns
-            out_el = self.wsdl.firstChild.appendChild(self.wsdl.createElement("message"))
+            out_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("message"))
             out_el.setAttribute("name", method + "_out")
             ret_part = out_el.appendChild(self.wsdl.createElement("part"))
             ret_part.setAttribute("name", "Result")
@@ -203,7 +213,7 @@ class WSDLGen:
 
             # Port connecting arguments with return type
 
-            port_el = self.wsdl.firstChild.appendChild(self.wsdl.createElement("portType"))
+            port_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("portType"))
             port_el.setAttribute("name", method + "_port")
             
             op_el = port_el.appendChild(self.wsdl.createElement("operation"))
@@ -219,7 +229,7 @@ class WSDLGen:
 
             # Bindings
 
-            bind_el = self.wsdl.firstChild.appendChild(self.wsdl.createElement("binding"))
+            bind_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("binding"))
             bind_el.setAttribute("name", method + "_binding")
             bind_el.setAttribute("type", "tns:" + method + "_port")
             
@@ -251,7 +261,7 @@ class WSDLGen:
     def add_wsdl_services(self):
         for service in self.services.keys():
             if (getattr(self.interface_options,service)):
-                service_el = self.wsdl.firstChild.appendChild(self.wsdl.createElement("service"))
+                service_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("service"))
                 service_el.setAttribute("name", service)
 
                 for method in self.services[service]:
@@ -266,43 +276,45 @@ class WSDLGen:
 
     def compute_wsdl_definitions(self):
         wsdl_text_header = """
+            <?xml-stylesheet type="text/xsl" href="wsdl2html.xsl"?>
             <wsdl:definitions
-            name="sfa_autogenerated"
-            targetNamespace="%s/2009/07/sfa.wsdl"
+            name="myplc-sfa-%s"
+            targetNamespace="%s/sfa.wsdl"
             xmlns="http://schemas.xmlsoap.org/wsdl/"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsdl="%s/2009/07/schema"
-            xmlns:tns="%s/2009/07/sfa.wsdl"
+            xmlns:xsdl="%s/schema"
+            xmlns:tns="%s/sfa.wsdl"
             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
-            """ % (globals.plc_ns,globals.plc_ns,globals.plc_ns)
+            """ % (self.interface_name(),globals.plc_ns,globals.plc_ns,globals.plc_ns)
             
         self.wsdl = xml.dom.minidom.parseString(wsdl_text_header)
         
 
     def compute_wsdl_definitions_and_types(self):
         wsdl_text_header = """
+        <?xml-stylesheet type="text/xsl" href="wsdl2html.xsl"?>
         <wsdl:definitions
-            name="sfa_autogenerated"
-            targetNamespace="%s/2009/07/sfa.wsdl"
+            name="myplc-sfa-%s"
+            targetNamespace="%s/sfa.wsdl"
             xmlns="http://schemas.xmlsoap.org/wsdl/"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns:xsdl="%s/2009/07/schema"
-            xmlns:tns="%s/2009/07/sfa.wsdl"
+            xmlns:xsdl="%s/schema"
+            xmlns:tns="%s/sfa.wsdl"
             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
             <types>
-                <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="%s/2009/07/schema"/>
+                <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="%s/schema"/>
             </types>
-        </wsdl:definitions> """ % (globals.plc_ns, globals.plc_ns, globals.plc_ns, globals.plc_ns)
+        </wsdl:definitions> """ % (self.interface_name(),globals.plc_ns, globals.plc_ns, globals.plc_ns, globals.plc_ns)
         self.types = xml.dom.minidom.parseString(wsdl_text_header)
         
 
     def add_wsdl_types(self):
         wsdl_types = self.wsdl.importNode(self.types.getElementsByTagName("types")[0], True)
-        self.wsdl.firstChild.appendChild(wsdl_types)
+        self.wsdl.lastChild.appendChild(wsdl_types)
 
     def generate_wsdl(self):
         self.compute_wsdl_definitions_and_types()
@@ -328,6 +340,8 @@ def main():
                               help="Generate am.wsdl")
     parser.add_option("-c", "--component", action="store_true", dest="component",
                               help="Generate cm.wsdl")
+    parser.add_option("-g", "--geni-aggregate", action="store_true", dest="geni_am",
+                      help="Generate gm.wsdl")
     parser.add_option("-l", "--lite", action="store_true", dest="lite",
                               help="Generate LITE version of the interface, in which calls exclude credentials")
     (interface_options, args) = parser.parse_args()