aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-06-17 13:00:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-17 13:00:08 +0000
commit7f9fc4eb4d3e5690e82997c8593481c9b090b71e (patch)
treea6e52c84778acab880b039db67b9dd343532ff91
parente2fd77acc2ac7c2ae24ab76144201906839f26a8 (diff)
parent5f93c5912753eb2d80077a77076015533dc16f6e (diff)
Merge "Align test names in DB and config file"
-rw-r--r--testcases/Controllers/ODL/odlreport2db.py4
-rw-r--r--testcases/Controllers/ONOS/Teston/onosfunctest.py2
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py9
-rw-r--r--testcases/OpenStack/tempest/run_tempest.py11
-rw-r--r--testcases/OpenStack/vPing/vPing_ssh.py2
-rw-r--r--testcases/OpenStack/vPing/vPing_userdata.py2
-rw-r--r--testcases/vIMS/vIMS.py4
7 files changed, 22 insertions, 12 deletions
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 075de5a8..0c9f341c 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 38935c5d..058114bd 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 7822c7e9..8afbccaa 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 f59ba526..a16ba26f 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 3f90bc21..1609dd95 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 5b7d2d90..ff7158ee 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 260cb4ce..a35eba98 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,