From: Morgan Richomme <morgan.richomme@orange.com>
Date: Tue, 13 Sep 2016 06:46:56 +0000 (+0000)
Subject: Merge "Implements use of yaml.safe_load as per sec audit"
X-Git-Tag: colorado.1.0~42
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bc6b02a4f9298d8b97a6c5e2c7394c4c6d7f2d95;hp=149d3c385e7a58113ebbcae8d3a2c261aa840b3f;p=releng.git

Merge "Implements use of yaml.safe_load as per sec audit"
---

diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py
index 546bf08c4..d7a4e2986 100644
--- a/utils/test/reporting/yardstick/reporting-status.py
+++ b/utils/test/reporting/yardstick/reporting-status.py
@@ -32,6 +32,12 @@ for version in conf.versions:
     for installer in conf.installers:
         # get scenarios results data
         scenario_results = utils.getScenarioStatus(installer, version)
+        if 'colorado' == version:
+            stable_result = utils.getScenarioStatus(installer, 'stable/colorado')
+            for k,v in stable_result.items():
+                if not scenario_results.has_key(k):
+                    scenario_results[k] = []
+                scenario_results[k] += stable_result[k]
         scenario_result_criteria = {}
 
         # From each scenarios get results list
@@ -44,10 +50,10 @@ for version in conf.versions:
             scenario_score = 0
 
             for v in s_result:
-                if v['details'] == 'SUCCESS':
+                if v['criteria'] == 'SUCCESS':
                     scenario_score += 1
 
-            if scenario_score == scenario_criteria:
+            if scenario_score == scenario_criteria and scenario_criteria == 4:
                 s_status = 'OK'
                 logger.info(">>>>> scenario OK, save the information")
             else: