Change endpoint to url in API

[yardstick.git] / api / server.py

diff --git a/api/server.py b/api/server.py
index be79634..c1548ca 100644 (file)
--- 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,9 +20,17 @@ 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
+
+try:
+    from urlparse import urljoin
+except ImportError:
+    from urllib.parse import urljoin
 
 logger = logging.getLogger(__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:
@@ -52,8 +66,19 @@ def init_db():
     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:
+    api.add_resource(get_resource(u.target), u.url, endpoint=get_endpoint(u.url))
+
 
 if __name__ == '__main__':
     _init_logging()