Merge "add test result/dashboard related unittests in testAPI and refactor its response"

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 4b11c4b..5db40a3 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -94,6 +94,9 @@
         - huawei-pod2:
             installer: compass
             <<: *master
+        - huawei-pod1:
+            installer: compass
+            <<: *master
         - nokia-pod1:
             installer: apex
             <<: *master

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index b7c1c0a..55a07a5 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -123,6 +123,11 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
+        - huawei-pod1:
+            installer: compass
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *master
         - huawei-pod2:
             installer: compass
             suite: daily

diff --git a/utils/test/result_collection_api/resources/pod_models.py b/utils/test/result_collection_api/resources/pod_models.py
index 65b82f7..b02e3c2 100644 (file)
--- a/utils/test/result_collection_api/resources/pod_models.py
+++ b/utils/test/result_collection_api/resources/pod_models.py
@@ -1,24 +1,32 @@
 __author__ = '__serena__'
 
+# name: name of the POD e.g. zte-1
+# mode: metal or virtual
+# details: any detail
+# role: ci-pod or community-pod or single-node
+
 
 class PodCreateRequest(object):
-    def __init__(self, name='', mode='', details=''):
+    def __init__(self, name='', mode='', details='', role=""):
         self.name = name
         self.mode = mode
         self.details = details
+        self.role = role
 
     def format(self):
         return {
             "name": self.name,
             "mode": self.mode,
             "details": self.details,
+            "role": self.role,
         }
 
 
 class Pod(PodCreateRequest):
     """ describes a POD platform """
-    def __init__(self, name='', mode='', details='', _id='', create_date=''):
-        super(Pod, self).__init__(name, mode, details)
+    def __init__(self, name='', mode='', details='', role="",
+                 _id='', create_date=''):
+        super(Pod, self).__init__(name, mode, details, role)
         self._id = _id
         self.creation_date = create_date
 
@@ -33,6 +41,7 @@ class Pod(PodCreateRequest):
         p.name = pod_dict.get('name')
         p.mode = pod_dict.get('mode')
         p.details = pod_dict.get('details')
+        p.role = pod_dict.get('role')
         return p
 
     def format(self):

diff --git a/utils/test/result_collection_api/tests/unit/test_pod.py b/utils/test/result_collection_api/tests/unit/test_pod.py
index 07f55db..b6adc25 100644 (file)
--- a/utils/test/result_collection_api/tests/unit/test_pod.py
+++ b/utils/test/result_collection_api/tests/unit/test_pod.py
@@ -9,8 +9,8 @@ from common.constants import HTTP_OK, HTTP_BAD_REQUEST, \
 class TestPodBase(TestBase):
     def setUp(self):
         super(TestPodBase, self).setUp()
-        self.req_d = PodCreateRequest('zte-1', 'fuel', 'zte pod 1')
-        self.req_e = PodCreateRequest('zte-2', 'apex', 'zte pod 2')
+        self.req_d = PodCreateRequest('zte-1', 'virtual', 'zte pod 1','ci-pod')
+        self.req_e = PodCreateRequest('zte-2', 'metal', 'zte pod 2')
         self.get_res = Pod
         self.list_res = Pods
         self.basePath = '/pods'
@@ -21,6 +21,7 @@ class TestPodBase(TestBase):
         self.assertEqual(pod.name, req.name)
         self.assertEqual(pod.mode, req.mode)
         self.assertEqual(pod.details, req.details)
+        self.assertEqual(pod.role, req.role)        
         self.assertIsNotNone(pod.creation_date)
         self.assertIsNotNone(pod._id)