From 43bf12d6ab7bcaea16dc75ed4ccbe3895cf51da3 Mon Sep 17 00:00:00 2001
From: chenjiankun <chenjiankun1@huawei.com>
Date: Wed, 9 Aug 2017 03:23:58 +0000
Subject: Add real time log view in GUI

JIRA: YARDSTICK-775

We have GUI now, but we can't see real time log in GUI view.
So I add real time log view in GUI.

Change-Id: Ie83f327ef0a94302afa6b3def764fec6ef5818d1
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---
 api/__init__.py           |  2 --
 api/resources/v2/tasks.py | 36 ++++++++++++++++++++++++++++++++++++
 api/urls.py               |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

(limited to 'api')

diff --git a/api/__init__.py b/api/__init__.py
index c5aefffe8..323502232 100644
--- a/api/__init__.py
+++ b/api/__init__.py
@@ -35,13 +35,11 @@ class ApiResource(Resource):
             pass
 
         args.update({k: v for k, v in request.form.items()})
-        LOG.debug('Input args is: action: %s, args: %s', action, args)
 
         return action, args
 
     def _get_args(self):
         args = common_utils.translate_to_str(request.args)
-        LOG.debug('Input args is: args: %s', args)
 
         return args
 
diff --git a/api/resources/v2/tasks.py b/api/resources/v2/tasks.py
index 885a190c6..25a9cf109 100644
--- a/api/resources/v2/tasks.py
+++ b/api/resources/v2/tasks.py
@@ -8,6 +8,8 @@
 ##############################################################################
 import uuid
 import logging
+import os
+import errno
 from datetime import datetime
 
 from oslo_serialization import jsonutils
@@ -252,3 +254,37 @@ class V2Task(ApiResource):
         task_thread.start()
 
         return result_handler(consts.API_SUCCESS, {'uuid': task_id})
+
+
+class V2TaskLog(ApiResource):
+
+    def get(self, task_id):
+        try:
+            uuid.UUID(task_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'invalid task id')
+
+        task_handler = V2TaskHandler()
+        try:
+            task = task_handler.get_by_uuid(task_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'no such task id')
+
+        index = int(self._get_args().get('index', 0))
+
+        try:
+            with open(os.path.join(consts.TASK_LOG_DIR, '{}.log'.format(task_id))) as f:
+                f.seek(index)
+                data = f.readlines()
+                index = f.tell()
+        except OSError as e:
+            if e.errno == errno.ENOENT:
+                return result_handler(consts.API_ERROR, 'log file does not exist')
+            return result_handler(consts.API_ERROR, 'error with log file')
+
+        return_data = {
+            'index': index,
+            'data': data
+        }
+
+        return result_handler(task.status, return_data)
diff --git a/api/urls.py b/api/urls.py
index 3fef91af8..83cf4daf9 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -48,6 +48,7 @@ urlpatterns = [
     Url('/api/v2/yardstick/tasks', 'v2_tasks'),
     Url('/api/v2/yardstick/tasks/action', 'v2_tasks'),
     Url('/api/v2/yardstick/tasks/<task_id>', 'v2_task'),
+    Url('/api/v2/yardstick/tasks/<task_id>/log', 'v2_task_log'),
 
     Url('/api/v2/yardstick/testcases', 'v2_testcases'),
     Url('/api/v2/yardstick/testcases/action', 'v2_testcases'),
-- 
cgit 1.2.3-korg