X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=api%2Fserver.py;h=1d42feffb0f09ba335c8b70d316a924e537bf5a9;hb=b2a79813f57a94b6565fa8f967d10d295010dfff;hp=8cce4de87414b379dffbf74bbfc1534e4d754094;hpb=205729564104b309058ad011f1daf402a285d7b8;p=yardstick.git

diff --git a/api/server.py b/api/server.py
index 8cce4de87..1d42feffb 100644
--- a/api/server.py
+++ b/api/server.py
@@ -6,17 +6,19 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import logging
-from itertools import ifilter
+from __future__ import absolute_import
+
 import inspect
+import logging
+from six.moves import filter
 
+from flasgger import Swagger
 from flask import Flask
 from flask_restful import Api
-from flasgger import Swagger
 
 from api.database import Base
-from api.database import engine
 from api.database import db_session
+from api.database import engine
 from api.database import models
 from api.urls import urlpatterns
 from yardstick import _init_logging
@@ -35,6 +37,10 @@ def shutdown_session(exception=None):
     db_session.remove()
 
 
+for u in urlpatterns:
+    api.add_resource(u.resource, u.url, endpoint=u.endpoint)
+
+
 def init_db():
     def func(a):
         try:
@@ -44,17 +50,19 @@ def init_db():
             pass
         return False
 
-    subclses = ifilter(func, inspect.getmembers(models, inspect.isclass))
+    subclses = filter(func, inspect.getmembers(models, inspect.isclass))
     logger.debug('Import models: %s', [a[1] for a in subclses])
     Base.metadata.create_all(bind=engine)
 
 
-init_db()
-reduce(lambda a, b: a.add_resource(b.resource, b.url,
-                                   endpoint=b.endpoint) or a, urlpatterns, api)
+def app_wrapper(*args, **kwargs):
+    init_db()
+    return app(*args, **kwargs)
+
 
 if __name__ == '__main__':
     _init_logging()
     logger.setLevel(logging.DEBUG)
     logger.info('Starting server')
+    init_db()
     app.run(host='0.0.0.0')