From 5f93c5912753eb2d80077a77076015533dc16f6e Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 16 Jun 2016 15:19:56 +0200
Subject: Align test names in DB and config file
JIRA: FUNCTEST-304
Change-Id: I98d3155beb1c5e49eda84b443df603c2630b4823
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
testcases/Controllers/ODL/odlreport2db.py | 4 ++--
testcases/Controllers/ONOS/Teston/onosfunctest.py | 2 +-
testcases/OpenStack/rally/run_rally-cert.py | 9 +++++++--
testcases/OpenStack/tempest/run_tempest.py | 11 ++++++++---
testcases/OpenStack/vPing/vPing_ssh.py | 2 +-
testcases/OpenStack/vPing/vPing_userdata.py | 2 +-
testcases/vIMS/vIMS.py | 4 ++--
7 files changed, 22 insertions(+), 12 deletions(-)
(limited to 'testcases')
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 075de5a86..0c9f341c9 100644
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
@@ -115,7 +115,7 @@ def main(argv):
data['description'] = all_data['suite']['@name']
data['version'] = all_data['@generator']
data['test_project'] = "functest"
- data['case_name'] = "ODL"
+ data['case_name'] = "odl"
data['pod_name'] = pod
data['installer'] = installer
@@ -144,7 +144,7 @@ def main(argv):
if (tests_failed < 1):
status = "PASS"
- functest_utils.push_results_to_db("functest",
+ functest_utils.push_results_to_db(data['test_project'],
data['case_name'],
None,
start_time,
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
index 38935c5dd..058114bde 100644
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -192,7 +192,7 @@ def main():
logger.error("Unable to set ONOS criteria")
functest_utils.push_results_to_db("functest",
- "ONOS",
+ "onos",
logger,
start_time,
stop_time,
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 7822c7e9e..8afbccaa3 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -535,11 +535,16 @@ def main():
if total_success >= 90:
status = "passed"
+ if args.sanity:
+ case_name = "rally_sanity"
+ else:
+ case_name = "rally_full"
+
if args.report:
logger.debug("Pushing Rally summary into DB...")
functest_utils.push_results_to_db("functest",
- "Rally",
- logger,
+ case_name,
+ None,
start_time,
stop_time,
status,
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index f59ba5263..a16ba26f7 100644
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -333,11 +333,16 @@ def run_tempest(OPTION):
"tests": int(num_tests), "failures": int(num_failures),
"errors": error_logs}
logger.info("Results: " + str(json_results))
- # TODO split Tempest smoke and full
+ # split Tempest smoke and full
+ if "smoke" in args.mode:
+ case_name = "tempest_smoke_serial"
+ else:
+ case_name = "tempest_full_parallel"
+
try:
ft_utils.push_results_to_db("functest",
- "Tempest",
- logger,
+ case_name,
+ None,
start_time,
stop_time,
status,
diff --git a/testcases/OpenStack/vPing/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py
index 3f90bc214..1609dd95b 100644
--- a/testcases/OpenStack/vPing/vPing_ssh.py
+++ b/testcases/OpenStack/vPing/vPing_ssh.py
@@ -429,7 +429,7 @@ def main():
try:
logger.debug("Pushing vPing SSH results into DB...")
functest_utils.push_results_to_db("functest",
- "vPing",
+ "vping_ssh",
logger,
start_time,
stop_time,
diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py
index 5b7d2d90f..ff7158ee3 100644
--- a/testcases/OpenStack/vPing/vPing_userdata.py
+++ b/testcases/OpenStack/vPing/vPing_userdata.py
@@ -362,7 +362,7 @@ def main():
try:
logger.debug("Pushing vPing userdata results into DB...")
functest_utils.push_results_to_db("functest",
- "vPing_userdata",
+ "vping_userdata",
logger,
start_time,
stop_time,
diff --git a/testcases/vIMS/vIMS.py b/testcases/vIMS/vIMS.py
index 260cb4ce2..a35eba98d 100644
--- a/testcases/vIMS/vIMS.py
+++ b/testcases/vIMS/vIMS.py
@@ -122,8 +122,8 @@ def step_failure(step_name, error_msg):
if step_name == "sig_test":
status = "PASS"
functest_utils.push_results_to_db("functest",
- "vIMS",
- logger,
+ "vims",
+ None,
start_time,
stop_time,
status,
--
cgit