Merge "Add jenkins build tag into result api"

3 files changed, 206 insertions, 197 deletions

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 01e1885cb..ba5cfec83 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -260,7 +260,7 @@
             echo "Functest: Start Docker and prepare environment"
             envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
                 -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-                -e CI_DEBUG=${CI_DEBUG}"
+                -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}"
             branch=${GIT_BRANCH##*/}
             dir_result="${HOME}/opnfv/functest/results/${branch}"
             mkdir -p ${dir_result}
diff --git a/utils/test/result_collection_api/resources/handlers.py b/utils/test/result_collection_api/resources/handlers.py
index 6443fc417..1f4d0bb7b 100644
--- a/utils/test/result_collection_api/resources/handlers.py
+++ b/utils/test/result_collection_api/resources/handlers.py
@@ -508,6 +508,7 @@ class TestResultsHandler(GenericApiHandler):
          - pod : pod name
          - version : platform version (Arno-R1, ...)
          - installer (fuel, ...)
+         - build_tag : Jenkins build tag name
          - period : x (x last days)
 
 
@@ -524,6 +525,7 @@ class TestResultsHandler(GenericApiHandler):
         pod_arg = self.get_query_argument("pod", None)
         version_arg = self.get_query_argument("version", None)
         installer_arg = self.get_query_argument("installer", None)
+        build_tag_arg = self.get_query_argument("build_tag", None)
         period_arg = self.get_query_argument("period", None)
 
         # prepare request
@@ -544,6 +546,9 @@ class TestResultsHandler(GenericApiHandler):
             if installer_arg is not None:
                 get_request["installer"] = installer_arg
 
+            if build_tag_arg is not None:
+                get_request["build_tag"] = build_tag_arg
+
             if period_arg is not None:
                 try:
                     period_arg = int(period_arg)
diff --git a/utils/test/result_collection_api/resources/models.py b/utils/test/result_collection_api/resources/models.py
index a15d4e34b..8f7522226 100644
--- a/utils/test/result_collection_api/resources/models.py
+++ b/utils/test/result_collection_api/resources/models.py
@@ -1,196 +1,200 @@
-##############################################################################
-# Copyright (c) 2015 Orange
-# guyrodrigue.koffi@orange.com / koffirodrigue@gmail.com
-# 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
-##############################################################################
-
-
-class Pod:
-    """ describes a POD platform """
-    def __init__(self):
-        self._id = ""
-        self.name = ""
-        self.creation_date = ""
-        self.mode = ""
-        self.details = ""
-
-    @staticmethod
-    def pod_from_dict(pod_dict):
-        if pod_dict is None:
-            return None
-
-        p = Pod()
-        p._id = pod_dict.get('_id')
-        p.creation_date = str(pod_dict.get('creation_date'))
-        p.name = pod_dict.get('name')
-        p.mode = pod_dict.get('mode')
-        p.details = pod_dict.get('details')
-        return p
-
-    def format(self):
-        return {
-            "name": self.name,
-            "mode": self.mode,
-            "details": self.details,
-            "creation_date": str(self.creation_date),
-        }
-
-    def format_http(self):
-        return {
-            "_id": str(self._id),
-            "name": self.name,
-            "mode": self.mode,
-            "details": self.details,
-            "creation_date": str(self.creation_date),
-        }
-
-
-class TestProject:
-    """ Describes a test project"""
-
-    def __init__(self):
-        self._id = None
-        self.name = None
-        self.description = None
-        self.creation_date = None
-
-    @staticmethod
-    def testproject_from_dict(testproject_dict):
-
-        if testproject_dict is None:
-            return None
-
-        t = TestProject()
-        t._id = testproject_dict.get('_id')
-        t.creation_date = testproject_dict.get('creation_date')
-        t.name = testproject_dict.get('name')
-        t.description = testproject_dict.get('description')
-
-        return t
-
-    def format(self):
-        return {
-            "name": self.name,
-            "description": self.description,
-            "creation_date": str(self.creation_date)
-        }
-
-    def format_http(self, test_cases=0):
-        return {
-            "_id": str(self._id),
-            "name": self.name,
-            "description": self.description,
-            "creation_date": str(self.creation_date),
-        }
-
-
-class TestCase:
-    """ Describes a test case"""
-
-    def __init__(self):
-        self._id = None
-        self.name = None
-        self.project_name = None
-        self.description = None
-        self.url = None
-        self.creation_date = None
-
-    @staticmethod
-    def test_case_from_dict(testcase_dict):
-
-        if testcase_dict is None:
-            return None
-
-        t = TestCase()
-        t._id = testcase_dict.get('_id')
-        t.project_name = testcase_dict.get('project_name')
-        t.creation_date = testcase_dict.get('creation_date')
-        t.name = testcase_dict.get('name')
-        t.description = testcase_dict.get('description')
-        t.url = testcase_dict.get('url')
-
-        return t
-
-    def format(self):
-        return {
-            "name": self.name,
-            "description": self.description,
-            "project_name": self.project_name,
-            "creation_date": str(self.creation_date),
-            "url": self.url
-        }
-
-    def format_http(self, test_project=None):
-        res = {
-            "_id": str(self._id),
-            "name": self.name,
-            "description": self.description,
-            "creation_date": str(self.creation_date),
-            "url": self.url,
-        }
-        if test_project is not None:
-            res["test_project"] = test_project
-
-        return res
-
-
-class TestResult:
-    """ Describes a test result"""
-
-    def __init__(self):
-        self._id = None
-        self.case_name = None
-        self.project_name = None
-        self.pod_name = None
-        self.installer = None
-        self.version = None
-        self.description = None
-        self.creation_date = None
-        self.details = None
-
-    @staticmethod
-    def test_result_from_dict(test_result_dict):
-
-        if test_result_dict is None:
-            return None
-
-        t = TestResult()
-        t._id = test_result_dict.get('_id')
-        t.case_name = test_result_dict.get('case_name')
-        t.pod_name = test_result_dict.get('pod_name')
-        t.project_name = test_result_dict.get('project_name')
-        t.description = test_result_dict.get('description')
-        t.creation_date = str(test_result_dict.get('creation_date'))
-        t.details = test_result_dict.get('details')
-        t.version = test_result_dict.get('version')
-        t.installer = test_result_dict.get('installer')
-
-        return t
-
-    def format(self):
-        return {
-            "case_name": self.case_name,
-            "project_name": self.project_name,
-            "pod_name": self.pod_name,
-            "description": self.description,
-            "creation_date": str(self.creation_date),
-            "version": self.version,
-            "installer": self.installer,
-            "details": self.details,
-        }
-
-    def format_http(self):
-        return {
-            "_id": str(self._id),
-            "case_name": self.case_name,
-            "project_name": self.project_name,
-            "pod_name": self.pod_name,
-            "description": self.description,
-            "creation_date": str(self.creation_date),
-            "version": self.version,
-            "installer": self.installer,
-            "details": self.details,
-        }
+##############################################################################

+# Copyright (c) 2015 Orange

+# guyrodrigue.koffi@orange.com / koffirodrigue@gmail.com

+# 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

+##############################################################################

+

+

+class Pod:

+    """ describes a POD platform """

+    def __init__(self):

+        self._id = ""

+        self.name = ""

+        self.creation_date = ""

+        self.mode = ""

+        self.details = ""

+

+    @staticmethod

+    def pod_from_dict(pod_dict):

+        if pod_dict is None:

+            return None

+

+        p = Pod()

+        p._id = pod_dict.get('_id')

+        p.creation_date = str(pod_dict.get('creation_date'))

+        p.name = pod_dict.get('name')

+        p.mode = pod_dict.get('mode')

+        p.details = pod_dict.get('details')

+        return p

+

+    def format(self):

+        return {

+            "name": self.name,

+            "mode": self.mode,

+            "details": self.details,

+            "creation_date": str(self.creation_date),

+        }

+

+    def format_http(self):

+        return {

+            "_id": str(self._id),

+            "name": self.name,

+            "mode": self.mode,

+            "details": self.details,

+            "creation_date": str(self.creation_date),

+        }

+

+

+class TestProject:

+    """ Describes a test project"""

+

+    def __init__(self):

+        self._id = None

+        self.name = None

+        self.description = None

+        self.creation_date = None

+

+    @staticmethod

+    def testproject_from_dict(testproject_dict):

+

+        if testproject_dict is None:

+            return None

+

+        t = TestProject()

+        t._id = testproject_dict.get('_id')

+        t.creation_date = testproject_dict.get('creation_date')

+        t.name = testproject_dict.get('name')

+        t.description = testproject_dict.get('description')

+

+        return t

+

+    def format(self):

+        return {

+            "name": self.name,

+            "description": self.description,

+            "creation_date": str(self.creation_date)

+        }

+

+    def format_http(self, test_cases=0):

+        return {

+            "_id": str(self._id),

+            "name": self.name,

+            "description": self.description,

+            "creation_date": str(self.creation_date),

+        }

+

+

+class TestCase:

+    """ Describes a test case"""

+

+    def __init__(self):

+        self._id = None

+        self.name = None

+        self.project_name = None

+        self.description = None

+        self.url = None

+        self.creation_date = None

+

+    @staticmethod

+    def test_case_from_dict(testcase_dict):

+

+        if testcase_dict is None:

+            return None

+

+        t = TestCase()

+        t._id = testcase_dict.get('_id')

+        t.project_name = testcase_dict.get('project_name')

+        t.creation_date = testcase_dict.get('creation_date')

+        t.name = testcase_dict.get('name')

+        t.description = testcase_dict.get('description')

+        t.url = testcase_dict.get('url')

+

+        return t

+

+    def format(self):

+        return {

+            "name": self.name,

+            "description": self.description,

+            "project_name": self.project_name,

+            "creation_date": str(self.creation_date),

+            "url": self.url

+        }

+

+    def format_http(self, test_project=None):

+        res = {

+            "_id": str(self._id),

+            "name": self.name,

+            "description": self.description,

+            "creation_date": str(self.creation_date),

+            "url": self.url,

+        }

+        if test_project is not None:

+            res["test_project"] = test_project

+

+        return res

+

+

+class TestResult:

+    """ Describes a test result"""

+

+    def __init__(self):

+        self._id = None

+        self.case_name = None

+        self.project_name = None

+        self.pod_name = None

+        self.installer = None

+        self.version = None

+        self.description = None

+        self.creation_date = None

+        self.details = None

+        self.build_tag = None

+

+    @staticmethod

+    def test_result_from_dict(test_result_dict):

+

+        if test_result_dict is None:

+            return None

+

+        t = TestResult()

+        t._id = test_result_dict.get('_id')

+        t.case_name = test_result_dict.get('case_name')

+        t.pod_name = test_result_dict.get('pod_name')

+        t.project_name = test_result_dict.get('project_name')

+        t.description = test_result_dict.get('description')

+        t.creation_date = str(test_result_dict.get('creation_date'))

+        t.details = test_result_dict.get('details')

+        t.version = test_result_dict.get('version')

+        t.build_tag = test_result_dict.get('build_tag')

+

+        return t

+

+    def format(self):

+        return {

+            "case_name": self.case_name,

+            "project_name": self.project_name,

+            "pod_name": self.pod_name,

+            "description": self.description,

+            "creation_date": str(self.creation_date),

+            "version": self.version,

+            "installer": self.installer,

+            "details": self.details,

+            "build_tag": self.build_tag

+        }

+

+    def format_http(self):

+        return {

+            "_id": str(self._id),

+            "case_name": self.case_name,

+            "project_name": self.project_name,

+            "pod_name": self.pod_name,

+            "description": self.description,

+            "creation_date": str(self.creation_date),

+            "version": self.version,

+            "installer": self.installer,

+            "details": self.details,

+            "build_tag": self.build_tag

+        }

+