X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fopenstack_dummies%2Fbase_openstack_dummy.py;h=93ad2bd0106a9c19afec48305d98f20d1e551607;hp=a2c471447185ded74581b1fe3ef6b029f9b1d294;hb=4e5c81ecd37e7383c52dad55079f91b90dec22fe;hpb=23b02744af93adbcd5d9f0a67dc781c889975dd4

diff --git a/src/emuvim/api/openstack/openstack_dummies/base_openstack_dummy.py b/src/emuvim/api/openstack/openstack_dummies/base_openstack_dummy.py
old mode 100644
new mode 100755
index a2c4714..93ad2bd
--- a/src/emuvim/api/openstack/openstack_dummies/base_openstack_dummy.py
+++ b/src/emuvim/api/openstack/openstack_dummies/base_openstack_dummy.py
@@ -1,7 +1,37 @@
+"""
+Copyright (c) 2017 SONATA-NFV and Paderborn University
+ALL RIGHTS RESERVED.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Neither the name of the SONATA-NFV, Paderborn University
+nor the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+This work has been performed in the framework of the SONATA project,
+funded by the European Commission under Grant number 671517 through
+the Horizon 2020 and 5G-PPP programmes. The authors would like to
+acknowledge the contributions of their colleagues of the SONATA
+partner consortium (www.sonata-nfv.eu).
+"""
 from flask import Flask, request
 from flask_restful import Api, Resource
+from gevent.pywsgi import WSGIServer
 import logging
 
+LOG = logging.getLogger("api.openstack.base")
+
 
 class BaseOpenstackDummy(Resource):
     """
@@ -13,6 +43,8 @@ class BaseOpenstackDummy(Resource):
         self.port = port
         self.compute = None
         self.manage = None
+        self.http_server = None
+        self.server_thread = None
         self.playbook_file = '/tmp/son-emu-requests.log'
         with open(self.playbook_file, 'w'):
             pass
@@ -21,11 +53,19 @@ class BaseOpenstackDummy(Resource):
         self.app = Flask(__name__)
         self.api = Api(self.app)
 
+    def stop(self):
+        if self.http_server:
+            self.http_server.stop(timeout=1.0)
+
     def _start_flask(self):
-        logging.info("Starting %s endpoint @ http://%s:%d" % (__name__, self.ip, self.port))
-        if self.app is not None:
-            self.app.before_request(self.dump_playbook)
-            self.app.run(self.ip, self.port, debug=True, use_reloader=False)
+        LOG.info("Starting %s endpoint @ http://%s:%d" % (
+            self.__class__.__name__, self.ip, self.port))
+        self.http_server = WSGIServer(
+            (self.ip, self.port),
+            self.app,
+            log=open("/dev/null", "w")  # don't show http logs
+        )
+        self.http_server.serve_forever(stop_timeout=1.0)
 
     def dump_playbook(self):
         with self.manage.lock: