summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-09-05 12:22:27 +0000
committerLinda Wang <wangwulin@huawei.com>2017-09-05 12:22:27 +0000
commit808319c010baf449808214ec06237b4703af39c6 (patch)
tree6fddac942ac6cf3a164cc046b2fcce264aa9ffcb
parent38906080fd7c30a7f39ce9daa68d9150d63f80e3 (diff)
unify all the return status as number
Change-Id: I835a368fe78329e60e811e40c24f3609c7a8960c Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--functest/api/resources/v1/tasks.py14
-rw-r--r--functest/api/resources/v1/testcases.py16
-rw-r--r--functest/api/resources/v1/tiers.py11
3 files changed, 31 insertions, 10 deletions
diff --git a/functest/api/resources/v1/tasks.py b/functest/api/resources/v1/tasks.py
index e05db51be..f099918f4 100644
--- a/functest/api/resources/v1/tasks.py
+++ b/functest/api/resources/v1/tasks.py
@@ -50,12 +50,15 @@ class V1Task(ApiResource):
if status not in ['IN PROGRESS', 'FAIL', 'FINISHED']:
return api_utils.result_handler(status=1,
data='internal server error')
+
+ switcher = {'IN PROGRESS': 0, 'FAIL': 1, 'FINISHED': 2}
if status == 'IN PROGRESS':
- result = {'status': status, 'result': ''}
+ result = {'status': switcher.get(status), 'result': ''}
elif status == 'FAIL':
- result = {'status': status, 'error': task.error}
+ result = {'status': switcher.get(status), 'error': task.error}
else:
- result = {'status': status, 'result': json.loads(task.result)}
+ result = {'status': switcher.get(status),
+ 'result': json.loads(task.result)}
return jsonify(result)
@@ -92,4 +95,7 @@ class V1TaskLog(ApiResource):
return_data = {'data': data}
- return api_utils.result_handler(status=task.status, data=return_data)
+ switcher = {'IN PROGRESS': 0, 'FAIL': 1, 'FINISHED': 2}
+
+ return api_utils.result_handler(status=switcher.get(task.status),
+ data=return_data)
diff --git a/functest/api/resources/v1/testcases.py b/functest/api/resources/v1/testcases.py
index d708cf37b..b7d7b4aa3 100644
--- a/functest/api/resources/v1/testcases.py
+++ b/functest/api/resources/v1/testcases.py
@@ -17,7 +17,7 @@ import pkg_resources
import uuid
import ConfigParser
-from flask import abort, jsonify
+from flask import jsonify
from functest.api.base import ApiResource
from functest.api.common import api_utils, thread
@@ -46,8 +46,11 @@ class V1Testcase(ApiResource):
""" GET the info of one testcase"""
testcase = Testcase().show(testcase_name)
if not testcase:
- abort(404, "The test case '%s' does not exist or is not supported"
- % testcase_name)
+ return api_utils.result_handler(
+ status=1,
+ data="The test case '%s' does not exist or is not supported"
+ % testcase_name)
+
testcase_info = api_utils.change_obj_to_dict(testcase)
dependency_dict = api_utils.change_obj_to_dict(
testcase_info.get('dependency'))
@@ -70,6 +73,13 @@ class V1Testcase(ApiResource):
return api_utils.result_handler(
status=1, data='testcase name must be provided')
+ testcase = Testcase().show(case_name)
+ if not testcase:
+ return api_utils.result_handler(
+ status=1,
+ data="The test case '%s' does not exist or is not supported"
+ % case_name)
+
task_id = str(uuid.uuid4())
task_args = {'testcase': case_name, 'task_id': task_id}
diff --git a/functest/api/resources/v1/tiers.py b/functest/api/resources/v1/tiers.py
index 71a98bea6..4f4849e98 100644
--- a/functest/api/resources/v1/tiers.py
+++ b/functest/api/resources/v1/tiers.py
@@ -13,9 +13,10 @@ Resources to handle tier related requests
import re
-from flask import abort, jsonify
+from flask import jsonify
from functest.api.base import ApiResource
+from functest.api.common import api_utils
from functest.cli.commands.cli_tier import Tier
@@ -46,7 +47,9 @@ class V1Tier(ApiResource):
""" GET the info of one tier """
testcases = Tier().gettests(tier_name)
if not testcases:
- abort(404, "The tier with name '%s' does not exist." % tier_name)
+ return api_utils.result_handler(
+ status=1,
+ data="The tier with name '%s' does not exist." % tier_name)
tier_info = Tier().show(tier_name)
tier_info.__dict__.pop('name')
tier_info.__dict__.pop('tests_array')
@@ -62,6 +65,8 @@ class V1TestcasesinTier(ApiResource):
""" GET all testcases within given tier """
testcases = Tier().gettests(tier_name)
if not testcases:
- abort(404, "The tier with name '%s' does not exist." % tier_name)
+ return api_utils.result_handler(
+ status=1,
+ data="The tier with name '%s' does not exist." % tier_name)
result = {'tier': tier_name, 'testcases': testcases}
return jsonify(result)