From 0d18f9d3299480cb43e6b335180e5cbdb58505c3 Mon Sep 17 00:00:00 2001
From: chenjiankun <chenjiankun1@huawei.com>
Date: Fri, 7 Jul 2017 03:13:36 +0000
Subject: Yardstick API architecture improvement

JIRA: YARDSTICK-710

Since we have the plan to upload api v2 and gui.
We need to add put and delete method.
So the architecture need to be improved.

Change-Id: Ie20a79c26ef6c581897ce4e63980fa2895b162d2
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---
 api/resources/results.py | 69 ------------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 api/resources/results.py

(limited to 'api/resources/results.py')

diff --git a/api/resources/results.py b/api/resources/results.py
deleted file mode 100644
index 692e00cc6..000000000
--- a/api/resources/results.py
+++ /dev/null
@@ -1,69 +0,0 @@
-##############################################################################
-# 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 __future__ import absolute_import
-import logging
-import uuid
-import json
-
-from api.utils.common import result_handler
-from api.database.v1.handlers import TasksHandler
-from yardstick.common import constants as consts
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-
-
-def default(args):
-    return getResult(args)
-
-
-def getResult(args):
-    try:
-        task_id = args['task_id']
-    except KeyError:
-        return result_handler(consts.API_ERROR, 'task_id must be provided')
-
-    try:
-        uuid.UUID(task_id)
-    except ValueError:
-        return result_handler(consts.API_ERROR, 'invalid task_id')
-
-    task_handler = TasksHandler()
-    try:
-        task = task_handler.get_task_by_taskid(task_id)
-    except ValueError:
-        return result_handler(consts.API_ERROR, 'invalid task_id')
-
-    def _unfinished():
-        return result_handler(consts.TASK_NOT_DONE, {})
-
-    def _finished():
-        if task.result:
-            return result_handler(consts.TASK_DONE, json.loads(task.result))
-        else:
-            return result_handler(consts.TASK_DONE, {})
-
-    def _error():
-        return result_handler(consts.TASK_FAILED, task.error)
-
-    status = task.status
-    logger.debug('Task status is: %s', status)
-
-    if status not in [consts.TASK_NOT_DONE,
-                      consts.TASK_DONE,
-                      consts.TASK_FAILED]:
-        return result_handler(consts.API_ERROR, 'internal server error')
-
-    switcher = {
-        consts.TASK_NOT_DONE: _unfinished,
-        consts.TASK_DONE: _finished,
-        consts.TASK_FAILED: _error
-    }
-
-    return switcher.get(status)()
-- 
cgit 1.2.3-korg