From da62008a0a98cb8793ea42827a7da5e149edd144 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Mon, 26 Jun 2017 09:46:24 +0000 Subject: Call core code directly in the API of run test case JIRA: YARDSTICK-688 We need to call core code directly in the API of runTestCase. It would be more stable. Change-Id: I431a85ded7cd3b20da0462f947c25d91bb99decd Signed-off-by: chenjiankun --- api/database/handler.py | 30 ---------------------- api/database/handlers.py | 31 ----------------------- api/database/models.py | 37 --------------------------- api/database/v1/__init__.py | 0 api/database/v1/handlers.py | 62 +++++++++++++++++++++++++++++++++++++++++++++ api/database/v1/models.py | 39 ++++++++++++++++++++++++++++ 6 files changed, 101 insertions(+), 98 deletions(-) delete mode 100644 api/database/handler.py delete mode 100644 api/database/handlers.py delete mode 100644 api/database/models.py create mode 100644 api/database/v1/__init__.py create mode 100644 api/database/v1/handlers.py create mode 100644 api/database/v1/models.py (limited to 'api/database') diff --git a/api/database/handler.py b/api/database/handler.py deleted file mode 100644 index f6a22578f..000000000 --- a/api/database/handler.py +++ /dev/null @@ -1,30 +0,0 @@ -# ############################################################################ -# Copyright (c) 2017 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 api.database import db_session -from api.database.models import AsyncTasks - - -class AsyncTaskHandler(object): - def insert(self, kwargs): - task = AsyncTasks(**kwargs) - db_session.add(task) - db_session.commit() - return task - - def update_status(self, task, status): - task.status = status - db_session.commit() - - def update_error(self, task, error): - task.error = error - db_session.commit() - - def get_task_by_taskid(self, task_id): - task = AsyncTasks.query.filter_by(task_id=task_id).first() - return task diff --git a/api/database/handlers.py b/api/database/handlers.py deleted file mode 100644 index 42979b529..000000000 --- a/api/database/handlers.py +++ /dev/null @@ -1,31 +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 api.database import db_session -from api.database.models import Tasks - - -class TasksHandler(object): - - def insert(self, kwargs): - task = Tasks(**kwargs) - db_session.add(task) - db_session.commit() - return task - - def update_status(self, task, status): - task.status = status - db_session.commit() - - def update_error(self, task, error): - task.error = error - db_session.commit() - - def get_task_by_taskid(self, task_id): - task = Tasks.query.filter_by(task_id=task_id).first() - return task diff --git a/api/database/models.py b/api/database/models.py deleted file mode 100644 index 2270de96b..000000000 --- a/api/database/models.py +++ /dev/null @@ -1,37 +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 -from sqlalchemy import Column -from sqlalchemy import Integer -from sqlalchemy import String - -from api.database import Base - - -class Tasks(Base): - __tablename__ = 'tasks' - id = Column(Integer, primary_key=True) - task_id = Column(String(30)) - status = Column(Integer) - error = Column(String(120)) - details = Column(String(120)) - - def __repr__(self): - return '' % Tasks.task_id - - -class AsyncTasks(Base): - __tablename__ = 'asynctasks' - id = Column(Integer, primary_key=True) - task_id = Column(String(30)) - status = Column(Integer) - error = Column(String(120)) - - def __repr__(self): - return '' % AsyncTasks.task_id diff --git a/api/database/v1/__init__.py b/api/database/v1/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/api/database/v1/handlers.py b/api/database/v1/handlers.py new file mode 100644 index 000000000..f7c448cda --- /dev/null +++ b/api/database/v1/handlers.py @@ -0,0 +1,62 @@ +############################################################################## +# 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 api.database import db_session +from api.database.v1.models import Tasks +from api.database.v1.models import AsyncTasks + + +class TasksHandler(object): + + def insert(self, kwargs): + task = Tasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = Tasks.query.filter_by(task_id=task_id).first() + if not task: + raise ValueError + + return task + + def update_attr(self, task_id, attr): + task = self.get_task_by_taskid(task_id) + + for k, v in attr.items(): + setattr(task, k, v) + db_session.commit() + + +class AsyncTaskHandler(object): + def insert(self, kwargs): + task = AsyncTasks(**kwargs) + db_session.add(task) + db_session.commit() + return task + + def update_status(self, task, status): + task.status = status + db_session.commit() + + def update_error(self, task, error): + task.error = error + db_session.commit() + + def get_task_by_taskid(self, task_id): + task = AsyncTasks.query.filter_by(task_id=task_id).first() + return task diff --git a/api/database/v1/models.py b/api/database/v1/models.py new file mode 100644 index 000000000..213e77f6e --- /dev/null +++ b/api/database/v1/models.py @@ -0,0 +1,39 @@ +############################################################################## +# 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 +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String +from sqlalchemy import Text + +from api.database import Base + + +class Tasks(Base): + __tablename__ = 'tasks' + id = Column(Integer, primary_key=True) + task_id = Column(String(30)) + status = Column(Integer) + error = Column(String(120)) + result = Column(Text) + details = Column(String(120)) + + def __repr__(self): + return '' % Tasks.task_id + + +class AsyncTasks(Base): + __tablename__ = 'asynctasks' + id = Column(Integer, primary_key=True) + task_id = Column(String(30)) + status = Column(Integer) + error = Column(String(120)) + + def __repr__(self): + return '' % AsyncTasks.task_id -- cgit 1.2.3-korg