X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wsdl%2Fsfa2wsdl.py;h=2ec130722d2ebde753f8c858e7bdcc53f932a08e;hb=ecc85e0b923922cf7117d29b380f5284edb88f21;hp=f3a6b934020b52ee1a40f3027889fa80cae6452c;hpb=8b53a64fd670bc9e8e6380a695418776d6efb8e8;p=sfa.git
diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py
index f3a6b934..2ec13072 100755
--- a/wsdl/sfa2wsdl.py
+++ b/wsdl/sfa2wsdl.py
@@ -9,16 +9,15 @@ import os, sys
import time
import pdb
import xml.dom.minidom
-import xml.dom.ext
import apistub
import inspect
from types import *
from optparse import OptionParser
-from sfa.util.parameter import Parameter,Mixed
+from sfa.storage.parameter import Parameter, Mixed
-import globals
+plc_ns="http://www.planet-lab.org/sfa"
class SoapError(Exception):
def __init__(self, value):
@@ -41,6 +40,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):
@@ -52,24 +62,24 @@ class WSDLGen:
argname = inbrack
return argname
- def fold_complex_type_names(self,acc, arg):
- name = arg.doc
- if (type(acc)==list):
- acc.append(name)
- else:
- p_i_b = acc.doc
- acc = [p_i_b,name]
- return acc
-
- def fold_complex_type(self,acc, arg):
- name = self.name_complex_type(arg)
- self.complex_types[arg]=name
- if (type(acc)==list):
- acc.append(name)
- else:
- p_i_b = self.name_complex_type(acc)
- acc = [p_i_b,name]
- return acc
+# def fold_complex_type_names(self,acc, arg):
+# name = arg.doc
+# if (type(acc)==list):
+# acc.append(name)
+# else:
+# p_i_b = acc.doc
+# acc = [p_i_b,name]
+# return acc
+#
+# def fold_complex_type(self,acc, arg):
+# name = self.name_complex_type(arg)
+# self.complex_types[arg]=name
+# if (type(acc)==list):
+# acc.append(name)
+# else:
+# p_i_b = self.name_complex_type(acc)
+# acc = [p_i_b,name]
+# return acc
def name_complex_type(self,arg):
@@ -77,21 +87,23 @@ class WSDLGen:
#pdb.set_trace()
if (isinstance(arg, Mixed)):
- inner_types = reduce(self.fold_complex_type, arg)
- inner_names = reduce(self.fold_complex_type_names, arg)
+# inner_types = reduce(self.fold_complex_type, arg)
+# inner_names = reduce(self.fold_complex_type_names, arg)
+ inner_types = [ self.name_complex_type(x) for x in arg ]
+ inner_names = [ x.doc for x in arg ]
if (inner_types[-1]=="none"):
inner_types=inner_types[:-1]
min_args = 0
else:
min_args = 1
- self.num_types=self.num_types+1
+ self.num_types += 1
type_name = "Type%d"%self.num_types
complex_type = types_section.appendChild(self.types.createElement("xsd:complexType"))
complex_type.setAttribute("name", type_name)
choice = complex_type.appendChild(self.types.createElement("xsd:choice"))
- for n,t in zip(inner_names,inner_types):
+ for (n,t) in zip(inner_names,inner_types):
element = choice.appendChild(self.types.createElement("element"))
n = self.filter_argname(n)
element.setAttribute("name", n)
@@ -100,7 +112,7 @@ class WSDLGen:
return "xsdl:%s"%type_name
elif (isinstance(arg, Parameter)):
return (self.name_simple_type(arg.type))
- elif type(arg) == ListType or type(arg) == TupleType:
+ elif type(arg) in ( ListType , TupleType ):
inner_type = self.name_complex_type(arg[0])
self.num_types=self.num_types+1
type_name = "Type%d"%self.num_types
@@ -154,7 +166,7 @@ class WSDLGen:
return "xsd:string"
else:
pdb.set_trace()
- raise SoapError, "Cannot handle %s objects" % arg_type
+ raise SoapError("Cannot handle %s objects" % arg_type)
def param_type(self, arg):
return (self.name_complex_type(arg))
@@ -172,7 +184,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:
@@ -194,7 +206,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")
@@ -202,7 +214,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"))
@@ -218,7 +230,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")
@@ -250,7 +262,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]:
@@ -260,48 +272,50 @@ class WSDLGen:
servport_el.setAttribute("binding", "tns:" + name + "_binding")
soapaddress = servport_el.appendChild(self.wsdl.createElement("soap:address"))
- soapaddress.setAttribute("location", "%s/%s" % (globals.plc_ns,service))
+ soapaddress.setAttribute("location", "%s/%s" % (plc_ns,service))
def compute_wsdl_definitions(self):
wsdl_text_header = """
+
- """ % (globals.plc_ns,globals.plc_ns,globals.plc_ns)
+ """ % (self.interface_name(),plc_ns,plc_ns,plc_ns)
self.wsdl = xml.dom.minidom.parseString(wsdl_text_header)
def compute_wsdl_definitions_and_types(self):
wsdl_text_header = """
+
-
+
- """ % (globals.plc_ns, globals.plc_ns, globals.plc_ns, globals.plc_ns)
+ """ % (self.interface_name(),plc_ns, plc_ns, plc_ns, 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()
@@ -312,9 +326,9 @@ class WSDLGen:
def pretty_print(self):
if (self.wsdl):
- xml.dom.ext.PrettyPrint(self.wsdl)
+ print xml.dom.minidom.Document.toprettyxml(self.wsdl)
else:
- raise Exception("Empty WSDL")
+ raise Exception("Empty WSDL")
def main():
parser = OptionParser()