29 files changed, 21 insertions, 205 deletions
diff --git a/dashboard/dashboard/mongo2elastic/format.py b/dashboard/dashboard/mongo2elastic/format.py
deleted file mode 100644
index 0bbde17..0000000
--- a/dashboard/dashboard/mongo2elastic/format.py
+++ /dev/null
@@ -1,204 +0,0 @@
-#! /usr/bin/env python
-
-
-def _convert_value(value):
-    return value if value != '' else 0
-
-
-def _convert_duration(duration):
-    if (isinstance(duration, str) or isinstance(duration, unicode)) and ':' in duration:
-        hours, minutes, seconds = duration.split(":")
-        hours = _convert_value(hours)
-        minutes = _convert_value(minutes)
-        seconds = _convert_value(seconds)
-        int_duration = 3600 * int(hours) + 60 * int(minutes) + float(seconds)
-    else:
-        int_duration = duration
-    return int_duration
-
-
-def format_normal(testcase):
-    """
-    Look for these and leave any of those:
-        details.duration
-        details.tests
-        details.failures
-
-    If none are present, then return False
-    """
-    found = False
-    testcase_details = testcase['details']
-    fields = ['duration', 'tests', 'failures']
-    if isinstance(testcase_details, dict):
-        for key, value in testcase_details.items():
-            if key in fields:
-                found = True
-                if key == 'duration':
-                    testcase_details[key] = _convert_duration(value)
-            else:
-                del testcase_details[key]
-
-    if 'tests' in testcase_details and 'failures' in testcase_details:
-        testcase_tests = float(testcase_details['tests'])
-        testcase_failures = float(testcase_details['failures'])
-        if testcase_tests != 0:
-            testcase_details['success_percentage'] = 100 * (testcase_tests - testcase_failures) / testcase_tests
-        else:
-            testcase_details['success_percentage'] = 0
-
-
-    return found
-
-
-def format_rally(testcase):
-    """
-    Structure:
-        details.[{summary.duration}]
-        details.[{summary.nb success}]
-        details.[{summary.nb tests}]
-
-    Find data for these fields
-        -> details.duration
-        -> details.tests
-        -> details.success_percentage
-    """
-    details = testcase['details']
-    summary = None
-    for item in details:
-        if 'summary' in item:
-            summary = item['summary']
-
-    if not summary:
-        return False
-
-    testcase['details'] = {
-        'duration': summary['duration'],
-        'tests': summary['nb tests'],
-        'success_percentage': summary['nb success']
-    }
-    return True
-
-
-def _get_statistics(orig_data, stat_fields, stat_values=None):
-    test_results = {}
-    for stat_data in orig_data:
-        for field in stat_fields:
-            stat_value = stat_data[field]
-            if stat_value in test_results:
-                test_results[stat_value] += 1
-            else:
-                test_results[stat_value] = 1
-
-    if stat_values is not None:
-        for stat_value in stat_values:
-            if stat_value not in test_results:
-                test_results[stat_value] = 0
-
-    return test_results
-
-
-def format_onos(testcase):
-    """
-    Structure:
-        details.FUNCvirNet.duration
-        details.FUNCvirNet.status.[{Case result}]
-        details.FUNCvirNetL3.duration
-        details.FUNCvirNetL3.status.[{Case result}]
-
-    Find data for these fields
-        -> details.FUNCvirNet.duration
-        -> details.FUNCvirNet.tests
-        -> details.FUNCvirNet.failures
-        -> details.FUNCvirNetL3.duration
-        -> details.FUNCvirNetL3.tests
-        -> details.FUNCvirNetL3.failures
-    """
-    testcase_details = testcase['details']
-
-    if 'FUNCvirNet' not in testcase_details or 'FUNCvirNetL3' not in testcase_details:
-        return False
-
-    funcvirnet_details = testcase_details['FUNCvirNet']['status']
-    funcvirnet_stats = _get_statistics(funcvirnet_details, ('Case result',), ('PASS', 'FAIL'))
-    funcvirnet_passed = funcvirnet_stats['PASS']
-    funcvirnet_failed = funcvirnet_stats['FAIL']
-    funcvirnet_all = funcvirnet_passed + funcvirnet_failed
-
-    funcvirnetl3_details = testcase_details['FUNCvirNetL3']['status']
-    funcvirnetl3_stats = _get_statistics(funcvirnetl3_details, ('Case result',), ('PASS', 'FAIL'))
-    funcvirnetl3_passed = funcvirnetl3_stats['PASS']
-    funcvirnetl3_failed = funcvirnetl3_stats['FAIL']
-    funcvirnetl3_all = funcvirnetl3_passed + funcvirnetl3_failed
-
-    testcase_details['FUNCvirNet'] = {
-        'duration': _convert_duration(testcase_details['FUNCvirNet']['duration']),
-        'tests': funcvirnet_all,
-        'failures': funcvirnet_failed
-    }
-    testcase_details['FUNCvirNetL3'] = {
-        'duration': _convert_duration(testcase_details['FUNCvirNetL3']['duration']),
-        'tests': funcvirnetl3_all,
-        'failures': funcvirnetl3_failed
-    }
-    return True
-
-
-def format_vims(testcase):
-    """
-    Structure:
-        details.sig_test.result.[{result}]
-        details.sig_test.duration
-        details.vIMS.duration
-        details.orchestrator.duration
-
-    Find data for these fields
-        -> details.sig_test.duration
-        -> details.sig_test.tests
-        -> details.sig_test.failures
-        -> details.sig_test.passed
-        -> details.sig_test.skipped
-        -> details.vIMS.duration
-        -> details.orchestrator.duration
-    """
-    testcase_details = testcase['details']
-    test_results = _get_statistics(testcase_details['sig_test']['result'],
-                                   ('result',),
-                                   ('Passed', 'Skipped', 'Failed'))
-    passed = test_results['Passed']
-    skipped = test_results['Skipped']
-    failures = test_results['Failed']
-    all_tests = passed + skipped + failures
-    testcase['details'] = {
-        'sig_test': {
-            'duration': testcase_details['sig_test']['duration'],
-            'tests': all_tests,
-            'failures': failures,
-            'passed': passed,
-            'skipped': skipped
-        },
-        'vIMS': {
-            'duration': testcase_details['vIMS']['duration']
-        },
-        'orchestrator': {
-            'duration': testcase_details['orchestrator']['duration']
-        }
-    }
-    return True
-
-
-def format_qpi(testcase):
-    """
-    Look for these and leave any of those:
-        details.index
-
-    If none are present, then return False
-    """
-    details = testcase['details']
-    if 'index' not in details:
-        return False
-
-    for key, value in details.items():
-        if key != 'index':
-            del details[key]
-
-    return True
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/.gitignore b/result_collection_api/3rd_party/static/.gitignore
index ebf4281..ebf4281 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/.gitignore
+++ b/result_collection_api/3rd_party/static/.gitignore
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/highlight.default.css b/result_collection_api/3rd_party/static/css/highlight.default.css
index e417fc1..e417fc1 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/highlight.default.css
+++ b/result_collection_api/3rd_party/static/css/highlight.default.css
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/hightlight.default.css b/result_collection_api/3rd_party/static/css/hightlight.default.css
index e417fc1..e417fc1 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/hightlight.default.css
+++ b/result_collection_api/3rd_party/static/css/hightlight.default.css
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/screen.css b/result_collection_api/3rd_party/static/css/screen.css
index 2882b8d..2882b8d 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/css/screen.css
+++ b/result_collection_api/3rd_party/static/css/screen.css
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/endpoint.html b/result_collection_api/3rd_party/static/endpoint.html
index 4ae3bde..4ae3bde 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/endpoint.html
+++ b/result_collection_api/3rd_party/static/endpoint.html
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/explorer_icons.png b/result_collection_api/3rd_party/static/images/explorer_icons.png
index ed9d2ff..ed9d2ff 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/explorer_icons.png
+++ b/result_collection_api/3rd_party/static/images/explorer_icons.png
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/logo_small.png b/result_collection_api/3rd_party/static/images/logo_small.png
index 5496a65..5496a65 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/logo_small.png
+++ b/result_collection_api/3rd_party/static/images/logo_small.png
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/pet_store_api.png b/result_collection_api/3rd_party/static/images/pet_store_api.png
index f9f9cd4..f9f9cd4 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/pet_store_api.png
+++ b/result_collection_api/3rd_party/static/images/pet_store_api.png
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/throbber.gif b/result_collection_api/3rd_party/static/images/throbber.gif
index 0639388..0639388 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/throbber.gif
+++ b/result_collection_api/3rd_party/static/images/throbber.gif
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/wordnik_api.png b/result_collection_api/3rd_party/static/images/wordnik_api.png
index dca4f14..dca4f14 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/images/wordnik_api.png
+++ b/result_collection_api/3rd_party/static/images/wordnik_api.png
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/index.html b/result_collection_api/3rd_party/static/index.html
index db209f4..db209f4 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/index.html
+++ b/result_collection_api/3rd_party/static/index.html
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/backbone-min.js b/result_collection_api/3rd_party/static/lib/backbone-min.js
index c1c0d4f..c1c0d4f 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/backbone-min.js
+++ b/result_collection_api/3rd_party/static/lib/backbone-min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/handlebars-1.0.0.js b/result_collection_api/3rd_party/static/lib/handlebars-1.0.0.js
index c70f09d..c70f09d 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/handlebars-1.0.0.js
+++ b/result_collection_api/3rd_party/static/lib/handlebars-1.0.0.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/highlight.7.3.pack.js b/result_collection_api/3rd_party/static/lib/highlight.7.3.pack.js
index 9a95a75..9a95a75 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/highlight.7.3.pack.js
+++ b/result_collection_api/3rd_party/static/lib/highlight.7.3.pack.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery-1.8.0.min.js b/result_collection_api/3rd_party/static/lib/jquery-1.8.0.min.js
index 066d72c..066d72c 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery-1.8.0.min.js
+++ b/result_collection_api/3rd_party/static/lib/jquery-1.8.0.min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.ba-bbq.min.js b/result_collection_api/3rd_party/static/lib/jquery.ba-bbq.min.js
index bcbf248..bcbf248 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.ba-bbq.min.js
+++ b/result_collection_api/3rd_party/static/lib/jquery.ba-bbq.min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.slideto.min.js b/result_collection_api/3rd_party/static/lib/jquery.slideto.min.js
index ba32cff..ba32cff 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.slideto.min.js
+++ b/result_collection_api/3rd_party/static/lib/jquery.slideto.min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.wiggle.min.js b/result_collection_api/3rd_party/static/lib/jquery.wiggle.min.js
index 2adb0d6..2adb0d6 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.wiggle.min.js
+++ b/result_collection_api/3rd_party/static/lib/jquery.wiggle.min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred.bundle.js b/result_collection_api/3rd_party/static/lib/shred.bundle.js
index 74d0816..74d0816 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred.bundle.js
+++ b/result_collection_api/3rd_party/static/lib/shred.bundle.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred/content.js b/result_collection_api/3rd_party/static/lib/shred/content.js
index b8051fe..b8051fe 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred/content.js
+++ b/result_collection_api/3rd_party/static/lib/shred/content.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger-oauth.js b/result_collection_api/3rd_party/static/lib/swagger-oauth.js
index 7c8839a..7c8839a 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger-oauth.js
+++ b/result_collection_api/3rd_party/static/lib/swagger-oauth.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger.js b/result_collection_api/3rd_party/static/lib/swagger.js
index 78e8b29..78e8b29 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger.js
+++ b/result_collection_api/3rd_party/static/lib/swagger.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/underscore-min.js b/result_collection_api/3rd_party/static/lib/underscore-min.js
index 5a0cb3b..5a0cb3b 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/underscore-min.js
+++ b/result_collection_api/3rd_party/static/lib/underscore-min.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/o2c.html b/result_collection_api/3rd_party/static/o2c.html
index d32d130..d32d130 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/o2c.html
+++ b/result_collection_api/3rd_party/static/o2c.html
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.js b/result_collection_api/3rd_party/static/swagger-ui.js
index 4c99226..4c99226 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.js
+++ b/result_collection_api/3rd_party/static/swagger-ui.js
diff --git a/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.min.js b/result_collection_api/3rd_party/static/swagger-ui.min.js
index 28cb9e6..28cb9e6 100644
--- a/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.min.js
+++ b/result_collection_api/3rd_party/static/swagger-ui.min.js
diff --git a/result_collection_api/README.rst b/result_collection_api/README.rst
index c0075bc..44ab2a4 100644
--- a/result_collection_api/README.rst
+++ b/result_collection_api/README.rst
@@ -25,7 +25,7 @@ How to install
 
 From within your environment, just run:
 
-    python setup.py install
+    ./install.sh
 
 How to run
 ^^^^^^^^^^
diff --git a/result_collection_api/install.sh b/result_collection_api/install.sh
new file mode 100755
index 0000000..43229ea
--- /dev/null
+++ b/result_collection_api/install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+usage="
+Script to install opnfv_tesgtapi automatically.
+This script should be run under root.
+
+usage:
+    bash $(basename "$0") [-h|--help] [-t <test_name>]
+
+where:
+    -h|--help         show this help text"
+
+if [[ $(whoami) != "root" ]]; then
+    echo "Error: This script must be run as root!"
+    exit 1
+fi
+
+cp -fr 3rd_party/static opnfv_testapi/tornado_swagger
+python setup.py install
+rm -fr opnfv_testapi/tornado_swagger/static