Docker extension

README.rst

@@ -1,24 +1,39 @@
 PyWPS demo with docker support
 ==============================
-Clone pywps-flask, install libraries, build docker image (due to GDAL compiling lasts quite long)::
+Install Docker. For detailed instruction see Docker `docs <https://docs.docker.com/install/linux/docker-ce/ubuntu/>`_.
+Check if Docker-engine is running.::
 
-    $ pip3 install -r requirements.txt
-    $ cd pywps-flask/docker/alpine/flask
-    $ docker build -t pywps_container .
+    $ sudo apt install docker-ce
+    $ sudo systemctl status docker
+
+Clone pywps-flask, switch to docker_extension branch::
 
+    $ git clone https://github.com/lazaa32/pywps-flask.git
+    $ git checkout docker_extension
 
-Clone pywps and OWSLib::
+Install libraries, build docker image (due to GDAL compiling lasts quite long)::
 
-    $ git clone https://github.com/lazaa32/pywps.git
-    $ git clone https://github.com/lazaa32/OWSLib.git
+    $ pip3 install -r requirements.txt
+    $ cd pywps-flask/docker/isolation
+    $ docker build -t pywps .
 
-Set PYTHONPATH::
+Check ``pywps.cfg``, set mode to ``docker`` and docker image name to ``pywps``::
 
-    $ export PYTHONPATH=$PYTHONPATH:$PWD/OWSLib:$PWD/pywps
+    mode=docker
+    docker_img=pywps
 
 Run server::
 
-    python3 demo.py
+    $ cd pywps-flask
+    $ python3 demo.py
+
+Send example POST request::
+
+    $ curl -X POST -d @static/requests/execute_buffer_async_reference.xml http://localhost:5000/wps
+
+You should get response with ``ProcessAccepted`` status code. During execution check whether a container was created::
+
+    $ docker ps -a
 
 
 PyWPS example service

docker/isolation/Dockerfile

@@ -17,25 +17,24 @@ RUN apk update && apk add --no-cache \
 	libxslt-dev \
 	linux-headers \
 	expat \
-	expat-dev
+	expat-dev \
+	g++ \
+	libstdc++ \
+	make \
+	swig
 
-
-RUN apk --update --no-cache add g++ libstdc++ make swig
-
-# Xerces
-RUN wget http://www.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_VERSION}.tar.gz -O /tmp/xerces-c-${XERCES_VERSION}.tar.gz && \
-    tar xvf /tmp/xerces-c-${XERCES_VERSION}.tar.gz -C /tmp && \
-    cd /tmp/xerces-c-${XERCES_VERSION} && \
-    ./configure --prefix=/opt/xerces && \
-    make -j $PROCESSOR_N && \
-    make install
-
-# Geos
 RUN apk add --no-cache \
     --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     geos \
     geos-dev
 
+#Compiling Xerces
+RUN wget http://www.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_VERSION}.tar.gz -O /tmp/xerces-c-${XERCES_VERSION}.tar.gz && \
+    tar xvf /tmp/xerces-c-${XERCES_VERSION}.tar.gz -C /tmp && \
+    cd /tmp/xerces-c-${XERCES_VERSION} && \
+    LDFLAGS="-s" ./configure --prefix=/usr/local/src/xerces && \
+    make -j $PROCESSOR_N install
+
 # Install GDAL
 RUN wget http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar.gz -O /tmp/gdal.tar.gz && \
 	tar xzf /tmp/gdal.tar.gz -C /tmp && \
@@ -47,12 +46,13 @@ RUN cd /tmp/gdal-${GDAL_VERSION}/swig/python \
 	&& python3 setup.py build \
 	&& python3 setup.py install
 
-RUN git clone https://github.com/geopython/pywps-flask.git
+RUN rm -rf /var/cache/apk/*
+
+RUN git clone https://github.com/lazaa32/pywps-flask.git
 
 WORKDIR /pywps-flask
 RUN pip3 install -r requirements.txt
 
-
 EXPOSE 5000
 ENTRYPOINT ["/usr/bin/python3", "demo.py","-a"]
 

pywps.cfg

@@ -29,18 +29,18 @@ url=http://localhost:5000/wps
 outputurl=http://localhost:5000/outputs/
 outputpath=outputs
 workdir=workdir
-wd_inp_subdir=inputs
-wd_out_subdir=outputs
 maxprocesses=10
 parallelprocesses=2
+allowedinputpaths=/pywps-flask/data
 
 [processing]
-mode=docker
+mode=default
 port_min=5050
 port_max=5070
-docker_img=container
+docker_img=pywps
 dckr_inp_dir=/pywps-flask/data
 dckr_out_dir=/pywps-flask/outputs
+sleep_secs=5
 
 [logging]
 level=INFO

requirements.txt

@@ -9,4 +9,5 @@ Shapely
 Werkzeug
 SQLAlchemy
 psutil
--e git+https://github.com/geopython/pywps.git@master#egg=pywps-master
+docker
+-e git+https://github.com/lazaa32/pywps.git@docker_extension#egg=pywps

static/requests/execute_buffer_post_referenceoutput.xml

@@ -35,7 +35,7 @@
 		</wps:Input>
 	</wps:DataInputs>
         <wps:ResponseForm>
-           <wps:ResponseDocument status="false" storeExecuteResponse="true">
+           <wps:ResponseDocument status="true" storeExecuteResponse="true">
              <wps:Output asReference="false">
                <ows:Identifier>buff_out</ows:Identifier>
              </wps:Output>

tests/common.py

@@ -50,9 +50,5 @@ def validate(url, schema, post_data=None):
 
     schema = get_schema(schema)
 
-    if schema.validate(body_doc):
-        return True
-    else:
-        print(body)
-        return False
+    return schema.validate(body_doc)
 

tests/test_execute.py

@@ -43,8 +43,7 @@ def setUp(self):
     def test_valid(self):
         "POST Execute request"
 
-        validate(self.url, self.schema_url, self.request_data)
-
+        assert validate(self.url, self.schema_url, self.request_data)
 
 
     #def test_valid_lineage(self):
@@ -70,7 +69,6 @@ def _get_response(self, request):
 
         return response_doc
 
-
     def test_sync(self):
         request = self._get_request('http://localhost:5000/static/requests/execute_buffer_post.xml')
         response = self._get_response(request)
@@ -100,7 +98,50 @@ def test_sync(self):
             'wps:ComplexData/ogr:FeatureCollection',
             namespaces=NAMESPACES))
 
+    def test_sync_reference(self):
+        request = self._get_request('http://localhost:5000/static/requests/execute_buffer_sync_reference.xml')
+        response = self._get_response(request)
+
+        self.assertEqual(
+            response.xpath('//wps:ExecuteResponse/wps:Process/ows:Identifier',
+                           namespaces=NAMESPACES)[0].text, 'buffer')
+
+        self.assertEqual(
+            response.xpath(
+                '//wps:ExecuteResponse/wps:Status/wps:ProcessSucceeded',
+                namespaces=NAMESPACES)[0].text,
+            'PyWPS Process GDAL Buffer process finished')
+
+        self.assertEqual(len(response.xpath(
+            '//wps:ExecuteResponse/wps:ProcessOutputs/wps:Output',
+            namespaces=NAMESPACES)), 1)
+
+        self.assertEqual(response.xpath(
+            '//wps:ExecuteResponse/wps:ProcessOutputs/'
+            'wps:Output/wps:Reference',
+            namespaces=NAMESPACES)[0].get('mimeType'),
+                         'application/gml+xml')
+
+        self.assertTrue(response.xpath(
+            '//wps:ExecuteResponse/wps:ProcessOutputs/wps:Output/'
+            'wps:Reference',
+            namespaces=NAMESPACES))
+
+        data_href = response.xpath(
+            '//wps:ExecuteResponse/wps:ProcessOutputs/wps:Output/'
+            'wps:Reference',
+            namespaces=NAMESPACES)[0].get('href')
+
+        data = self._get_request(data_href)
+        data_doc = etree.fromstring(data)
+
+        self.assertTrue(data_doc.xpath('//ogr:FeatureCollection',
+                                       namespaces=NAMESPACES))
+
     def test_async(self):
+        """
+        This test fails for Docker. Docker supports only referenced output in response.
+        """
         request = self._get_request('http://localhost:5000/static/requests/execute_buffer_async.xml')
         response = self._get_response(request)
 
@@ -164,14 +205,15 @@ def test_async_reference(self):
         data_href = status_doc.xpath(
             '//wps:ExecuteResponse/wps:ProcessOutputs/wps:Output/'
             'wps:Reference',
-            namespaces=NAMESPACES)[0].get('{http://www.w3.org/1999/xlink}href')
+            namespaces=NAMESPACES)[0].get('href')
 
         data = self._get_request(data_href)
         data_doc = etree.fromstring(data)
 
         self.assertTrue(data_doc.xpath('//ogr:FeatureCollection',
             namespaces=NAMESPACES))
 
+
 def load_tests(loader=None, tests=None, pattern=None):
     if not loader:
         loader = unittest.TestLoader()