Add sqlite and SQLAlchemy support for API

JIRA: YARDSTICK-505

Now yardstick API need a database to store API data.
And for future the yardstick GUI also need a self database.
So I choose a light-weight database sqlite.
And use SQLAlchemy to do ORM.

Change-Id: I1edc350ec6f57ad67785de549c2135c86ea60a4a
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>

diff --git a/api/database/__init__.py b/api/database/__init__.py
new file mode 100644 (file)
index 0000000..bc2708b
--- /dev/null
+++ b/api/database/__init__.py
@@ -0,0 +1,29 @@
+##############################################################################
+# 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 logging
+
+from sqlalchemy import create_engine
+from sqlalchemy.orm import scoped_session, sessionmaker
+from sqlalchemy.ext.declarative import declarative_base
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
+
+engine = create_engine('sqlite:////tmp/yardstick.db', convert_unicode=True)
+db_session = scoped_session(sessionmaker(autocommit=False,
+                                         autoflush=False,
+                                         bind=engine))
+Base = declarative_base()
+Base.query = db_session.query_property()
+
+
+def init_db():
+    subclasses = [subclass.__name__ for subclass in Base.__subclasses__()]
+    logger.debug('Import models: %s', subclasses)
+    Base.metadata.create_all(bind=engine)

diff --git a/api/database/models.py b/api/database/models.py
new file mode 100644 (file)
index 0000000..25e3238
--- /dev/null
+++ b/api/database/models.py
@@ -0,0 +1,25 @@
+##############################################################################
+# 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 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 '<Task %r>' % Tasks.task_id

diff --git a/api/server.py b/api/server.py
index 64a2b4f..fac821b 100644 (file)
--- a/api/server.py
+++ b/api/server.py
@@ -12,6 +12,8 @@ from flask import Flask
 from flask_restful import Api
 from flasgger import Swagger
 
+from api.database import init_db
+from api.database import db_session
 from api.urls import urlpatterns
 from yardstick import _init_logging
 
@@ -19,11 +21,18 @@ logger = logging.getLogger(__name__)
 
 app = Flask(__name__)
 
+init_db()
+
 Swagger(app)
 
 api = Api(app)
 
 
+@app.teardown_request
+def shutdown_session(exception=None):
+    db_session.remove()
+
+
 reduce(lambda a, b: a.add_resource(b.resource, b.url,
                                    endpoint=b.endpoint) or a, urlpatterns, api)
 

diff --git a/requirements.txt b/requirements.txt
index 6b4edf3..9c037ed 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -84,3 +84,4 @@ pyroute2==0.4.10
 docker-py==1.10.6
 flasgger==0.5.13
 flask-restful-swagger==0.19
+SQLAlchemy==1.1.4