bug fix: use FAIL/PASS as criteria for vping_userdata and rally_sanity

Change-Id: Iadccae118bb2dc557bb590175c65022c1ed70605
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 8afbcca..7839322 100755 (executable)
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -355,10 +355,10 @@ def run_task(test_name):
         json_data = json.load(json_file)
 
     """ parse JSON operation result """
-    status = "failed"
+    status = "FAIL"
     if task_succeed(json_results):
         logger.info('Test scenario: "{}" OK.'.format(test_name) + "\n")
-        status = "passed"
+        status = "PASS"
     else:
         logger.info('Test scenario: "{}" Failed.'.format(test_name) + "\n")
 

diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py
index ff7158e..cdc4119 100644 (file)
--- a/testcases/OpenStack/vPing/vPing_userdata.py
+++ b/testcases/OpenStack/vPing/vPing_userdata.py
@@ -347,10 +347,10 @@ def main():
                 logger.debug("Pinging %s. Waiting for response..." % test_ip)
         sec += 1
 
-    test_status = "NOK"
+    test_status = "FAIL"
     if EXIT_CODE == 0:
         logger.info("vPing OK")
-        test_status = "OK"
+        test_status = "PASS"
     elif EXIT_CODE == -2:
         duration = 0
         logger.info("Userdata is not supported in nova boot. Aborting test...")