Merge changes from topics 'get_project', 'get_projects'

* changes:
  Add API(V2) to get certain project info
  Add API(v2) to get all projects info

2 files changed, 35 insertions, 0 deletions

diff --git a/api/database/v2/handlers.py b/api/database/v2/handlers.py
index 3474af2c1..44c14df61 100644
--- a/api/database/v2/handlers.py
+++ b/api/database/v2/handlers.py
@@ -136,6 +136,9 @@ class V2ContainerHandler(object):
 
 class V2ProjectHandler(object):
 
+    def list_all(self):
+        return V2Project.query.all()
+
     def insert(self, kwargs):
         project = V2Project(**kwargs)
         db_session.add(project)
diff --git a/api/resources/v2/projects.py b/api/resources/v2/projects.py
index e787cc333..7d51cf040 100644
--- a/api/resources/v2/projects.py
+++ b/api/resources/v2/projects.py
@@ -5,11 +5,22 @@ from datetime import datetime
 from api import ApiResource
 from api.database.v2.handlers import V2ProjectHandler
 from yardstick.common.utils import result_handler
+from yardstick.common.utils import change_obj_to_dict
 from yardstick.common import constants as consts
 
 
 class V2Projects(ApiResource):
 
+    def get(self):
+        project_handler = V2ProjectHandler()
+        projects = [change_obj_to_dict(p) for p in project_handler.list_all()]
+
+        for p in projects:
+            tasks = p['tasks']
+            p['tasks'] = tasks.split(',') if tasks else []
+
+        return result_handler(consts.API_SUCCESS, {'projects': projects})
+
     def post(self):
         return self._dispatch_post()
 
@@ -31,3 +42,24 @@ class V2Projects(ApiResource):
         project_handler.insert(project_init_data)
 
         return result_handler(consts.API_SUCCESS, {'uuid': project_id})
+
+
+class V2Project(ApiResource):
+
+    def get(self, project_id):
+        try:
+            uuid.UUID(project_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'invalid project id')
+
+        project_handler = V2ProjectHandler()
+        try:
+            project = project_handler.get_by_uuid(project_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'no such project id')
+
+        project_info = change_obj_to_dict(project)
+        tasks = project_info['tasks']
+        project_info['tasks'] = tasks.split(',') if tasks else []
+
+        return result_handler(consts.API_SUCCESS, {'project': project_info})