diff options
| -rw-r--r-- | api/database/__init__.py | 6 | ||||
| -rw-r--r-- | api/database/handler.py | 30 | ||||
| -rw-r--r-- | api/database/handlers.py | 31 | ||||
| -rw-r--r-- | api/database/models.py | 11 | ||||
| -rw-r--r-- | api/resources/asynctask.py | 35 | ||||
| -rw-r--r-- | api/resources/env_action.py | 91 | ||||
| -rw-r--r-- | api/resources/release_action.py | 10 | ||||
| -rw-r--r-- | api/resources/results.py | 32 | ||||
| -rw-r--r-- | api/resources/samples_action.py | 10 | ||||
| -rw-r--r-- | api/server.py | 23 | ||||
| -rw-r--r-- | api/urls.py | 1 | ||||
| -rw-r--r-- | api/utils/common.py | 4 | ||||
| -rw-r--r-- | api/utils/daemonthread.py | 22 | ||||
| -rw-r--r-- | api/utils/influx.py | 42 | ||||
| -rw-r--r-- | api/views.py | 5 | ||||
| -rw-r--r-- | samples/tosca.yaml | 260 | ||||
| -rw-r--r-- | tests/unit/cmd/commands/__init__.py | 0 | ||||
| -rw-r--r-- | tests/unit/cmd/commands/test_env.py | 45 | ||||
| -rw-r--r-- | tests/unit/common/test_httpClient.py | 6 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/parser/parser.py | 6 | ||||
| -rw-r--r-- | yardstick/cmd/commands/env.py | 72 | ||||
| -rw-r--r-- | yardstick/common/constants.py | 4 | ||||
| -rw-r--r-- | yardstick/common/httpClient.py | 4 |
23 files changed, 507 insertions, 243 deletions
diff --git a/api/database/__init__.py b/api/database/__init__.py index bc2708bc7..5b0bb05a2 100644 --- a/api/database/__init__.py +++ b/api/database/__init__.py @@ -21,9 +21,3 @@ db_session = scoped_session(sessionmaker(autocommit=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/handler.py b/api/database/handler.py new file mode 100644 index 000000000..f6a22578f --- /dev/null +++ b/api/database/handler.py @@ -0,0 +1,30 @@ +# ############################################################################ +# Copyright (c) 2017 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 api.database import db_session +from api.database.models import AsyncTasks + + +class AsyncTaskHandler(object): + def insert(self, kwargs): + task = AsyncTasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = AsyncTasks.query.filter_by(task_id=task_id).first() + return task diff --git a/api/database/handlers.py b/api/database/handlers.py new file mode 100644 index 000000000..42979b529 --- /dev/null +++ b/api/database/handlers.py @@ -0,0 +1,31 @@ +############################################################################## +# 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 api.database import db_session +from api.database.models import Tasks + + +class TasksHandler(object): + + def insert(self, kwargs): + task = Tasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = Tasks.query.filter_by(task_id=task_id).first() + return task diff --git a/api/database/models.py b/api/database/models.py index 25e323842..2fc141c1f 100644 --- a/api/database/models.py +++ b/api/database/models.py @@ -23,3 +23,14 @@ class Tasks(Base): def __repr__(self): return '<Task %r>' % Tasks.task_id + + +class AsyncTasks(Base): + __tablename__ = 'asynctasks' + id = Column(Integer, primary_key=True) + task_id = Column(String(30)) + status = Column(Integer) + error = Column(String(120)) + + def __repr__(self): + return '<Task %r>' % AsyncTasks.task_id diff --git a/api/resources/asynctask.py b/api/resources/asynctask.py new file mode 100644 index 000000000..dd2a71003 --- /dev/null +++ b/api/resources/asynctask.py @@ -0,0 +1,35 @@ +# ############################################################################ +# Copyright (c) 2017 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 uuid + +from api.utils import common as common_utils +from api.database.models import AsyncTasks + + +def default(args): + return _get_status(args) + + +def _get_status(args): + try: + task_id = args['task_id'] + uuid.UUID(task_id) + except KeyError: + message = 'measurement and task_id must be provided' + return common_utils.error_handler(message) + + asynctask = AsyncTasks.query.filter_by(task_id=task_id).first() + + try: + status = asynctask.status + error = asynctask.error if asynctask.error else [] + + return common_utils.result_handler(status, error) + except AttributeError: + return common_utils.error_handler('no such task') diff --git a/api/resources/env_action.py b/api/resources/env_action.py index 59a1692a1..7e2487158 100644 --- a/api/resources/env_action.py +++ b/api/resources/env_action.py @@ -10,6 +10,7 @@ import logging import threading import subprocess import time +import uuid import json import os import errno @@ -23,17 +24,24 @@ from yardstick.common.httpClient import HttpClient from api import conf as api_conf from api.utils import influx from api.utils.common import result_handler +from api.database.handler import AsyncTaskHandler logger = logging.getLogger(__name__) +logger.setLevel(logging.DEBUG) def createGrafanaContainer(args): - thread = threading.Thread(target=_create_grafana) + task_id = str(uuid.uuid4()) + + thread = threading.Thread(target=_create_grafana, args=(task_id,)) thread.start() - return result_handler('success', []) + return result_handler('success', {'task_id': task_id}) + + +def _create_grafana(task_id): + _create_task(task_id) -def _create_grafana(): client = Client(base_url=config.DOCKER_URL) try: @@ -48,7 +56,10 @@ def _create_grafana(): _create_data_source() _create_dashboard() + + _update_task_status(task_id) except Exception as e: + _update_task_error(task_id, str(e)) logger.debug('Error: %s', e) @@ -96,12 +107,17 @@ def _check_image_exist(client, t): def createInfluxDBContainer(args): - thread = threading.Thread(target=_create_influxdb) + task_id = str(uuid.uuid4()) + + thread = threading.Thread(target=_create_influxdb, args=(task_id,)) thread.start() - return result_handler('success', []) + + return result_handler('success', {'task_id': task_id}) -def _create_influxdb(): +def _create_influxdb(task_id): + _create_task(task_id) + client = Client(base_url=config.DOCKER_URL) try: @@ -116,7 +132,10 @@ def _create_influxdb(): time.sleep(5) _config_influxdb() + + _update_task_status(task_id) except Exception as e: + _update_task_error(task_id, str(e)) logger.debug('Error: %s', e) @@ -160,34 +179,44 @@ def _change_output_to_influxdb(): def prepareYardstickEnv(args): - thread = threading.Thread(target=_prepare_env_daemon) + task_id = str(uuid.uuid4()) + + thread = threading.Thread(target=_prepare_env_daemon, args=(task_id,)) thread.start() - return result_handler('success', []) + return result_handler('success', {'task_id': task_id}) -def _prepare_env_daemon(): + +def _prepare_env_daemon(task_id): + _create_task(task_id) installer_ip = os.environ.get('INSTALLER_IP', 'undefined') installer_type = os.environ.get('INSTALLER_TYPE', 'undefined') - _check_variables(installer_ip, installer_type) + try: + _check_variables(installer_ip, installer_type) - _create_directories() + _create_directories() - rc_file = config.OPENSTACK_RC_FILE + rc_file = config.OPENSTACK_RC_FILE - _get_remote_rc_file(rc_file, installer_ip, installer_type) + _get_remote_rc_file(rc_file, installer_ip, installer_type) - _source_file(rc_file) + _source_file(rc_file) - _append_external_network(rc_file) + _append_external_network(rc_file) - # update the external_network - _source_file(rc_file) + # update the external_network + _source_file(rc_file) - _clean_images() + _clean_images() - _load_images() + _load_images() + + _update_task_status(task_id) + except Exception as e: + _update_task_error(task_id, str(e)) + logger.debug('Error: %s', e) def _check_variables(installer_ip, installer_type): @@ -257,3 +286,27 @@ def _load_images(): cwd=config.YARDSTICK_REPOS_DIR) output = p.communicate()[0] logger.debug('The result is: %s', output) + + +def _create_task(task_id): + async_handler = AsyncTaskHandler() + task_dict = { + 'task_id': task_id, + 'status': 0 + } + async_handler.insert(task_dict) + + +def _update_task_status(task_id): + async_handler = AsyncTaskHandler() + + task = async_handler.get_task_by_taskid(task_id) + async_handler.update_status(task, 1) + + +def _update_task_error(task_id, error): + async_handler = AsyncTaskHandler() + + task = async_handler.get_task_by_taskid(task_id) + async_handler.update_status(task, 2) + async_handler.update_error(task, error) diff --git a/api/resources/release_action.py b/api/resources/release_action.py index fda0ffd32..d4dc246ef 100644 --- a/api/resources/release_action.py +++ b/api/resources/release_action.py @@ -23,8 +23,8 @@ def runTestCase(args): except KeyError: return common_utils.error_handler('Lack of testcase argument') - testcase = os.path.join(conf.TEST_CASE_PATH, - conf.TEST_CASE_PRE + testcase + '.yaml') + testcase_name = conf.TEST_CASE_PRE + testcase + testcase = os.path.join(conf.TEST_CASE_PATH, testcase_name + '.yaml') task_id = str(uuid.uuid4()) @@ -33,6 +33,10 @@ def runTestCase(args): logger.debug('The command_list is: %s', command_list) logger.debug('Start to execute command list') - common_utils.exec_command_task(command_list, task_id) + task_dict = { + 'task_id': task_id, + 'details': testcase_name + } + common_utils.exec_command_task(command_list, task_dict) return common_utils.result_handler('success', task_id) diff --git a/api/resources/results.py b/api/resources/results.py index 3de09fdc9..fd518958c 100644 --- a/api/resources/results.py +++ b/api/resources/results.py @@ -8,11 +8,10 @@ ############################################################################## import logging import uuid -import re from api.utils import influx as influx_utils from api.utils import common as common_utils -from api import conf +from api.database.handlers import TasksHandler logger = logging.getLogger(__name__) @@ -23,39 +22,36 @@ def default(args): def getResult(args): try: - measurement = args['measurement'] task_id = args['task_id'] - if re.search("[^a-zA-Z0-9_-]", measurement): - raise ValueError('invalid measurement parameter') - uuid.UUID(task_id) except KeyError: - message = 'measurement and task_id must be provided' + message = 'task_id must be provided' return common_utils.error_handler(message) - query_template = "select * from %s where task_id='%s'" - query_sql = query_template % ('tasklist', task_id) - data = common_utils.translate_to_str(influx_utils.query(query_sql)) + task = TasksHandler().get_task_by_taskid(task_id) def _unfinished(): return common_utils.result_handler(0, []) def _finished(): - query_sql = query_template % (conf.TEST_CASE_PRE + measurement, - task_id) - data = common_utils.translate_to_str(influx_utils.query(query_sql)) - if not data: - query_sql = query_template % (measurement, task_id) + testcases = task.details.split(',') + + def get_data(testcase): + query_template = "select * from %s where task_id='%s'" + query_sql = query_template % (testcase, task_id) data = common_utils.translate_to_str(influx_utils.query(query_sql)) + return data + + result = {k: get_data(k) for k in testcases} - return common_utils.result_handler(1, data) + return common_utils.result_handler(1, result) def _error(): - return common_utils.result_handler(2, data[0]['error']) + return common_utils.result_handler(2, task.error) try: - status = data[0]['status'] + status = task.status switcher = { 0: _unfinished, diff --git a/api/resources/samples_action.py b/api/resources/samples_action.py index 545447aec..df6db17ee 100644 --- a/api/resources/samples_action.py +++ b/api/resources/samples_action.py @@ -19,11 +19,11 @@ logger = logging.getLogger(__name__) def runTestCase(args): try: opts = args.get('opts', {}) - testcase = args['testcase'] + testcase_name = args['testcase'] except KeyError: return common_utils.error_handler('Lack of testcase argument') - testcase = os.path.join(conf.SAMPLE_PATH, testcase + '.yaml') + testcase = os.path.join(conf.SAMPLE_PATH, testcase_name + '.yaml') task_id = str(uuid.uuid4()) @@ -32,6 +32,10 @@ def runTestCase(args): logger.debug('The command_list is: %s', command_list) logger.debug('Start to execute command list') - common_utils.exec_command_task(command_list, task_id) + task_dict = { + 'task_id': task_id, + 'details': testcase_name + } + common_utils.exec_command_task(command_list, task_dict) return common_utils.result_handler('success', task_id) diff --git a/api/server.py b/api/server.py index fac821b00..8cce4de87 100644 --- a/api/server.py +++ b/api/server.py @@ -7,13 +7,17 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## import logging +from itertools import ifilter +import inspect from flask import Flask from flask_restful import Api from flasgger import Swagger -from api.database import init_db +from api.database import Base +from api.database import engine from api.database import db_session +from api.database import models from api.urls import urlpatterns from yardstick import _init_logging @@ -21,8 +25,6 @@ logger = logging.getLogger(__name__) app = Flask(__name__) -init_db() - Swagger(app) api = Api(app) @@ -33,6 +35,21 @@ def shutdown_session(exception=None): db_session.remove() +def init_db(): + def func(a): + try: + if issubclass(a[1], Base): + return True + except TypeError: + pass + return False + + subclses = ifilter(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) diff --git a/api/urls.py b/api/urls.py index 0fffd12db..273fb40f8 100644 --- a/api/urls.py +++ b/api/urls.py @@ -11,6 +11,7 @@ from api.utils.common import Url urlpatterns = [ + Url('/yardstick/asynctask', views.Asynctask, 'asynctask'), Url('/yardstick/testcases/release/action', views.ReleaseAction, 'release'), Url('/yardstick/testcases/samples/action', views.SamplesAction, 'samples'), Url('/yardstick/results', views.Results, 'results'), diff --git a/api/utils/common.py b/api/utils/common.py index e3e64a72b..6971c6dfe 100644 --- a/api/utils/common.py +++ b/api/utils/common.py @@ -40,8 +40,8 @@ def get_command_list(command_list, opts, args): return command_list -def exec_command_task(command_list, task_id): # pragma: no cover - daemonthread = DaemonThread(YardstickCLI().api, (command_list, task_id)) +def exec_command_task(command_list, task_dict): # pragma: no cover + daemonthread = DaemonThread(YardstickCLI().api, (command_list, task_dict)) daemonthread.start() diff --git a/api/utils/daemonthread.py b/api/utils/daemonthread.py index 47c0b9108..19182c429 100644 --- a/api/utils/daemonthread.py +++ b/api/utils/daemonthread.py @@ -8,11 +8,10 @@ ############################################################################## import threading import os -import datetime import errno from api import conf -from api.utils.influx import write_data_tasklist +from api.database.handlers import TasksHandler class DaemonThread(threading.Thread): @@ -21,19 +20,24 @@ class DaemonThread(threading.Thread): super(DaemonThread, self).__init__(target=method, args=args) self.method = method self.command_list = args[0] - self.task_id = args[1] + self.task_dict = args[1] def run(self): - timestamp = datetime.datetime.now() + self.task_dict['status'] = 0 + task_id = self.task_dict['task_id'] try: - write_data_tasklist(self.task_id, timestamp, 0) - self.method(self.command_list, self.task_id) - write_data_tasklist(self.task_id, timestamp, 1) + task_handler = TasksHandler() + task = task_handler.insert(self.task_dict) + + self.method(self.command_list, task_id) + + task_handler.update_status(task, 1) except Exception as e: - write_data_tasklist(self.task_id, timestamp, 2, error=str(e)) + task_handler.update_status(task, 2) + task_handler.update_error(task, str(e)) finally: - _handle_testsuite_file(self.task_id) + _handle_testsuite_file(task_id) def _handle_testsuite_file(task_id): diff --git a/api/utils/influx.py b/api/utils/influx.py index 9366ed3e9..d4b070fb4 100644 --- a/api/utils/influx.py +++ b/api/utils/influx.py @@ -7,10 +7,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## import logging +import ConfigParser from urlparse import urlsplit from influxdb import InfluxDBClient -import ConfigParser from api import conf @@ -21,46 +21,26 @@ def get_data_db_client(): parser = ConfigParser.ConfigParser() try: parser.read(conf.OUTPUT_CONFIG_FILE_PATH) - dispatcher = parser.get('DEFAULT', 'dispatcher') - if 'influxdb' != dispatcher: + if 'influxdb' != parser.get('DEFAULT', 'dispatcher'): raise RuntimeError - ip = _get_ip(parser.get('dispatcher_influxdb', 'target')) - username = parser.get('dispatcher_influxdb', 'username') - password = parser.get('dispatcher_influxdb', 'password') - db_name = parser.get('dispatcher_influxdb', 'db_name') - return InfluxDBClient(ip, conf.PORT, username, password, db_name) + return _get_client(parser) except ConfigParser.NoOptionError: logger.error('can not find the key') raise -def _get_ip(url): - return urlsplit(url).hostname +def _get_client(parser): + ip = _get_ip(parser.get('dispatcher_influxdb', 'target')) + username = parser.get('dispatcher_influxdb', 'username') + password = parser.get('dispatcher_influxdb', 'password') + db_name = parser.get('dispatcher_influxdb', 'db_name') + return InfluxDBClient(ip, conf.PORT, username, password, db_name) -def _write_data(measurement, field, timestamp, tags): - point = { - 'measurement': measurement, - 'fields': field, - 'time': timestamp, - 'tags': tags - } - - try: - client = get_data_db_client() - - logger.debug('Start to write data: %s', point) - client.write_points([point]) - except RuntimeError: - logger.debug('dispatcher is not influxdb') - - -def write_data_tasklist(task_id, timestamp, status, error=''): - field = {'status': status, 'error': error} - tags = {'task_id': task_id} - _write_data('tasklist', field, timestamp, tags) +def _get_ip(url): + return urlsplit(url).hostname def query(query_sql): diff --git a/api/views.py b/api/views.py index ee13b47a9..69ca89186 100644 --- a/api/views.py +++ b/api/views.py @@ -24,6 +24,11 @@ TestCaseActionArgsOptsModel = models.TestCaseActionArgsOptsModel TestCaseActionArgsOptsTaskArgModel = models.TestCaseActionArgsOptsTaskArgModel +class Asynctask(ApiResource): + def get(self): + return self._dispatch_get() + + class ReleaseAction(ApiResource): @swag_from(os.getcwd() + '/swagger/docs/testcases.yaml') def post(self): diff --git a/samples/tosca.yaml b/samples/tosca.yaml index 4472f7ef8..21c789133 100644 --- a/samples/tosca.yaml +++ b/samples/tosca.yaml @@ -5,145 +5,147 @@ import: metadata: - ID:clearwater - Vendor:HP + ID: clearwater + Vendor: HP dsl_definitions: - compute_props_host_ellis:&compute_props_host_ellis - num_cpu:4 - mem_size:4096 - compute_props_host_bono:&compute_props_host_bono - num_cpu:3 - mem_size:2048 + compute_props_host_ellis: &compute_props_host_ellis + num_cpu: 4 + mem_size: 4096 + compute_props_host_bono: &compute_props_host_bono + num_cpu: 3 + mem_size: 2048 node_types: - tosca.nodes.compute.ellis: - derived_from:tosca.nodes.compute + tosca.nodes.compute.ellis: + derived_from: tosca.nodes.compute - tosca.nodes.compute.bono: - derived_from:tosca.nodes.compute + tosca.nodes.compute.bono: + derived_from: tosca.nodes.compute topology_template: - # a description of the topology template - description:> - Vdus used in a vnfd - inputs: - storage_size: - type:scalar-unit.size - default:2048 - description:The required storage resource - storage_location: - type:string - description:> - Block storage mount point (filesystem path). - node_templates: + # A description of the topology template + description: > + Vdus used in a vnfd + inputs: + storage_size: + type: scalar-unit.size + default: 2048 + description: The required storage resource + default: 3000 + description: The required storage resource + storage_location: + type: string + description: > + Block storage mount point (filesystem path). + node_templates: ellis: - type:tosca.nodes.Compute - capabilities: - os: - properties: - architecture: - type: - distribution: - version: - host: - properties:*compute_props_host_ellis - scalable: - properties: - min_instances:1 - default_instances:1 - requirements: - - local_storage: - node:ellis_BlockStorage - relationship: - type:AttachesTo - properties: - location:{ get_input:storage_location } - interfaces: - Standard: - start: - implementation:start.sh - delete: - implementaion:stop.sh - stop: - implementaion:shutdown.sh + type: tosca.nodes.Compute + capabilities: + os: + properties: + architecture: + type: + distribution: + version: + host: + properties: *compute_props_host_ellis + scalable: + properties: + min_instances: 1 + default_instances: 1 + requirements: + - local_storage: + node: ellis_BlockStorage + relationship: + type: AttachesTo + properties: + location: { get_input:storage_location } + interfaces: + Standard: + start: + implementation: start.sh + delete: + implementaion: stop.sh + stop: + implementaion: shutdown.sh ellis_BlockStorage: - type:tosca.nodes.BlockStorage - properties: - size:{ get_input:storage_size } + type: tosca.nodes.BlockStorage + properties: + size: { get_input:storage_size } bono: - type:tosca.nodes.Compute - capabilities: - os: - properties: - architecture: - type: - distribution: - version: - host: - properties:*compute_props_host_bono - scalable: - properties: - min_instances:3 - default_instances:3 - requirements: - - local_storage: - node:bono_BlockStorage - relationship: - type:AttachesTo - properties: - location:{ get_input:storage_location } - interfaces: - Standard: - start: - implementation:start.sh - delete: - implementaion:stop.sh - stop: - implementaion:shutdown.sh + type: tosca.nodes.Compute + capabilities: + os: + properties: + architecture: + type: + distribution: + version: + host: + properties: *compute_props_host_bono + scalable: + properties: + min_instances: 3 + default_instances: 3 + requirements: + - local_storage: + node: bono_BlockStorage + relationship: + type: AttachesTo + properties: + location: { get_input:storage_location } + interfaces: + Standard: + start: + implementation: start.sh + delete: + implementaion: stop.sh + stop: + implementaion: shutdown.sh bono_BlockStorage: - type:tosca.nodes.BlockStorage - properties: - size:{ get_input:storage_size } + type: tosca.nodes.BlockStorage + properties: + size: { get_input:storage_size } clearwater_network1: - type:tosca.nodes.network.Network - properties: - ip_version:4 - ellis_port1: - type:tosca.nodes.network.Port - requirements: - - binding: - node:ellis - - link: - node:clearwater_network1 + type:tosca.nodes.network.Network + properties: + ip_version:4 + ellis_port1: + type:tosca.nodes.network.Port + requirements: + - binding: + node:ellis + - link: + node:clearwater_network1 clearwater_network2: - type:tosca.nodes.network.Network - properties: - ip_version:4 - ellis_port2: - type:tosca.nodes.network.Port - requirements: - - binding: - node:ellis - - link: - node:clearwater_network2 + type:tosca.nodes.network.Network + properties: + ip_version:4 + ellis_port2: + type:tosca.nodes.network.Port + requirements: + - binding: + node:ellis + - link: + node:clearwater_network2 clearwater_network1: - type:tosca.nodes.network.Network - properties: - ip_version:4 - bono_port1: - type:tosca.nodes.network.Port - requirements: - - binding: - node:bono - - link: - node:clearwater_network1 + type:tosca.nodes.network.Network + properties: + ip_version:4 + bono_port1: + type:tosca.nodes.network.Port + requirements: + - binding: + node:bono + - link: + node:clearwater_network1 clearwater_network2: - type:tosca.nodes.network.Network - properties: - ip_version:4 - bono_port2: - type:tosca.nodes.network.Port - requirements: - - binding: - node:bono - - link: - node:clearwater_network2
\ No newline at end of file + type:tosca.nodes.network.Network + properties: + ip_version:4 + bono_port2: + type:tosca.nodes.network.Port + requirements: + - binding: + node:bono + - link: + node:clearwater_network2
\ No newline at end of file diff --git a/tests/unit/cmd/commands/__init__.py b/tests/unit/cmd/commands/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/unit/cmd/commands/__init__.py diff --git a/tests/unit/cmd/commands/test_env.py b/tests/unit/cmd/commands/test_env.py index af1ab8030..e85c36755 100644 --- a/tests/unit/cmd/commands/test_env.py +++ b/tests/unit/cmd/commands/test_env.py @@ -8,17 +8,56 @@ ############################################################################## import unittest import mock +import uuid from yardstick.cmd.commands.env import EnvCommand class EnvCommandTestCase(unittest.TestCase): - @mock.patch('yardstick.cmd.commands.env.HttpClient') - def test_do_influxdb(self, mock_http_client): + @mock.patch('yardstick.cmd.commands.env.EnvCommand._start_async_task') + @mock.patch('yardstick.cmd.commands.env.EnvCommand._check_status') + def test_do_influxdb(self, check_status_mock, start_async_task_mock): env = EnvCommand() env.do_influxdb({}) - self.assertTrue(mock_http_client().post.called) + self.assertTrue(start_async_task_mock.called) + self.assertTrue(check_status_mock.called) + + @mock.patch('yardstick.cmd.commands.env.EnvCommand._start_async_task') + @mock.patch('yardstick.cmd.commands.env.EnvCommand._check_status') + def test_do_grafana(self, check_status_mock, start_async_task_mock): + env = EnvCommand() + env.do_grafana({}) + self.assertTrue(start_async_task_mock.called) + self.assertTrue(check_status_mock.called) + + @mock.patch('yardstick.cmd.commands.env.EnvCommand._start_async_task') + @mock.patch('yardstick.cmd.commands.env.EnvCommand._check_status') + def test_do_prepare(self, check_status_mock, start_async_task_mock): + env = EnvCommand() + env.do_prepare({}) + self.assertTrue(start_async_task_mock.called) + self.assertTrue(check_status_mock.called) + + @mock.patch('yardstick.cmd.commands.env.HttpClient.post') + def test_start_async_task(self, post_mock): + data = {'action': 'createGrafanaContainer'} + EnvCommand()._start_async_task(data) + self.assertTrue(post_mock.called) + + @mock.patch('yardstick.cmd.commands.env.HttpClient.get') + @mock.patch('yardstick.cmd.commands.env.EnvCommand._print_status') + def test_check_status(self, print_mock, get_mock): + task_id = str(uuid.uuid4()) + get_mock.return_value = {'status': 2, 'result': 'error'} + status = EnvCommand()._check_status(task_id, 'hello world') + self.assertEqual(status, 2) + + def test_print_status(self): + try: + EnvCommand()._print_status('hello', 'word') + except Exception as e: + self.assertIsInstance(e, IndexError) def main(): diff --git a/tests/unit/common/test_httpClient.py b/tests/unit/common/test_httpClient.py index b39dc2332..94ac1c891 100644 --- a/tests/unit/common/test_httpClient.py +++ b/tests/unit/common/test_httpClient.py @@ -24,6 +24,12 @@ class HttpClientTestCase(unittest.TestCase): mock_requests.post.assert_called_with(url, data=json.dumps(data), headers=headers) + @mock.patch('yardstick.common.httpClient.requests') + def test_get(self, mock_requests): + url = 'http://localhost:5000/hello' + httpClient.HttpClient().get(url) + mock_requests.get.assert_called_with(url) + def main(): unittest.main() diff --git a/yardstick/benchmark/scenarios/parser/parser.py b/yardstick/benchmark/scenarios/parser/parser.py index 006258d05..bb16e7c89 100644 --- a/yardstick/benchmark/scenarios/parser/parser.py +++ b/yardstick/benchmark/scenarios/parser/parser.py @@ -58,10 +58,12 @@ class Parser(base.Scenario): cmd1 = "%s %s %s" % (self.parser_script, yangfile, toscafile) cmd2 = "chmod 777 %s" % (self.parser_script) subprocess.call(cmd2, shell=True) - output = subprocess.call(cmd1, shell=True, stdout=subprocess.PIPE) + p = subprocess.Popen(cmd1, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + p.communicate() print "yangtotosca finished" - result['yangtotosca'] = "success" if output == 0 else "fail" + result['yangtotosca'] = "success" if p.returncode == 0 else "fail" def teardown(self): ''' for scenario teardown remove parser and pyang ''' diff --git a/yardstick/cmd/commands/env.py b/yardstick/cmd/commands/env.py index 098379ae1..d0fc75dd3 100644 --- a/yardstick/cmd/commands/env.py +++ b/yardstick/cmd/commands/env.py @@ -6,13 +6,13 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import logging +from __future__ import print_function +import time +import os +import sys from yardstick.common.httpClient import HttpClient -from yardstick.common import constants - -logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) +from yardstick.common import constants as consts class EnvCommand(object): @@ -21,19 +21,63 @@ class EnvCommand(object): Set of commands to prepare environment ''' def do_influxdb(self, args): - url = constants.YARDSTICK_ENV_ACTION_API data = {'action': 'createInfluxDBContainer'} - HttpClient().post(url, data) - logger.debug('Now creating and configing influxdb') + task_id = self._start_async_task(data) + + start = '* creating influxDB' + self._check_status(task_id, start) def do_grafana(self, args): - url = constants.YARDSTICK_ENV_ACTION_API data = {'action': 'createGrafanaContainer'} - HttpClient().post(url, data) - logger.debug('Now creating and configing grafana') + task_id = self._start_async_task(data) + + start = '* creating grafana' + self._check_status(task_id, start) def do_prepare(self, args): - url = constants.YARDSTICK_ENV_ACTION_API data = {'action': 'prepareYardstickEnv'} - HttpClient().post(url, data) - logger.debug('Now preparing environment') + task_id = self._start_async_task(data) + + start = '* preparing yardstick environment' + self._check_status(task_id, start) + + def _start_async_task(self, data): + url = consts.ENV_ACTION_API + return HttpClient().post(url, data)['result']['task_id'] + + def _check_status(self, task_id, start): + self._print_status(start, '[]\r') + url = '{}?task_id={}'.format(consts.ASYNC_TASK_API, task_id) + + CHECK_STATUS_RETRY = 20 + CHECK_STATUS_DELAY = 5 + + for retry in xrange(CHECK_STATUS_RETRY): + response = HttpClient().get(url) + status = response['status'] + + if status: + break + + # wait until the async task finished + time.sleep(CHECK_STATUS_DELAY * (retry + 1)) + + switcher = { + 0: 'Timeout', + 1: 'Finished', + 2: 'Error' + } + self._print_status(start, '[{}]'.format(switcher[status])) + if status == 2: + print(response['result']) + sys.stdout.flush() + return status + + def _print_status(self, s, e): + try: + columns = int(os.popen('stty size', 'r').read().split()[1]) + word = '{}{}{}'.format(s, ' ' * (columns - len(s) - len(e)), e) + sys.stdout.write(word) + sys.stdout.flush() + except IndexError: + pass diff --git a/yardstick/common/constants.py b/yardstick/common/constants.py index 705e1ad87..174d39bfe 100644 --- a/yardstick/common/constants.py +++ b/yardstick/common/constants.py @@ -51,4 +51,6 @@ LOAD_IMAGES_SCRIPT = 'tests/ci/load_images.sh' OPENSTACK_RC_FILE = join(YARDSTICK_CONFIG_DIR, 'openstack.creds') -YARDSTICK_ENV_ACTION_API = 'http://localhost:5000/yardstick/env/action' +BASE_URL = 'http://localhost:5000' +ENV_ACTION_API = BASE_URL + '/yardstick/env/action' +ASYNC_TASK_API = BASE_URL + '/yardstick/asynctask' diff --git a/yardstick/common/httpClient.py b/yardstick/common/httpClient.py index ab2e9a379..6acd0303d 100644 --- a/yardstick/common/httpClient.py +++ b/yardstick/common/httpClient.py @@ -28,3 +28,7 @@ class HttpClient(object): except Exception as e: logger.debug('Failed: %s', e) raise + + def get(self, url): + response = requests.get(url) + return response.json() |