Add version to WSDL and index.html

remove wsdl.py. not used

Author: valentinedwv

wof/WofWsdls.py

@@ -30,10 +30,14 @@ class declares a list of ports
 
 class WofWSDL_1_0(InterfaceDocumentBase):
     templates=None
+    network=None
+    version=None
 
-    def __init__(self, interface=None, _with_partnerlink=False, templates=None):
+    def __init__(self, interface=None, _with_partnerlink=False, templates=None,network=None,version=None):
         super(WofWSDL_1_0, self).__init__(interface)
         self.templates=templates
+        self.network=network
+        self.version=version
 
     def build_interface_document(self, url, templates):
         """This function is supposed to be called just once, as late as possible
@@ -75,7 +79,7 @@ def get_interface_document(self):
     def get_wsdl_1_0(self, url, templates ):
             env = Environment(loader=FileSystemLoader(templates))
             template = env.get_template('wsdl_temp.wsdl')
-            response = template.render(serv_loc=url)
+            response = template.render(serv_loc=url,network=self.network,version=self.version)
             response = response.encode('utf-8')
             #response.headers['Content-Type'] = 'text/xml'
 
@@ -85,7 +89,7 @@ def on_get_wsdl_1_0_(self, ctx ):
             env = Environment(loader=FileSystemLoader(self.templates))
             template = env.get_template('wsdl_temp.wsdl')
             reqstring = 'http://{0}{1}'.format(ctx.transport.req['HTTP_HOST'],ctx.transport.req['SCRIPT_NAME'])
-            response = template.render(serv_loc=reqstring)
+            response = template.render(serv_loc=reqstring,network=self.network,version=self.version)
             response = response.encode('utf-8')
             #response.headers['Content-Type'] = 'text/xml'
             ctx.transport.wsdl = response
@@ -94,10 +98,15 @@ def on_get_wsdl_1_0_(self, ctx ):
 class WofWSDL_1_1(InterfaceDocumentBase):
     templates=None
     templateName = 'wsdl_1_1_template.wsdl'
+    network=None
+    version=None
 
-    def __init__(self, interface=None, _with_partnerlink=False, templates=None):
+
+    def __init__(self, interface=None, _with_partnerlink=False, templates=None,network=None,version=None):
         super(WofWSDL_1_1, self).__init__(interface)
         self.templates=templates
+        self.network=network
+        self.version=version
 
     def build_interface_document(self, url, templates):
         """This function is supposed to be called just once, as late as possible
@@ -132,7 +141,7 @@ def get_wsdl_1_1(self, url, templates ):
 
             env = Environment(loader=FileSystemLoader(templates))
             template = env.get_template(self.templateName)
-            response = template.render(serv_loc=url)
+            response = template.render(serv_loc=url,network=self.network,version=self.version)
             response = response.encode('utf-8')
             #response.headers['Content-Type'] = 'text/xml'
 
@@ -142,7 +151,7 @@ def on_get_wsdl_1_1_(self, ctx ):
             env = Environment(loader=FileSystemLoader(self.templates))
             template = env.get_template(self.templateName)
             reqstring = 'http://{0}{1}'.format(ctx.transport.req['HTTP_HOST'],ctx.transport.req['SCRIPT_NAME'])
-            response = template.render(serv_loc=reqstring)
+            response = template.render(serv_loc=reqstring,network=self.network,version=self.version)
             response = response.encode('utf-8')
             #response.headers['Content-Type'] = 'text/xml'
             ctx.transport.wsdl = response

wof/__init__.py

@@ -1,3 +1,3 @@
-from core import create_wof_flask_app, _SERVICE_PARAMS, site_map
+from core import create_wof_flask_app, _SERVICE_PARAMS, site_map, _VERSION
 from core_1_0 import WOF
 from core_1_1 import WOF_1_1

wof/apps/templates/wsdl_1_1_template.wsdl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://www.cuahsi.org/his/1.1/ws/" xmlns:s1="http://www.cuahsi.org/waterML/1.1/" xmlns:s2="http://www.cuahsi.org/his/1.1/ws/AbstractTypes" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.cuahsi.org/his/1.1/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      Developmental Python implementation of WaterOneFlow 1.1 for {{network}}
+      Developmental Python implementation of WaterOneFlow 1.1 for "{{network}}" WOFPY: version "{{ version }}"
   </wsdl:documentation>
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://www.cuahsi.org/his/1.1/ws/">

wof/apps/templates/wsdl_temp.wsdl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://www.cuahsi.org/his/1.0/ws/" xmlns:s1="http://www.cuahsi.org/waterML/1.0/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://www.cuahsi.org/his/1.0/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    Developmental Python implementation of WaterOneFlow for {{network}}
+    Developmental Python implementation of WaterOneFlow for "{{network}}" WOFPY: version "{{ version }}"
   </wsdl:documentation>
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://www.cuahsi.org/his/1.0/ws/">

wof/apps/wsdl.py

@@ -30,6 +30,8 @@
 logging.getLogger('spyne.interface.xml_schema').setLevel(logging.ERROR)
 logging.getLogger('spyne.protocol.dictdoc.simple').setLevel(logging.ERROR)
 
+_VERSION= '2.0.x-alpha' #until we find a way to get from setup at runtime
+
 _SERVICE_PARAMS = {
     "r_type" : "rest",
     "s_type" : "soap",
@@ -260,12 +262,16 @@ def getSpyneApplications(wof_obj_1_0, wof_obj_1_1, templates=None):
 
     if templatesPath:
         # needs to be service_baseURL. in config wof_obj_1_0.service_wsdl
-        wsdl10= WofWSDL_1_0(soap_wsgi_wrapper_1_0.doc.wsdl11.interface, templates=templatesPath)
+        wsdl10= WofWSDL_1_0(soap_wsgi_wrapper_1_0.doc.wsdl11.interface, templates=templatesPath
+                            , network=sensorNetwork,
+                            version=_VERSION)
 
         #soap_wsgi_wrapper_1_0._wsdl = wsdl10.build_interface_document('/'+ sensorNetwork+'/soap/wateroneflow',templatesPath) #.get_wsdl_1_0('/'+ sensorNetwork+'/soap/wateroneflow')
         soap_wsgi_wrapper_1_0.event_manager.add_listener('wsdl', wsdl10.on_get_wsdl_1_0_)
         #  path: /{sensorNetwork}/soap/wateroneflow_1_1/.wsdl returns the WSDL.
-        wsdl11= WofWSDL_1_1(soap_wsgi_wrapper_1_1.doc.wsdl11.interface, templates=templatesPath)
+        wsdl11= WofWSDL_1_1(soap_wsgi_wrapper_1_1.doc.wsdl11.interface, templates=templatesPath
+                            , network=sensorNetwork,
+                            version=_VERSION)
         #soap_wsgi_wrapper_1_1._wsdl = wsdl11.build_interface_document('/'+ sensorNetwork+'/soap/wateroneflow_1_1',templatesPath) #.get_wsdl_1_0('/'+ sensorNetwork+'/soap/wateroneflow')
         soap_wsgi_wrapper_1_1.event_manager.add_listener('wsdl', wsdl11.on_get_wsdl_1_1_)
 

wof/core.py

@@ -1,5 +1,5 @@
 from flask import Flask, render_template, current_app, make_response, request
-
+import wof
 import config
 import datetime
 
@@ -40,7 +40,8 @@ def index():
                                rest2=path+'/rest_2/',
                                soap10=path+'/soap/cuahsi_1_0/',
                                soap11=path+'/soap/cuahsi_1_1/',
-                               p=wof_inst.network)
+                               p=wof_inst.network,
+                               v=wof._VERSION)
 
     app.add_url_rule(servicesPath+'/', wof_inst.network+'index', index)
 

wof/flask/__init__.py

@@ -1,6 +1,7 @@
 <html>
 <head>
 	<title>WaterOneFlow in Python</title>
+
     <style>
         table, th, td {
             border: 1px solid black;
@@ -62,6 +63,7 @@
                     </a>
                 </li>
 	</ul>
+    <p>version: {{ v }}</p>
 </body>
 
 </html>

wof/flask/templates/index.html

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://www.cuahsi.org/his/1.1/ws/" xmlns:s1="http://www.cuahsi.org/waterML/1.1/" xmlns:s2="http://www.cuahsi.org/his/1.1/ws/AbstractTypes" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.cuahsi.org/his/1.1/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-      Developmental Python implementation of WaterOneFlow 1.1 for {{network}}
+      Developmental Python implementation of WaterOneFlow 1.1 for {{network}}  WOFPY: version {{ version }}
   </wsdl:documentation>
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://www.cuahsi.org/his/1.1/ws/">

wof/flask/templates/wsdl_1_1_template.wsdl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://www.cuahsi.org/his/1.0/ws/" xmlns:s1="http://www.cuahsi.org/waterML/1.0/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://www.cuahsi.org/his/1.0/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    Developmental Python implementation of WaterOneFlow for {{network}}
+    Developmental Python implementation of WaterOneFlow for {{network}}  WOFPY: version {{ version }}
   </wsdl:documentation>
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://www.cuahsi.org/his/1.0/ws/">