X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=api%2Futils%2Fcommon.py;h=e3e64a72b7cfe4f973c715a141c71fc99565a929;hb=48a7b4fa8a9cfa2db8c002ffb68c46345551ee2a;hp=9d7998abd69c73a53484e0d03ae58f32f0ac5c83;hpb=eec370bc52caee7fe1633ae9f3ec8ac85ac50119;p=yardstick.git

diff --git a/api/utils/common.py b/api/utils/common.py
index 9d7998abd..e3e64a72b 100644
--- a/api/utils/common.py
+++ b/api/utils/common.py
@@ -1,8 +1,21 @@
+##############################################################################
+# 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 collections
+import logging
+
+from flask import jsonify
 
 from api.utils.daemonthread import DaemonThread
 from yardstick.cmd.cli import YardstickCLI
 
+logger = logging.getLogger(__name__)
+
 
 def translate_to_str(object):
     if isinstance(object, collections.Mapping):
@@ -20,9 +33,9 @@ def get_command_list(command_list, opts, args):
 
     command_list.extend(('--{}'.format(k) for k in opts if 'task-args' != k))
 
-    task_args = opts.get('task_args', '')
+    task_args = opts.get('task-args', '')
     if task_args:
-        command_list.extend(['--task-args', task_args])
+        command_list.extend(['--task-args', str(task_args)])
 
     return command_list
 
@@ -32,6 +45,23 @@ def exec_command_task(command_list, task_id):   # pragma: no cover
     daemonthread.start()
 
 
+def error_handler(message):
+    logger.debug(message)
+    result = {
+        'status': 'error',
+        'message': message
+    }
+    return jsonify(result)
+
+
+def result_handler(status, data):
+    result = {
+        'status': status,
+        'result': data
+    }
+    return jsonify(result)
+
+
 class Url(object):
 
     def __init__(self, url, resource, endpoint):