diff options
author | chenjiankun <chenjiankun1@huawei.com> | 2017-06-26 09:46:24 +0000 |
---|---|---|
committer | chenjiankun <chenjiankun1@huawei.com> | 2017-06-29 11:25:17 +0000 |
commit | da62008a0a98cb8793ea42827a7da5e149edd144 (patch) | |
tree | f91e35eabe04ebb8c6618345c0fd1b76c5f37a2c /api/database/v1 | |
parent | 1ff9df7e724eb0c981aebd5f5b8aa90db0da292b (diff) |
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 <chenjiankun1@huawei.com>
Diffstat (limited to 'api/database/v1')
-rw-r--r-- | api/database/v1/__init__.py | 0 | ||||
-rw-r--r-- | api/database/v1/handlers.py | 62 | ||||
-rw-r--r-- | api/database/v1/models.py | 39 |
3 files changed, 101 insertions, 0 deletions
diff --git a/api/database/v1/__init__.py b/api/database/v1/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/api/database/v1/__init__.py 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 '<Task %r>' % 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 '<Task %r>' % AsyncTasks.task_id |