aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Kunz <georg.kunz@ericsson.com>2018-07-30 09:10:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-30 09:10:24 +0000
commit1b72e7ae66165059b7d3c959348dc8ea8e79cc58 (patch)
tree5fe98c43b60214bad693685bae0711044f0965bd
parent4a7221beef916ffddf6404711a4283276d3e62af (diff)
parent2771802e4f6e253b3b4b8c39087588f7878e8eb1 (diff)
Merge "Enable web portal to open log files for each test case of OVP 2018.0x release"
-rw-r--r--3rd_party/static/testapi-ui/components/results-report/resultsReportController.js25
1 files changed, 18 insertions, 7 deletions
diff --git a/3rd_party/static/testapi-ui/components/results-report/resultsReportController.js b/3rd_party/static/testapi-ui/components/results-report/resultsReportController.js
index 4733b65..7b0cf80 100644
--- a/3rd_party/static/testapi-ui/components/results-report/resultsReportController.js
+++ b/3rd_party/static/testapi-ui/components/results-report/resultsReportController.js
@@ -53,7 +53,7 @@
ctrl.testId = $stateParams.testID;
ctrl.innerId = $stateParams.innerID;
ctrl.validation = '';
- ctrl.version = ''
+ ctrl.version = '';
/** The HTML template that all accordian groups will use. */
ctrl.detailsTemplate = 'testapi-ui/components/results-report/partials/' +
@@ -78,12 +78,23 @@
function gotoResultLog(case_name) {
var case_area = case_name.split(".")[1];
var log_url = "/logs/"+ctrl.testId+"/results/";
- if (case_area == "vping") {
- log_url += "functest.log";
- } else if (case_area == "ha") {
- log_url += "yardstick.log";
+ if (ctrl.version == '2018.01') {
+ if (case_area == "vping") {
+ log_url += "functest.log";
+ } else if (case_area == "ha") {
+ log_url += "yardstick.log";
+ } else {
+ log_url += case_area+"_logs/"+case_name+".log";
+ }
} else {
- log_url += case_area+"_logs/"+case_name+".log";
+ log_url += case_area + "_logs/";
+ if (case_area == "tempest" || case_area == "security") {
+ log_url += case_name + ".html";
+ } else if (case_area == "sdnvpn") {
+ log_url += case_name + ".functest.log";
+ } else {
+ log_url += case_name + ".log";
+ }
}
var is_reachable = false;
@@ -169,7 +180,7 @@
$http.get(result_url).then(function(result_resp){
ctrl.version = result_resp.data.version
- if(ctrl.version == 'master') {
+ if(ctrl.version == 'master' || ctrl.version == 'unknown') {
// there was no result format versioning in the first release of OVP but
// instead the version was set to 'master'. We are using this as an indicator
// that a set of results were created based on the 2018.01 release