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

diff --git a/api/server.py b/api/server.py
index 8cce4de87..c1548ca10 100644
--- a/api/server.py
+++ b/api/server.py
@@ -6,20 +6,31 @@
 # 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
+import socket
+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 models
+from api.database import engine
+from api.database.v1 import models
 from api.urls import urlpatterns
+from api import ApiResource
 from yardstick import _init_logging
+from yardstick.common import utils
+from yardstick.common import constants as consts
+
+try:
+    from urlparse import urljoin
+except ImportError:
+    from urllib.parse import urljoin
 
 logger = logging.getLogger(__name__)
 
@@ -35,6 +46,12 @@ def shutdown_session(exception=None):
     db_session.remove()
 
 
+def get_resource(resource_name):
+    name = ''.join(resource_name.split('_'))
+    return next((r for r in utils.itersubclasses(ApiResource)
+                 if r.__name__.lower() == name))
+
+
 def init_db():
     def func(a):
         try:
@@ -44,17 +61,28 @@ 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)
+
+
+def get_endpoint(url):
+    ip = socket.gethostbyname(socket.gethostname())
+    return urljoin('http://{}:{}'.format(ip, consts.API_PORT), url)
+
+
+for u in urlpatterns:
+    api.add_resource(get_resource(u.target), u.url, endpoint=get_endpoint(u.url))
+
 
 if __name__ == '__main__':
     _init_logging()
     logger.setLevel(logging.DEBUG)
     logger.info('Starting server')
+    init_db()
     app.run(host='0.0.0.0')