diff options
Diffstat (limited to 'api/resources')
| -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 |
3 files changed, 28 insertions, 24 deletions
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) |