From baa8f2d5f67d45e5761f92cb93fe22050f08d0fe Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 27 Feb 2018 14:25:49 +0100 Subject: Clean all OpenStack related modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xtesting is only focused on the framework and entry points. Change-Id: I1a4146ed8519438b13810a20ddf1140c35bb6ecd Signed-off-by: Cédric Ollivier --- functest/api/database/__init__.py | 0 functest/api/database/db.py | 26 ---------------------- functest/api/database/v1/__init__.py | 0 functest/api/database/v1/handlers.py | 43 ------------------------------------ functest/api/database/v1/models.py | 33 --------------------------- 5 files changed, 102 deletions(-) delete mode 100644 functest/api/database/__init__.py delete mode 100644 functest/api/database/db.py delete mode 100644 functest/api/database/v1/__init__.py delete mode 100644 functest/api/database/v1/handlers.py delete mode 100644 functest/api/database/v1/models.py (limited to 'functest/api/database') diff --git a/functest/api/database/__init__.py b/functest/api/database/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/functest/api/database/db.py b/functest/api/database/db.py deleted file mode 100644 index ea861ddb..00000000 --- a/functest/api/database/db.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# 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 - -""" -Create database to store task results using sqlalchemy -""" - -from sqlalchemy import create_engine -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import scoped_session, sessionmaker - - -SQLITE = 'sqlite:////tmp/functest.db' - -ENGINE = create_engine(SQLITE, convert_unicode=True) -DB_SESSION = scoped_session(sessionmaker(autocommit=False, - autoflush=False, - bind=ENGINE)) -BASE = declarative_base() -BASE.query = DB_SESSION.query_property() diff --git a/functest/api/database/v1/__init__.py b/functest/api/database/v1/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/functest/api/database/v1/handlers.py b/functest/api/database/v1/handlers.py deleted file mode 100644 index 7bd286de..00000000 --- a/functest/api/database/v1/handlers.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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 - -""" -Used to handle tasks: insert the task info into database and update it -""" - -from functest.api.database.db import DB_SESSION -from functest.api.database.v1.models import Tasks - - -class TasksHandler(object): - """ Tasks Handler Class """ - - def insert(self, kwargs): # pylint: disable=no-self-use - """ To insert the task info into database """ - task = Tasks(**kwargs) - DB_SESSION.add(task) # pylint: disable=maybe-no-member - DB_SESSION.commit() # pylint: disable=maybe-no-member - return task - - def get_task_by_taskid(self, task_id): # pylint: disable=no-self-use - """ Obtain the task by task id """ - # pylint: disable=maybe-no-member - task = Tasks.query.filter_by(task_id=task_id).first() - if not task: - raise ValueError - - return task - - def update_attr(self, task_id, attr): - """ Update the required attributes of the task """ - task = self.get_task_by_taskid(task_id) - - for key, value in attr.items(): - setattr(task, key, value) - DB_SESSION.commit() # pylint: disable=maybe-no-member diff --git a/functest/api/database/v1/models.py b/functest/api/database/v1/models.py deleted file mode 100644 index c5de91bc..00000000 --- a/functest/api/database/v1/models.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -# 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 - -""" -Define tables for tasks -""" - -from sqlalchemy import Column -from sqlalchemy import Integer -from sqlalchemy import String -from sqlalchemy import Text - -from functest.api.database.db import BASE - - -class Tasks(BASE): # pylint: disable=too-few-public-methods, no-init - """ Create a table for tasks""" - - __tablename__ = 'tasks' - id = Column(Integer, primary_key=True) # pylint: disable=invalid-name - task_id = Column(String(50)) - status = Column(Integer) - error = Column(String(120)) - result = Column(Text) - - def __repr__(self): - return '' % Tasks.task_id -- cgit 1.2.3-korg