From d919e8df04d1da8626e1e7a1e41865792cb91fa2 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 28 Mar 2019 18:51:21 +0100 Subject: [PATCH] trash wsdl --- .gitignore | 4 +- Makefile | 18 +-- sfa.spec | 1 - sfa/server/sfaserver.py | 2 + wsdl/Makefile | 64 -------- wsdl/apistub.py | 12 -- wsdl/index.html | 15 -- wsdl/sfa2wsdl.py | 350 ---------------------------------------- wsdl/wsdl2html.xsl | 48 ------ 9 files changed, 6 insertions(+), 508 deletions(-) delete mode 100644 wsdl/Makefile delete mode 100644 wsdl/apistub.py delete mode 100644 wsdl/index.html delete mode 100755 wsdl/sfa2wsdl.py delete mode 100644 wsdl/wsdl2html.xsl diff --git a/.gitignore b/.gitignore index 936f43a2..e00b57e5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,7 @@ build/* TAGS *~ /sfa/util/version.py -wsdl/*.wsdl -wsdl/*.xml -wsdl/[ars]*.html +wsdl/* sfa/client/*.version *.png *.svg diff --git a/Makefile b/Makefile index 1de20547..3a7384bc 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,11 @@ DESTDIR="/" PREFIX=/usr ########## -all: python wsdl +all: python -install: python-install wsdl-install tests-install +install: python-install tests-install -clean: python-clean wsdl-clean +clean: python-clean uninstall: python-uninstall tests-uninstall @@ -45,18 +45,6 @@ version-clean: rm -f sfa/util/version.py .PHONY: python version python-install python-clean version-clean -########## -wsdl: - $(MAKE) -C wsdl - -# propagate DESTDIR from the specfile -wsdl-install: - $(MAKE) -C wsdl install - -wsdl-clean: - $(MAKE) -C wsdl clean - -.PHONY: wsdl wsdl-install wsdl-clean ########## tests-install: diff --git a/sfa.spec b/sfa.spec index afa927a2..721f82b1 100644 --- a/sfa.spec +++ b/sfa.spec @@ -141,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT %config (noreplace) /etc/sfa/api_versions.xml /usr/share/sfa/migrations /usr/share/sfa/examples -/var/www/html/wsdl/*.wsdl %files common %{python_sitelib}/sfa/__init__.py* diff --git a/sfa/server/sfaserver.py b/sfa/server/sfaserver.py index 1fec2c06..b71c2506 100644 --- a/sfa/server/sfaserver.py +++ b/sfa/server/sfaserver.py @@ -60,4 +60,6 @@ class SfaServer(threading.Thread): # Execute the server, serving requests forever. def run(self): + print("IN") self.server.serve_forever() + print("OUT") diff --git a/wsdl/Makefile b/wsdl/Makefile deleted file mode 100644 index 78dc70d3..00000000 --- a/wsdl/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# attempt to update at build-time - -INTERFACES=sfa registry aggregate - -WSDLS = $(foreach interface,$(INTERFACES),$(interface).wsdl) -HTMLS = $(foreach interface,$(INTERFACES),$(interface).html) - -all: $(WSDLS) $(HTMLS) - -# temporary: turn off wsdl generation as it is failing -#TEMPORARY_OFF = yes - -ifdef TEMPORARY_OFF -registry.wsdl aggregate.wsdl sfa.wsdl: - touch $@ -else -registry.wsdl: sfa2wsdl.py - PYTHONPATH=../ ./sfa2wsdl.py --registry > $@ - -aggregate.wsdl: sfa2wsdl.py - PYTHONPATH=../ ./sfa2wsdl.py --aggregate > $@ - -sfa.wsdl: sfa2wsdl.py - PYTHONPATH=../ ./sfa2wsdl.py --registry --aggregate > $@ -endif - -#################### install -# DESTDIR set but the calling Makefile in ../ -INSTALL_PATH=/var/www/html/wsdl -INSTALLED=$(foreach wsdl,$(WSDLS),$(DESTDIR)$(INSTALL_PATH)/$(wsdl)) - -install: $(INSTALLED) - -$(DESTDIR)$(INSTALL_PATH): - install -d -m 0755 $(DESTDIR)$(INSTALL_PATH) - -$(DESTDIR)$(INSTALL_PATH)/%: wsdl=$(notdir $@) -$(DESTDIR)$(INSTALL_PATH)/%: $(DESTDIR)$(INSTALL_PATH) % - install -c -m 0755 $(wsdl) $@ - -#################### clean -clean:: - rm -f $(WSDLS) - -install-clean: - rm -f $(INSTALLED) - -.PHONY: all clean install install-clean - -#################### generate html document -%.html: %.wsdl wsdl2html.xsl - xsltproc $(XSLTFLAGS) wsdl2html.xsl $*.wsdl > $@ || rm $@ - -clean:: - rm -f $(HTMLS) - - -backup: - $(foreach wsdl,$(WSDLS), cp $(wsdl) $(wsdl).bak;) - $(foreach html,$(HTMLS), cp $(html) $(html).bak;) - -diff: - $(foreach wsdl,$(WSDLS), diff $(wsdl) $(wsdl).bak;) - $(foreach html,$(HTMLS), diff $(html) $(html).bak;) diff --git a/wsdl/apistub.py b/wsdl/apistub.py deleted file mode 100644 index 198883f0..00000000 --- a/wsdl/apistub.py +++ /dev/null @@ -1,12 +0,0 @@ -import sfa.methods - - -methods = sfa.methods.all - -def callable(method): - classname = method.split(".")[-1] - module = __import__("sfa.methods." + method, globals(), locals(), [classname]) - callablemethod = getattr(module, classname)(None) - return getattr(module, classname)(None) - - diff --git a/wsdl/index.html b/wsdl/index.html deleted file mode 100644 index e35d8ff2..00000000 --- a/wsdl/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -

The various SFA APIs in a myplc deployment

- - - diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py deleted file mode 100755 index f6fd2ea7..00000000 --- a/wsdl/sfa2wsdl.py +++ /dev/null @@ -1,350 +0,0 @@ -#!/usr/bin/env python3 -# -# Sapan Bhatia -# -# Generates a WSDL for sfa - - -import os, sys -import time -import pdb -import xml.dom.minidom -import apistub -import inspect - -from types import * -from optparse import OptionParser - -from sfa.storage.parameter import Parameter, Mixed - -from sfa.util.py23 import StringType - -plc_ns="http://www.planet-lab.org/sfa" - -class SoapError(Exception): - def __init__(self, value): - self.value = value - def __str__(self): - return repr(self.value) -try: - set -except NameError: - from sets import Set - set = Set - -class WSDLGen: - complex_types = {} - services = {} - num_types = 0 - wsdl = None - types = None - - def __init__(self, interface_options): - self.interface_options = interface_options - - def interface_name (self): - if (self.interface_options.aggregate and - self.interface_options.registry): - return "complete" - if self.interface_options.aggregate: return "aggregate" - elif self.interface_options.registry: return "registry" - else: return "unknown" - - def filter_argname(self, argname): - if (not self.interface_options.lite or (argname!="cred")): - if (argname.find('(') != -1): - # The name has documentation in it :-/ - brackright = argname.split('(')[1] - if (brackright.find(')') == -1): - raise Exception("Please fix the argument %s to be well-formed.\n"%argname) - inbrack = brackright.split(')')[0] - 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 name_complex_type(self,arg): - - types_section = self.types.getElementsByTagName("xsd:schema")[0] - - #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 = [ 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 += 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): - element = choice.appendChild(self.types.createElement("element")) - n = self.filter_argname(n) - element.setAttribute("name", n) - element.setAttribute("type", "%s"%t) - element.setAttribute("minOccurs","%d"%min_args) - return "xsdl:%s"%type_name - elif (isinstance(arg, Parameter)): - return (self.name_simple_type(arg.type)) - 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 - complex_type = types_section.appendChild(self.types.createElement("xsd:complexType")) - type_name = self.filter_argname(type_name) - complex_type.setAttribute("name", type_name) - complex_content = complex_type.appendChild(self.types.createElement("xsd:complexContent")) - restriction = complex_content.appendChild(self.types.createElement("xsd:restriction")) - restriction.setAttribute("base","soapenc:Array") - attribute = restriction.appendChild(self.types.createElement("xsd:attribute")) - attribute.setAttribute("ref","soapenc:arrayType") - attribute.setAttribute("wsdl:arrayType","%s[]"%inner_type) - - return "xsdl:%s"%type_name - - elif type(arg) == DictType or arg == DictType or (inspect.isclass(arg) and issubclass(arg, dict)): - self.num_types=self.num_types+1 - type_name = "Type%d"%self.num_types - complex_type = types_section.appendChild(self.types.createElement("xsd:complexType")) - type_name = self.filter_argname(type_name) - complex_type.setAttribute("name", type_name) - complex_content = complex_type.appendChild(self.types.createElement("xsd:sequence")) - - for k in arg.fields: - inner_type = self.name_complex_type(arg.fields[k]) - element=complex_content.appendChild(self.types.createElement("xsd:element")) - element.setAttribute("name",k) - element.setAttribute("type",inner_type) - - return "xsdl:%s"%type_name - else: - return (self.name_simple_type(arg)) - - def name_simple_type(self,arg_type): - # A Parameter is reported as an instance, even though it is serialized as a type <> - if type(arg_type) == InstanceType: - return (self.name_simple_type(arg_type.type)) - if arg_type == None: - return "none" - if arg_type == DictType: - return "xsd:anyType" - if arg_type in (ListType, TupleType): - return "xsd:arrayType" - elif arg_type == IntType or arg_type == LongType: - return "xsd:int" - elif arg_type == bool: - return "xsd:boolean" - elif arg_type == FloatType: - return "xsd:double" - elif issubclass(arg_type, StringType): - return "xsd:string" - else: - pdb.set_trace() - raise SoapError("Cannot handle %s objects" % arg_type) - - def param_type(self, arg): - return (self.name_complex_type(arg)) - - def add_wsdl_ports_and_bindings (self): - for method in apistub.methods: - - # Skip system. methods - if "system." in method: - continue - - function = apistub.callable(method) # Commented documentation - #lines = ["// " + line.strip() for line in function.__doc__.strip().split("\n")] - #print "\n".join(lines) - #print - - - in_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("message")) - in_el.setAttribute("name", method + "_in") - - for service_name in function.interfaces: - if (service_name in self.services): - if (not method in self.services[service_name]): - self.services[service_name].append(method) - else: - self.services[service_name]=[method] - - # Arguments - - if (function.accepts): - (min_args, max_args, defaults) = function.args() - for (argname,argtype) in zip(max_args,function.accepts): - argname = self.filter_argname(argname) - arg_part = in_el.appendChild(self.wsdl.createElement("part")) - arg_part.setAttribute("name", argname) - arg_part.setAttribute("type", self.param_type(argtype)) - - # Return type - return_type = function.returns - 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") - ret_part.setAttribute("type", self.param_type(return_type)) - - # Port connecting arguments with return type - - 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")) - op_el.setAttribute("name", method) - inp_el=self.wsdl.createElement("input") - inp_el.setAttribute("message","tns:" + method + "_in") - inp_el.setAttribute("name",method+"_request") - op_el.appendChild(inp_el) - out_el = self.wsdl.createElement("output") - out_el.setAttribute("message","tns:" + method + "_out") - out_el.setAttribute("name",method+"_response") - op_el.appendChild(out_el) - - # Bindings - - bind_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("binding")) - bind_el.setAttribute("name", method + "_binding") - bind_el.setAttribute("type", "tns:" + method + "_port") - - soap_bind = bind_el.appendChild(self.wsdl.createElement("soap:binding")) - soap_bind.setAttribute("style", "rpc") - soap_bind.setAttribute("transport","http://schemas.xmlsoap.org/soap/http") - - - wsdl_op = bind_el.appendChild(self.wsdl.createElement("operation")) - wsdl_op.setAttribute("name", method) - wsdl_op.appendChild(self.wsdl.createElement("soap:operation")).setAttribute("soapAction", - "urn:" + method) - - - wsdl_input = wsdl_op.appendChild(self.wsdl.createElement("input")) - input_soap_body = wsdl_input.appendChild(self.wsdl.createElement("soap:body")) - input_soap_body.setAttribute("use", "encoded") - input_soap_body.setAttribute("namespace", "urn:" + method) - input_soap_body.setAttribute("encodingStyle","http://schemas.xmlsoap.org/soap/encoding/") - - - wsdl_output = wsdl_op.appendChild(self.wsdl.createElement("output")) - output_soap_body = wsdl_output.appendChild(self.wsdl.createElement("soap:body")) - output_soap_body.setAttribute("use", "encoded") - output_soap_body.setAttribute("namespace", "urn:" + method) - output_soap_body.setAttribute("encodingStyle","http://schemas.xmlsoap.org/soap/encoding/") - - - def add_wsdl_services(self): - for service in list(self.services.keys()): - if (getattr(self.interface_options,service)): - service_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("service")) - service_el.setAttribute("name", service) - - for method in self.services[service]: - name=method - servport_el = service_el.appendChild(self.wsdl.createElement("port")) - servport_el.setAttribute("name", name + "_port") - servport_el.setAttribute("binding", "tns:" + name + "_binding") - - soapaddress = servport_el.appendChild(self.wsdl.createElement("soap:address")) - soapaddress.setAttribute("location", "%s/%s" % (plc_ns,service)) - - - def compute_wsdl_definitions(self): - wsdl_text_header = """ - - - """ % (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 = """ - - - - - - """ % (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.lastChild.appendChild(wsdl_types) - - def generate_wsdl(self): - self.compute_wsdl_definitions_and_types() - self.compute_wsdl_definitions() - self.add_wsdl_ports_and_bindings() - self.add_wsdl_types() - self.add_wsdl_services() - - def pretty_print(self): - if (self.wsdl): - print(xml.dom.minidom.Document.toprettyxml(self.wsdl)) - else: - raise Exception("Empty WSDL") - -def main(): - parser = OptionParser() - parser.add_option("-r", "--registry", dest="registry", action="store_true", - help="Generate registry.wsdl", metavar="FILE") - parser.add_option("-a", "--aggregate", action="store_true", dest="aggregate", - help="Generate am.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() - - gen = WSDLGen(interface_options) - gen.generate_wsdl() - gen.pretty_print() - - -if __name__ == "__main__": - main() diff --git a/wsdl/wsdl2html.xsl b/wsdl/wsdl2html.xsl deleted file mode 100644 index 3ad341a8..00000000 --- a/wsdl/wsdl2html.xsl +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - <xsl:value-of select="./@name" /> - - - -
methodinout
- - - - - - - - - - - - - - - -() - - - - - - - - - - - - - -- 2.43.0