Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Modify fuel_baremetal pod config file"
[yardstick.git]
/
api
/
server.py
diff --git
a/api/server.py
b/api/server.py
index
344874c
..
37a1ab6
100644
(file)
--- a/
api/server.py
+++ b/
api/server.py
@@
-10,6
+10,7
@@
from __future__ import absolute_import
import inspect
import logging
import inspect
import logging
+import socket
from six.moves import filter
from flasgger import Swagger
from six.moves import filter
from flasgger import Swagger
@@
-24,10
+25,17
@@
from api.urls import urlpatterns
from api import ApiResource
from yardstick import _init_logging
from yardstick.common import utils
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__)
app = Flask(__name__)
+app.config['MAX_CONTENT_LENGTH'] = 2 * 1024 * 1024 * 1024
Swagger(app)
Swagger(app)
@@
-55,7
+63,7
@@
def init_db():
return False
subclses = filter(func, inspect.getmembers(models, inspect.isclass))
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)
Base.metadata.create_all(bind=engine)
@@
-64,13
+72,21
@@
def app_wrapper(*args, **kwargs):
return app(*args, **kwargs)
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:
for u in urlpatterns:
- api.add_resource(get_resource(u.endpoint), u.url, endpoint=u.endpoint)
+ 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()
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')
init_db()
app.run(host='0.0.0.0')