diff options
Diffstat (limited to 'api')
| -rwxr-xr-x | api/api-prepare.sh | 8 | ||||
| -rw-r--r-- | api/database/__init__.py | 29 | ||||
| -rw-r--r-- | api/database/models.py | 25 | ||||
| -rw-r--r-- | api/resources/env_action.py | 40 | ||||
| -rw-r--r-- | api/server.py | 9 | ||||
| -rw-r--r-- | api/yardstick.ini | 4 | ||||
| -rw-r--r-- | api/yardstick.sock | 0 |
7 files changed, 92 insertions, 23 deletions
diff --git a/api/api-prepare.sh b/api/api-prepare.sh index fade8ccc6..5cc65c959 100755 --- a/api/api-prepare.sh +++ b/api/api-prepare.sh @@ -20,7 +20,7 @@ server { index index.htm index.html; location / { include uwsgi_params; - uwsgi_pass unix:///home/opnfv/repos/yardstick/api/yardstick.sock; + uwsgi_pass unix:///var/run/yardstick.sock; } } EOF @@ -47,3 +47,9 @@ command = uwsgi -i yardstick.ini autorestart = true EOF fi + +# create api log directory +mkdir -p /var/log/yardstick + +# create yardstick.sock for communicating +touch /var/run/yardstick.sock diff --git a/api/database/__init__.py b/api/database/__init__.py new file mode 100644 index 000000000..bc2708bc7 --- /dev/null +++ b/api/database/__init__.py @@ -0,0 +1,29 @@ +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +import logging + +from sqlalchemy import create_engine +from sqlalchemy.orm import scoped_session, sessionmaker +from sqlalchemy.ext.declarative import declarative_base + +logger = logging.getLogger(__name__) +logger.setLevel(logging.DEBUG) + +engine = create_engine('sqlite:////tmp/yardstick.db', convert_unicode=True) +db_session = scoped_session(sessionmaker(autocommit=False, + autoflush=False, + bind=engine)) +Base = declarative_base() +Base.query = db_session.query_property() + + +def init_db(): + subclasses = [subclass.__name__ for subclass in Base.__subclasses__()] + logger.debug('Import models: %s', subclasses) + Base.metadata.create_all(bind=engine) diff --git a/api/database/models.py b/api/database/models.py new file mode 100644 index 000000000..25e323842 --- /dev/null +++ b/api/database/models.py @@ -0,0 +1,25 @@ +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String + +from api.database import Base + + +class Tasks(Base): + __tablename__ = 'tasks' + id = Column(Integer, primary_key=True) + task_id = Column(String(30)) + status = Column(Integer) + error = Column(String(120)) + details = Column(String(120)) + + def __repr__(self): + return '<Task %r>' % Tasks.task_id diff --git a/api/resources/env_action.py b/api/resources/env_action.py index fa0f95d90..59a1692a1 100644 --- a/api/resources/env_action.py +++ b/api/resources/env_action.py @@ -13,6 +13,7 @@ import time import json import os import errno +import ConfigParser from docker import Client @@ -104,7 +105,7 @@ def _create_influxdb(): client = Client(base_url=config.DOCKER_URL) try: - _config_output_file() + _change_output_to_influxdb() if not _check_image_exist(client, '%s:%s' % (config.INFLUXDB_IMAGE, config.INFLUXDB_TAG)): @@ -144,29 +145,18 @@ def _config_influxdb(): logger.debug('Failed to config influxDB: %s', e) -def _config_output_file(): +def _change_output_to_influxdb(): yardstick_utils.makedirs(config.YARDSTICK_CONFIG_DIR) - with open(config.YARDSTICK_CONFIG_FILE, 'w') as f: - f.write("""\ -[DEFAULT] -debug = False -dispatcher = influxdb -[dispatcher_file] -file_path = /tmp/yardstick.out + parser = ConfigParser.ConfigParser() + parser.read(config.YARDSTICK_CONFIG_SAMPLE_FILE) -[dispatcher_http] -timeout = 5 -# target = http://127.0.0.1:8000/results + parser.set('DEFAULT', 'dispatcher', 'influxdb') + parser.set('dispatcher_influxdb', 'target', + 'http://%s:8086' % api_conf.GATEWAY_IP) -[dispatcher_influxdb] -timeout = 5 -target = http://%s:8086 -db_name = yardstick -username = root -password = root -""" - % api_conf.GATEWAY_IP) + with open(config.YARDSTICK_CONFIG_FILE, 'w') as f: + parser.write(f) def prepareYardstickEnv(args): @@ -195,6 +185,8 @@ def _prepare_env_daemon(): # update the external_network _source_file(rc_file) + _clean_images() + _load_images() @@ -251,6 +243,14 @@ def _append_external_network(rc_file): raise +def _clean_images(): + cmd = [config.CLEAN_IMAGES_SCRIPT] + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, + cwd=config.YARDSTICK_REPOS_DIR) + output = p.communicate()[0] + logger.debug('The result is: %s', output) + + def _load_images(): cmd = [config.LOAD_IMAGES_SCRIPT] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, diff --git a/api/server.py b/api/server.py index 64a2b4f96..fac821b00 100644 --- a/api/server.py +++ b/api/server.py @@ -12,6 +12,8 @@ from flask import Flask from flask_restful import Api from flasgger import Swagger +from api.database import init_db +from api.database import db_session from api.urls import urlpatterns from yardstick import _init_logging @@ -19,11 +21,18 @@ logger = logging.getLogger(__name__) app = Flask(__name__) +init_db() + Swagger(app) api = Api(app) +@app.teardown_request +def shutdown_session(exception=None): + db_session.remove() + + reduce(lambda a, b: a.add_resource(b.resource, b.url, endpoint=b.endpoint) or a, urlpatterns, api) diff --git a/api/yardstick.ini b/api/yardstick.ini index 01025c2ef..2ba881fc1 100644 --- a/api/yardstick.ini +++ b/api/yardstick.ini @@ -12,5 +12,5 @@ chmod-socket = 666 callable = app enable-threads = true close-on-exec = 1 -daemonize=/home/opnfv/repos/yardstick/api/uwsgi.log -socket = /home/opnfv/repos/yardstick/api/yardstick.sock +daemonize= /var/log/yardstick/uwsgi.log +socket = /var/run/yardstick.sock diff --git a/api/yardstick.sock b/api/yardstick.sock deleted file mode 100644 index e69de29bb..000000000 --- a/api/yardstick.sock +++ /dev/null |