X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=api%2Fserver.py;h=158b8a508e0482c3a24b23b9ff936ab7ebec496f;hb=fb86be55d52f6cefd4e0de4b857ac76d00a9e681;hp=be7963481a995fc7f4605eac89b1be6802ca02c0;hpb=483e2fcf41adcdddad5543c04d3ad42c60def334;p=yardstick.git

diff --git a/api/server.py b/api/server.py
index be7963481..158b8a508 100644
--- a/api/server.py
+++ b/api/server.py
@@ -10,7 +10,7 @@ from __future__ import absolute_import
 
 import inspect
 import logging
-from functools import reduce
+import socket
 from six.moves import filter
 
 from flasgger import Swagger
@@ -20,11 +20,19 @@ from flask_restful import Api
 from api.database import Base
 from api.database import db_session
 from api.database import engine
-from api.database import models
+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
 
-logger = logging.getLogger(__name__)
+try:
+    from urlparse import urljoin
+except ImportError:
+    from urllib.parse import urljoin
+
+LOG = logging.getLogger(__name__)
 
 app = Flask(__name__)
 
@@ -38,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:
@@ -48,16 +62,30 @@ def init_db():
         return False
 
     subclses = filter(func, inspect.getmembers(models, inspect.isclass))
-    logger.debug('Import models: %s', [a[1] for a in subclses])
+    LOG.debug('Import models: %s', [a[1] for a in subclses])
     Base.metadata.create_all(bind=engine)
 
 
-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:
+    try:
+        api.add_resource(get_resource(u.target), u.url, endpoint=get_endpoint(u.url))
+    except StopIteration:
+        LOG.error('url resource not found: %s', u.url)
+
 
 if __name__ == '__main__':
     _init_logging()
-    logger.setLevel(logging.DEBUG)
-    logger.info('Starting server')
+    LOG.setLevel(logging.DEBUG)
+    LOG.info('Starting server')
     init_db()
     app.run(host='0.0.0.0')