From: chenjiankun <chenjiankun1@huawei.com>
Date: Mon, 19 Sep 2016 00:33:27 +0000 (+0000)
Subject: Change display way of reporting status, add last ten days score
X-Git-Tag: colorado.1.0~19
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=19630581f1ac53918aa5cc15faca8b2f0d53c00e

Change display way of reporting status, add last ten days score

JIRA: YARDSTICK-350

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

diff --git a/utils/test/reporting/yardstick/img/gauge_0.png b/utils/test/reporting/yardstick/img/gauge_0.png
new file mode 100644
index 000000000..ecefc0e66
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_0.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_100.png b/utils/test/reporting/yardstick/img/gauge_100.png
new file mode 100644
index 000000000..e199e1561
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_100.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_16.7.png b/utils/test/reporting/yardstick/img/gauge_16.7.png
new file mode 100644
index 000000000..3e3993c3b
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_16.7.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_25.png b/utils/test/reporting/yardstick/img/gauge_25.png
new file mode 100644
index 000000000..4923659b9
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_25.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_33.3.png b/utils/test/reporting/yardstick/img/gauge_33.3.png
new file mode 100644
index 000000000..364574b4a
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_33.3.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_41.7.png b/utils/test/reporting/yardstick/img/gauge_41.7.png
new file mode 100644
index 000000000..8c3e910fa
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_41.7.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_50.png b/utils/test/reporting/yardstick/img/gauge_50.png
new file mode 100644
index 000000000..2874b9fcf
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_50.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_58.3.png b/utils/test/reporting/yardstick/img/gauge_58.3.png
new file mode 100644
index 000000000..beedc8aa9
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_58.3.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_66.7.png b/utils/test/reporting/yardstick/img/gauge_66.7.png
new file mode 100644
index 000000000..93f44d133
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_66.7.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_75.png b/utils/test/reporting/yardstick/img/gauge_75.png
new file mode 100644
index 000000000..9fc261ff8
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_75.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_8.3.png b/utils/test/reporting/yardstick/img/gauge_8.3.png
new file mode 100644
index 000000000..59f86571e
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_8.3.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_83.3.png b/utils/test/reporting/yardstick/img/gauge_83.3.png
new file mode 100644
index 000000000..27ae4ec54
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_83.3.png differ
diff --git a/utils/test/reporting/yardstick/img/gauge_91.7.png b/utils/test/reporting/yardstick/img/gauge_91.7.png
new file mode 100644
index 000000000..280865714
Binary files /dev/null and b/utils/test/reporting/yardstick/img/gauge_91.7.png differ
diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py
index 57a95947b..345acef42 100644
--- a/utils/test/reporting/yardstick/reporting-status.py
+++ b/utils/test/reporting/yardstick/reporting-status.py
@@ -26,6 +26,7 @@ logger.info("*   Data retention = %s days              *" % conf.PERIOD)
 logger.info("*                                         *")
 logger.info("*******************************************")
 
+
 # For all the versions
 for version in conf.versions:
     # For all the installers
@@ -38,8 +39,6 @@ for version in conf.versions:
                 if not scenario_results.has_key(k):
                     scenario_results[k] = []
                 scenario_results[k] += stable_result[k]
-        for k,v in scenario_results.items():
-            scenario_results[k] = v[0:conf.LASTEST_TESTS]
         scenario_result_criteria = {}
 
         # From each scenarios get results list
@@ -47,23 +46,26 @@ for version in conf.versions:
             logger.info("---------------------------------")
             logger.info("installer %s, version %s, scenario %s:" % (installer, version, s))
 
-            s_status = 'KO'
-            scenario_criteria = len(s_result)
-            scenario_score = 0
-
+            ten_criteria = len(s_result)
+            ten_score = 0
             for v in s_result:
-                if v['criteria'] == 'SUCCESS':
-                    scenario_score += 1
+                ten_score += v
 
-            if scenario_score == scenario_criteria and scenario_criteria == 4:
-                s_status = 'OK'
-                logger.info(">>>>> scenario OK, save the information")
-            else:
-                logger.info(">>>> scenario not OK, score = %s/%s" % (scenario_score, scenario_criteria))
+            four_result = s_result[:conf.LASTEST_TESTS]
+            four_criteria = len(four_result)
+            four_score = 0
+            for v in four_result:
+                four_score += v
 
-            s_score = str(scenario_score) + '/' + str(scenario_criteria)
-            scenario_result_criteria[s] = sr.ScenarioResult(s_status, s_score)
+            s_status = str(utils.get_status(four_result, s_result))
+            s_four_score = str(four_score) + '/' + str(four_criteria)
+            s_ten_score = str(ten_score) + '/' + str(ten_criteria)
+            scenario_result_criteria[s] = sr.ScenarioResult(s_status, s_four_score, s_ten_score)
 
+            if '100' == s_status:
+                logger.info(">>>>> scenario OK, save the information")
+            else:
+                logger.info(">>>> scenario not OK, last 4 iterations = %s, last 10 days = %s" % (s_four_score, s_ten_score))
             logger.info("--------------------------")
 
         templateLoader = jinja2.FileSystemLoader(conf.REPORTING_PATH)
diff --git a/utils/test/reporting/yardstick/reportingConf.py b/utils/test/reporting/yardstick/reportingConf.py
index 447b428a8..52d999740 100644
--- a/utils/test/reporting/yardstick/reportingConf.py
+++ b/utils/test/reporting/yardstick/reportingConf.py
@@ -13,8 +13,8 @@ installers = ["apex", "compass", "fuel", "joid"]
 
 versions = ["master", "colorado"]
 
-# get data in the past 7 days
-PERIOD = 7
+# get data in the past 10 days
+PERIOD = 10
 
 # get the lastest 4 test results to determinate the success criteria
 LASTEST_TESTS = 4
diff --git a/utils/test/reporting/yardstick/reportingUtils.py b/utils/test/reporting/yardstick/reportingUtils.py
index 06bcd4926..71eb9196c 100644
--- a/utils/test/reporting/yardstick/reportingUtils.py
+++ b/utils/test/reporting/yardstick/reportingUtils.py
@@ -45,17 +45,59 @@ def getScenarioStatus(installer, version):
         print 'Got an error code:', e
 
     scenario_results = {}
+    result_dict = {}
     if test_results is not None:
         for r in test_results:
-            if r['stop_date'] != 'None':
+            if r['stop_date'] != 'None' and r['criteria'] is not None:
                 if not r['scenario'] in scenario_results.keys():
                     scenario_results[r['scenario']] = []
                 scenario_results[r['scenario']].append(r)
 
         for k,v in scenario_results.items():
-            scenario_results[k] = v[:conf.LASTEST_TESTS]
+            # scenario_results[k] = v[:conf.LASTEST_TESTS]
+            s_list = []
+            for element in v:
+                if element['criteria'] == 'SUCCESS':
+                    s_list.append(1)
+                else:
+                    s_list.append(0)
+            result_dict[k] = s_list
 
-    return scenario_results
+    # return scenario_results
+    return result_dict
+
+def subfind(given_list, pattern_list):
+    for i in range(len(given_list)):
+        if given_list[i] == pattern_list[0] and given_list[i:i + conf.LASTEST_TESTS] == pattern_list:
+            return True
+    return False
+
+def get_percent(status):
+    
+    if status * 100 % 6:
+        return round(float(status) * 100 / 6, 1)
+    else:
+        return status * 100 / 6
+
+def get_status(four_list, ten_list):
+    four_score = 0
+    ten_score = 0
+
+    for v in four_list:
+        four_score += v
+    for v in ten_list:
+        ten_score += v
+
+    if four_score == conf.LASTEST_TESTS:
+        status = 6
+    elif subfind(ten_list, [1, 1, 1, 1]):
+        status = 5
+    elif ten_score == 0:
+        status = 0
+    else:
+        status = four_score + 1
+
+    return get_percent(status)
 
 
 def _test():
diff --git a/utils/test/reporting/yardstick/scenarioResult.py b/utils/test/reporting/yardstick/scenarioResult.py
index 743346adc..61ffb2ce7 100644
--- a/utils/test/reporting/yardstick/scenarioResult.py
+++ b/utils/test/reporting/yardstick/scenarioResult.py
@@ -9,12 +9,16 @@
 
 
 class ScenarioResult(object):
-    def __init__(self, status, score=0):
+    def __init__(self, status, four_days_score='', ten_days_score=''):
         self.status = status
-        self.score = score
+        self.four_days_score = four_days_score
+        self.ten_days_score = ten_days_score
 
     def getStatus(self):
         return self.status
 
-    def getScore(self):
-        return self.score
+    def getTenDaysScore(self):
+        return self.ten_days_score
+
+    def getFourDaysScore(self):
+        return self.four_days_score
diff --git a/utils/test/reporting/yardstick/template/index-status-tmpl.html b/utils/test/reporting/yardstick/template/index-status-tmpl.html
index ff1a619f1..602ce8a74 100644
--- a/utils/test/reporting/yardstick/template/index-status-tmpl.html
+++ b/utils/test/reporting/yardstick/template/index-status-tmpl.html
@@ -40,21 +40,19 @@
             <div class="panel-heading"><h4><b>List of last scenarios ({{version}}) run over the last {{period}} days </b></h4></div>
                 <table class="table">
                     <tr>
-                        <th width="60%">Scenario</th>
+                        <th width="40%">Scenario</th>
                         <th width="20%">Status</th>
-                        <th width="20%">Score</th>
+                        <th width="20%">Last 4 Iterations</th>
+                        <th width="20%">Last 10 Days</th>
                     </tr>
                         {% for scenario,result in scenario_results.iteritems() -%}
                             <tr class="tr-ok">
                                 <td>{{scenario}}</td>
                                 <td>
-                                    {%if scenario_results[scenario].getStatus() is sameas "OK" -%}
-                                    <img src="../../img/icon-ok.png">
-                                    {%- else -%}
-                                    <img src="../../img/icon-nok.png">
-                                    {%- endif %}
+                                    <img src="../../img/gauge_{{ scenario_results[scenario].getStatus() }}.png">
                                 </td>
-                                <td>{{scenario_results[scenario].getScore()}}</td>
+                                <td>{{scenario_results[scenario].getFourDaysScore()}}</td>
+                                <td>{{scenario_results[scenario].getTenDaysScore()}}</td>
                             </tr>
                         {%- endfor %}
                 </table>