From: Fatih Degirmenci Date: Wed, 19 Oct 2016 11:20:54 +0000 (+0000) Subject: Merge "Disable selinux for RHEL" X-Git-Tag: danube.1.0~704 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b31e0d80dda6dd6a346acb9d422dc80eb0c1de1c;hp=d6f8691b4ab5c207fc872d9c351af8435107108e;p=releng.git Merge "Disable selinux for RHEL" --- diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 024681841..d4fa5da94 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -70,10 +70,14 @@ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-bgpvpn-ha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-ha': + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-odl_l2-nofeature-noha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-sfc-noha': + auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' jobs: - '{installer}-{scenario}-{pod}-daily-{stream}' @@ -228,7 +232,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 0 * * 1,6' + - timed: '0 0 * * 1' - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: @@ -236,7 +240,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 0 * * 3,7' + - timed: '0 0 * * 3' - trigger: name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger' triggers: @@ -245,6 +249,15 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger' triggers: - timed: '0 0 * * 5' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-master-trigger' + triggers: + - timed: '0 0 * * 6' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-master-trigger' + triggers: + - timed: '0 0 * * 7' + #---------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against colorado branch #---------------------------------------------------------------------- @@ -268,6 +281,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger' triggers: - timed: '0 16 * * 3,5' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-baremetal-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-baremetal-colorado-trigger' + triggers: + - timed: '' #--------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against master branch #--------------------------------------------------------------- @@ -291,6 +312,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-master-trigger' + triggers: + - timed: '' #-------------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against colorado branch #-------------------------------------------------------------------- @@ -314,6 +343,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-armband-virtual-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-armband-virtual-colorado-trigger' + triggers: + - timed: '' #---------------------------------------------------------- # Enea Armband POD 2 Triggers running against master branch #---------------------------------------------------------- @@ -337,6 +374,14 @@ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-master-trigger' + triggers: + - timed: '' #--------------------------------------------------------------- # Enea Armband POD 2 Triggers running against colorado branch #--------------------------------------------------------------- @@ -360,3 +405,11 @@ name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-arm-pod2-colorado-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-noha-arm-pod2-colorado-trigger' + triggers: + - timed: '' diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 41ec0f23c..c8e58afa8 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -49,7 +49,7 @@ mkdir -p $TMPDIR cd $WORKSPACE if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then - echo "cloning $LAB_CONFIG_URL" + echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index bede7de46..4d799af8e 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -16,19 +16,28 @@ branch: 'stable/{stream}' gs-pathname: '/{stream}' + distro: + - 'trusty': + disabled: false + os-version: 'trusty' + openstack-os-version: '' + - 'centos7': + disabled: false + os-version: 'centos7' + openstack-os-version: '' jobs: - - 'compass-verify-{stream}' + - 'compass-verify-{distro}-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-verify-deploy-{stream}' + - 'compass-verify-deploy-{distro}-{stream}' ######################## # job templates ######################## - job-template: - name: 'compass-verify-{stream}' + name: 'compass-verify-{distro}-{stream}' disabled: false @@ -92,8 +101,11 @@ builders: - trigger-builds: - - project: 'compass-verify-deploy-{stream}' + - project: 'compass-verify-deploy-{distro}-{stream}' current-parameters: true + predefined-parameters: | + COMPASS_OS_VERSION={os-version} + COMPASS_OS_VERSION_OPTION={openstack-os-version} same-node: true block: true - trigger-builds: @@ -109,7 +121,7 @@ unstable-threshold: 'FAILURE' - job-template: - name: 'compass-verify-deploy-{stream}' + name: 'compass-verify-deploy-{distro}-{stream}' concurrent: true diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index a2a57d468..d15bf7426 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -131,6 +131,8 @@ exclude-no-code-change: 'false' - comment-added-contains-event: comment-contains-value: 'recheck' + custom-url: '* $JOB_NAME $BUILD_URL' + silent-start: true projects: - project-compare-type: 'PLAIN' project-pattern: 'openstack/bifrost' diff --git a/jjb/opnfv/opnfv-utils.yml b/jjb/opnfv/opnfv-utils.yml index 94a99d451..717bb3cbc 100644 --- a/jjb/opnfv/opnfv-utils.yml +++ b/jjb/opnfv/opnfv-utils.yml @@ -19,7 +19,6 @@ name: SLAVE_NAME description: Slaves to prune docker images default-slaves: - - arm-build1 - arm-build2 - ericsson-build4 - ericsson-build5 diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 4ffaff4ae..7eca41a6d 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -162,7 +162,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-baremetal-defaults' @@ -227,7 +227,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'joid-virtual-defaults' @@ -608,7 +608,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: LAB_CONFIG_URL - default: ssh://git@git.enea.com/pharos/lab-config + default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab description: 'Base URI to the configuration directory' - parameter: name: 'intel-virtual6-defaults' diff --git a/utils/test/result_collection_api/update/templates/__init__.py b/utils/test/dashboard/README.rst similarity index 100% rename from utils/test/result_collection_api/update/templates/__init__.py rename to utils/test/dashboard/README.rst diff --git a/utils/test/dashboard/dashboard/conf/config.py b/utils/test/dashboard/dashboard/conf/config.py index 48fed8894..6114e90a9 100644 --- a/utils/test/dashboard/dashboard/conf/config.py +++ b/utils/test/dashboard/dashboard/conf/config.py @@ -1,5 +1,6 @@ #! /usr/bin/env python +import urlparse from ConfigParser import SafeConfigParser, NoOptionError @@ -22,11 +23,12 @@ class APIConfig: """ def __init__(self): - self._default_config_location = "../etc/config.ini" + self._default_config_location = "/etc/dashboard/config.ini" self.es_url = 'http://localhost:9200' self.es_creds = None self.kibana_url = None self.js_path = None + self.index_url = None def _get_str_parameter(self, section, param): try: @@ -67,6 +69,8 @@ class APIConfig: obj.es_creds = obj._get_str_parameter("elastic", "creds") obj.kibana_url = obj._get_str_parameter("kibana", "url") obj.js_path = obj._get_str_parameter("kibana", "js_path") + index = obj._get_str_parameter("elastic", "index") + obj.index_url = urlparse.urljoin(obj.es_url, index) return obj @@ -74,7 +78,9 @@ class APIConfig: return "elastic_url = %s \n" \ "elastic_creds = %s \n" \ "kibana_url = %s \n" \ + "index_url = %s \n" \ "js_path = %s \n" % (self.es_url, self.es_creds, self.kibana_url, + self.index_url, self.js_path) diff --git a/utils/test/dashboard/dashboard/conf/testcases.py b/utils/test/dashboard/dashboard/conf/testcases.py index e120987dd..ff801b4c9 100644 --- a/utils/test/dashboard/dashboard/conf/testcases.py +++ b/utils/test/dashboard/dashboard/conf/testcases.py @@ -1,7 +1,7 @@ import yaml -with open('./functest/testcases.yaml') as f: +with open('/etc/dashboard/testcases.yaml') as f: testcases_yaml = yaml.safe_load(f) f.close() diff --git a/utils/test/dashboard/dashboard/elastic2kibana/dashboard_assembler.py b/utils/test/dashboard/dashboard/elastic2kibana/dashboard_assembler.py index da7ccfc24..651168bbb 100644 --- a/utils/test/dashboard/dashboard/elastic2kibana/dashboard_assembler.py +++ b/utils/test/dashboard/dashboard/elastic2kibana/dashboard_assembler.py @@ -1,7 +1,7 @@ import json import utility -from common import elastic_access +from dashboard.common import elastic_access class DashboardAssembler(object): diff --git a/utils/test/dashboard/dashboard/elastic2kibana/main.py b/utils/test/dashboard/dashboard/elastic2kibana/main.py index 4542c31ec..112d2226e 100644 --- a/utils/test/dashboard/dashboard/elastic2kibana/main.py +++ b/utils/test/dashboard/dashboard/elastic2kibana/main.py @@ -1,13 +1,12 @@ #! /usr/bin/env python import json -import urlparse import argparse -from common import elastic_access -from common import logger_utils -from conf import config -from conf import testcases +from dashboard.common import elastic_access +from dashboard.common import logger_utils +from dashboard.conf import config +from dashboard.conf import testcases from dashboard_assembler import DashboardAssembler from visualization_assembler import VisualizationAssembler @@ -131,10 +130,9 @@ class KibanaConstructor(object): } }) - elastic_data = elastic_access.get_docs( - urlparse.urljoin(CONF.es_url, '/testapi/results'), - CONF.es_creds, - query) + elastic_data = elastic_access.get_docs(CONF.index_url, + CONF.es_creds, + query) pods_and_scenarios = {} diff --git a/utils/test/dashboard/dashboard/elastic2kibana/utility.py b/utils/test/dashboard/dashboard/elastic2kibana/utility.py index dccd28aed..55578bd8c 100644 --- a/utils/test/dashboard/dashboard/elastic2kibana/utility.py +++ b/utils/test/dashboard/dashboard/elastic2kibana/utility.py @@ -2,7 +2,7 @@ import json from jinja2 import Environment, PackageLoader -env = Environment(loader=PackageLoader('elastic2kibana', 'templates')) +env = Environment(loader=PackageLoader('dashboard', 'elastic2kibana/templates')) env.filters['jsonify'] = json.dumps diff --git a/utils/test/dashboard/dashboard/elastic2kibana/visualization_assembler.py b/utils/test/dashboard/dashboard/elastic2kibana/visualization_assembler.py index 1cb0ba8d1..d7e6e543a 100644 --- a/utils/test/dashboard/dashboard/elastic2kibana/visualization_assembler.py +++ b/utils/test/dashboard/dashboard/elastic2kibana/visualization_assembler.py @@ -1,7 +1,7 @@ import json import utility -from common import elastic_access +from dashboard.common import elastic_access class VisStateBuilder(object): diff --git a/utils/test/dashboard/dashboard/elastic2kibana_main.py b/utils/test/dashboard/dashboard/elastic2kibana_main.py deleted file mode 100644 index 3ec27cb40..000000000 --- a/utils/test/dashboard/dashboard/elastic2kibana_main.py +++ /dev/null @@ -1,4 +0,0 @@ -from elastic2kibana.main import main - -if __name__ == '__main__': - main() diff --git a/utils/test/dashboard/dashboard/mongo2elastic/format.py b/utils/test/dashboard/dashboard/functest/format.py similarity index 94% rename from utils/test/dashboard/dashboard/mongo2elastic/format.py rename to utils/test/dashboard/dashboard/functest/format.py index 0bbde1746..ef485bae0 100644 --- a/utils/test/dashboard/dashboard/mongo2elastic/format.py +++ b/utils/test/dashboard/dashboard/functest/format.py @@ -184,21 +184,3 @@ def format_vims(testcase): } } 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/utils/test/dashboard/dashboard/mongo2elastic/main.py b/utils/test/dashboard/dashboard/mongo2elastic/main.py index 8c7300b79..688f55f7d 100644 --- a/utils/test/dashboard/dashboard/mongo2elastic/main.py +++ b/utils/test/dashboard/dashboard/mongo2elastic/main.py @@ -5,15 +5,15 @@ import json import os import subprocess import traceback -import urlparse import uuid import argparse -from common import logger_utils, elastic_access -from conf import testcases -from conf.config import APIConfig -from mongo2elastic import format +from dashboard.common import elastic_access +from dashboard.common import logger_utils +from dashboard.conf import testcases +from dashboard.conf.config import APIConfig +from dashboard.mongo2elastic import format logger = logger_utils.DashboardLogger('mongo2elastic').get @@ -187,7 +187,7 @@ class DocumentsPublisher(object): self._remove() exit(-1) - def get_existed_docs(self): + def get_exists(self): if self.days == 0: body = '''{{ "query": {{ @@ -241,10 +241,6 @@ class DocumentsPublisher(object): def main(): - base_elastic_url = urlparse.urljoin(CONF.es_url, '/testapi/results') - days = args.latest_days - es_creds = CONF.es_creds - for project, case_dicts in testcases.testcases_yaml.items(): for case_dict in case_dicts: case = case_dict.get('name') @@ -252,6 +248,6 @@ def main(): DocumentsPublisher(project, case, fmt, - days, - base_elastic_url, - es_creds).export().get_existed_docs().publish() + args.latest_days, + CONF.index_url, + CONF.es_creds).export().get_exists().publish() diff --git a/utils/test/dashboard/dashboard/mongo2elastic_main.py b/utils/test/dashboard/dashboard/mongo2elastic_main.py deleted file mode 100644 index 141d8f3ab..000000000 --- a/utils/test/dashboard/dashboard/mongo2elastic_main.py +++ /dev/null @@ -1,4 +0,0 @@ -from mongo2elastic.main import main - -if __name__ == '__main__': - main() diff --git a/utils/test/dashboard/dashboard/qtip/format.py b/utils/test/dashboard/dashboard/qtip/format.py new file mode 100644 index 000000000..b78fa5b9b --- /dev/null +++ b/utils/test/dashboard/dashboard/qtip/format.py @@ -0,0 +1,19 @@ +#! /usr/bin/env python + + +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/utils/test/dashboard/etc/config.ini b/utils/test/dashboard/etc/config.ini index d9327981e..77adc1687 100644 --- a/utils/test/dashboard/etc/config.ini +++ b/utils/test/dashboard/etc/config.ini @@ -2,6 +2,7 @@ # the CONF object in config.ini must be updated [elastic] url = http://localhost:9200 +index = testapi/results creds = [kibana] diff --git a/utils/test/dashboard/install.sh b/utils/test/dashboard/install.sh new file mode 100755 index 000000000..9fd60d916 --- /dev/null +++ b/utils/test/dashboard/install.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +usage=" +Script to install dashboard automatically. +This script should be run under root. + +usage: + bash $(basename "$0") [-h|--help] [-t ] + +where: + -h|--help show this help text + -p|--project project dashboard + " + +# Parse parameters +while [[ $# > 0 ]] + do + key="$1" + case $key in + -h|--help) + echo "$usage" + exit 0 + shift + ;; + -p|--project) + PROJECT="$2" + shift + ;; + *) + echo "unknown option $1 $2" + exit 1 + ;; + esac + shift # past argument or value +done + +if [[ $(whoami) != "root" ]]; then + echo "Error: This script must be run as root!" + exit 1 +fi + +if [ -z ${PROJECT+x} ]; then + echo "project must be specified" + exit 1 +fi + +if [ $PROJECT != "functest" ] && [ $PROJECT != "qtip" ];then + echo "unsupported project $PROJECT" + exit 1 +fi + +cp -f dashboard/$PROJECT/format.py dashboard/mongo2elastic +cp -f dashboard/$PROJECT/testcases.yaml etc/ +python setup.py install diff --git a/utils/test/dashboard/setup.cfg b/utils/test/dashboard/setup.cfg new file mode 100644 index 000000000..dd0135861 --- /dev/null +++ b/utils/test/dashboard/setup.cfg @@ -0,0 +1,43 @@ +[metadata] +name = dashboard +summary = Test Result Collector +description-file = + README.rst +author = SerenaFeng +author-email = feng.xiaowei@zte.com.cn +#home-page = http://www.opnfv.org/ +classifier = + Environment :: opnfv + Intended Audience :: Information Technology + Intended Audience :: System Administrators + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: 2 + Programming Language :: Python :: 2.7 + +[global] +setup-hooks = + pbr.hooks.setup_hook + +[files] +packages = + dashboard +package_data = + dashboard = + elastic2kibana/templates/*.* +data_files = + /etc/dashboard = + etc/config.ini + etc/testcases.yaml + +[entry_points] +console_scripts = + dashboard_mongo2elastic = dashboard.mongo2elastic.main:main + dashboard_elastic2kibana = dashboard.elastic2kibana.main:main + +[egg_info] +tag_build = +tag_date = 0 +tag_svn_revision = 0 + diff --git a/utils/test/dashboard/setup.py b/utils/test/dashboard/setup.py new file mode 100644 index 000000000..59637a509 --- /dev/null +++ b/utils/test/dashboard/setup.py @@ -0,0 +1,8 @@ +import setuptools + +__author__ = 'serena' + + +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) diff --git a/utils/test/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py index b527b7861..653448eaf 100755 --- a/utils/test/reporting/functest/reporting-status.py +++ b/utils/test/reporting/functest/reporting-status.py @@ -82,6 +82,10 @@ for version in conf.versions: items = {} scenario_result_criteria = {} + scenario_file_name = (conf.REPORTING_PATH + + "/functest/release/" + version + + "/scenario_history.txt") + # For all the scenarios get results for s, s_result in scenario_results.items(): logger.info("---------------------------------") @@ -185,11 +189,8 @@ for version in conf.versions: scenario_criteria = conf.MAX_SCENARIO_CRITERIA s_score = str(scenario_score) + "/" + str(scenario_criteria) - s_score_percent = 0.0 - try: - s_score_percent = float(scenario_score) / float(scenario_criteria) * 100 - except: - logger.error("cannot calculate the score percent") + s_score_percent = utils.getScenarioPercent(scenario_score, + scenario_criteria) s_status = "KO" if scenario_score < scenario_criteria: @@ -209,10 +210,7 @@ for version in conf.versions: f.write(info) # Save daily results in a file - path_validation_file = (conf.REPORTING_PATH + - "/functest/release/" + version + - "/scenario_history.txt") - with open(path_validation_file, "a") as f: + with open(scenario_file_name, "a") as f: info = (reportingDate + "," + s + "," + installer + "," + s_score + "," + str(round(s_score_percent)) + "\n") @@ -239,34 +237,39 @@ for version in conf.versions: version=version, date=reportingDate) - with open(conf.REPORTING_PATH + "/functest/release/" + version + - "/index-status-" + installer + ".html", "wb") as fh: - fh.write(outputText) + # csv + # generate sub files based on scenario_history.txt + scenario_installer_file_name = (conf.REPORTING_PATH + + "/functest/release/" + version + + "/scenario_history_" + installer + + ".txt") + scenario_installer_file = open(scenario_installer_file_name, "a") + logger.info("Generate CSV...") + with open(scenario_file_name, "r") as f: + for line in f: + if installer in line: + logger.debug("Add new line... %s" % line) + scenario_installer_file.write(line) + scenario_installer_file.close + + with open(conf.REPORTING_PATH + "/functest/release/" + version + + "/index-status-" + installer + ".html", "wb") as fh: + fh.write(outputText) + logger.info("CSV generated...") - # Generate outputs for export - # pdf - try: - pdf_path = ("http://testresults.opnfv.org/reporting/" + - "functest/release/" + version + - "/index-status-" + installer + ".html") - pdf_doc_name = (conf.REPORTING_PATH + - "/functest/release/" + version + - "/status-" + installer + ".pdf") - pdfkit.from_url(pdf_path, pdf_doc_name) - except IOError: - logger.info("pdf generated anyway...") - except: - logger.error("impossible to generate PDF") - # csv - # generate sub files based on scenario_history.txt - scenario_installer_file_name = (conf.REPORTING_PATH + - "/functest/release/" + version + - "/scenario_history_" + - installer + ".txt") - scenario_installer_file = open(scenario_installer_file_name, "w") - - with open(path_validation_file, "r") as f: - for line in f: - if installer in line: - scenario_installer_file.write(line) - scenario_installer_file.close + # Generate outputs for export + # pdf + logger.info("Generate PDF...") + try: + pdf_path = ("http://testresults.opnfv.org/reporting/" + + "functest/release/" + version + + "/index-status-" + installer + ".html") + pdf_doc_name = (conf.REPORTING_PATH + + "/functest/release/" + version + + "/status-" + installer + ".pdf") + pdfkit.from_url(pdf_path, pdf_doc_name) + logger.info("PDF generated...") + except IOError: + logger.info("pdf generated anyway...") + except: + logger.error("impossible to generate PDF") diff --git a/utils/test/reporting/functest/reportingUtils.py b/utils/test/reporting/functest/reportingUtils.py index 9ba02e821..74d6f19c9 100644 --- a/utils/test/reporting/functest/reportingUtils.py +++ b/utils/test/reporting/functest/reportingUtils.py @@ -176,3 +176,11 @@ def getJenkinsUrl(build_tag): print 'Impossible to get jenkins url:' return jenkins_url + +def getScenarioPercent(scenario_score,scenario_criteria): + score = 0.0 + try: + score = float(scenario_score) / float(scenario_criteria) * 100 + except: + print 'Impossible to calculate the percentage score' + return score diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/.gitignore b/utils/test/testapi/3rd_party/static/.gitignore similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/.gitignore rename to utils/test/testapi/3rd_party/static/.gitignore diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/highlight.default.css b/utils/test/testapi/3rd_party/static/css/highlight.default.css similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/highlight.default.css rename to utils/test/testapi/3rd_party/static/css/highlight.default.css diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/hightlight.default.css b/utils/test/testapi/3rd_party/static/css/hightlight.default.css similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/hightlight.default.css rename to utils/test/testapi/3rd_party/static/css/hightlight.default.css diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/screen.css b/utils/test/testapi/3rd_party/static/css/screen.css similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/css/screen.css rename to utils/test/testapi/3rd_party/static/css/screen.css diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/endpoint.html b/utils/test/testapi/3rd_party/static/endpoint.html similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/endpoint.html rename to utils/test/testapi/3rd_party/static/endpoint.html diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/explorer_icons.png b/utils/test/testapi/3rd_party/static/images/explorer_icons.png similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/explorer_icons.png rename to utils/test/testapi/3rd_party/static/images/explorer_icons.png diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/logo_small.png b/utils/test/testapi/3rd_party/static/images/logo_small.png similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/logo_small.png rename to utils/test/testapi/3rd_party/static/images/logo_small.png diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/pet_store_api.png b/utils/test/testapi/3rd_party/static/images/pet_store_api.png similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/pet_store_api.png rename to utils/test/testapi/3rd_party/static/images/pet_store_api.png diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/throbber.gif b/utils/test/testapi/3rd_party/static/images/throbber.gif similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/throbber.gif rename to utils/test/testapi/3rd_party/static/images/throbber.gif diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/wordnik_api.png b/utils/test/testapi/3rd_party/static/images/wordnik_api.png similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/images/wordnik_api.png rename to utils/test/testapi/3rd_party/static/images/wordnik_api.png diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/index.html b/utils/test/testapi/3rd_party/static/index.html similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/index.html rename to utils/test/testapi/3rd_party/static/index.html diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/backbone-min.js b/utils/test/testapi/3rd_party/static/lib/backbone-min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/backbone-min.js rename to utils/test/testapi/3rd_party/static/lib/backbone-min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/handlebars-1.0.0.js b/utils/test/testapi/3rd_party/static/lib/handlebars-1.0.0.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/handlebars-1.0.0.js rename to utils/test/testapi/3rd_party/static/lib/handlebars-1.0.0.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/highlight.7.3.pack.js b/utils/test/testapi/3rd_party/static/lib/highlight.7.3.pack.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/highlight.7.3.pack.js rename to utils/test/testapi/3rd_party/static/lib/highlight.7.3.pack.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery-1.8.0.min.js b/utils/test/testapi/3rd_party/static/lib/jquery-1.8.0.min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery-1.8.0.min.js rename to utils/test/testapi/3rd_party/static/lib/jquery-1.8.0.min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.ba-bbq.min.js b/utils/test/testapi/3rd_party/static/lib/jquery.ba-bbq.min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.ba-bbq.min.js rename to utils/test/testapi/3rd_party/static/lib/jquery.ba-bbq.min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.slideto.min.js b/utils/test/testapi/3rd_party/static/lib/jquery.slideto.min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.slideto.min.js rename to utils/test/testapi/3rd_party/static/lib/jquery.slideto.min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.wiggle.min.js b/utils/test/testapi/3rd_party/static/lib/jquery.wiggle.min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/jquery.wiggle.min.js rename to utils/test/testapi/3rd_party/static/lib/jquery.wiggle.min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred.bundle.js b/utils/test/testapi/3rd_party/static/lib/shred.bundle.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred.bundle.js rename to utils/test/testapi/3rd_party/static/lib/shred.bundle.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred/content.js b/utils/test/testapi/3rd_party/static/lib/shred/content.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/shred/content.js rename to utils/test/testapi/3rd_party/static/lib/shred/content.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger-oauth.js b/utils/test/testapi/3rd_party/static/lib/swagger-oauth.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger-oauth.js rename to utils/test/testapi/3rd_party/static/lib/swagger-oauth.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger.js b/utils/test/testapi/3rd_party/static/lib/swagger.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/swagger.js rename to utils/test/testapi/3rd_party/static/lib/swagger.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/underscore-min.js b/utils/test/testapi/3rd_party/static/lib/underscore-min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/lib/underscore-min.js rename to utils/test/testapi/3rd_party/static/lib/underscore-min.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/o2c.html b/utils/test/testapi/3rd_party/static/o2c.html similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/o2c.html rename to utils/test/testapi/3rd_party/static/o2c.html diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.js b/utils/test/testapi/3rd_party/static/swagger-ui.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.js rename to utils/test/testapi/3rd_party/static/swagger-ui.js diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.min.js b/utils/test/testapi/3rd_party/static/swagger-ui.min.js similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/static/swagger-ui.min.js rename to utils/test/testapi/3rd_party/static/swagger-ui.min.js diff --git a/utils/test/result_collection_api/README.rst b/utils/test/testapi/README.rst similarity index 97% rename from utils/test/result_collection_api/README.rst rename to utils/test/testapi/README.rst index c0075bc76..44ab2a475 100644 --- a/utils/test/result_collection_api/README.rst +++ b/utils/test/testapi/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/utils/test/result_collection_api/docker/Dockerfile b/utils/test/testapi/docker/Dockerfile similarity index 96% rename from utils/test/result_collection_api/docker/Dockerfile rename to utils/test/testapi/docker/Dockerfile index ffee4c231..b0272e609 100644 --- a/utils/test/result_collection_api/docker/Dockerfile +++ b/utils/test/testapi/docker/Dockerfile @@ -46,7 +46,7 @@ RUN pip install --upgrade pip RUN git config --global http.sslVerify false RUN git clone https://gerrit.opnfv.org/gerrit/releng /home/releng -WORKDIR /home/releng/utils/test/result_collection_api/ +WORKDIR /home/releng/utils/test/testapi/ RUN pip install -r requirements.txt RUN python setup.py install CMD ["bash", "docker/start-server.sh"] diff --git a/utils/test/result_collection_api/docker/prepare-env.sh b/utils/test/testapi/docker/prepare-env.sh similarity index 100% rename from utils/test/result_collection_api/docker/prepare-env.sh rename to utils/test/testapi/docker/prepare-env.sh diff --git a/utils/test/result_collection_api/docker/start-server.sh b/utils/test/testapi/docker/start-server.sh similarity index 100% rename from utils/test/result_collection_api/docker/start-server.sh rename to utils/test/testapi/docker/start-server.sh diff --git a/utils/test/result_collection_api/etc/config.ini b/utils/test/testapi/etc/config.ini similarity index 100% rename from utils/test/result_collection_api/etc/config.ini rename to utils/test/testapi/etc/config.ini diff --git a/utils/test/testapi/install.sh b/utils/test/testapi/install.sh new file mode 100755 index 000000000..43229eabb --- /dev/null +++ b/utils/test/testapi/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 ] + +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 diff --git a/utils/test/result_collection_api/opnfv_testapi/__init__.py b/utils/test/testapi/opnfv_testapi/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/__init__.py rename to utils/test/testapi/opnfv_testapi/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/cmd/__init__.py b/utils/test/testapi/opnfv_testapi/cmd/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/cmd/__init__.py rename to utils/test/testapi/opnfv_testapi/cmd/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/cmd/server.py b/utils/test/testapi/opnfv_testapi/cmd/server.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/cmd/server.py rename to utils/test/testapi/opnfv_testapi/cmd/server.py diff --git a/utils/test/result_collection_api/opnfv_testapi/common/__init__.py b/utils/test/testapi/opnfv_testapi/common/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/common/__init__.py rename to utils/test/testapi/opnfv_testapi/common/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/common/config.py b/utils/test/testapi/opnfv_testapi/common/config.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/common/config.py rename to utils/test/testapi/opnfv_testapi/common/config.py diff --git a/utils/test/result_collection_api/opnfv_testapi/common/constants.py b/utils/test/testapi/opnfv_testapi/common/constants.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/common/constants.py rename to utils/test/testapi/opnfv_testapi/common/constants.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/__init__.py b/utils/test/testapi/opnfv_testapi/resources/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/__init__.py rename to utils/test/testapi/opnfv_testapi/resources/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/handlers.py b/utils/test/testapi/opnfv_testapi/resources/handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/handlers.py rename to utils/test/testapi/opnfv_testapi/resources/handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/models.py b/utils/test/testapi/opnfv_testapi/resources/models.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/models.py rename to utils/test/testapi/opnfv_testapi/resources/models.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/pod_handlers.py b/utils/test/testapi/opnfv_testapi/resources/pod_handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/pod_handlers.py rename to utils/test/testapi/opnfv_testapi/resources/pod_handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/pod_models.py b/utils/test/testapi/opnfv_testapi/resources/pod_models.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/pod_models.py rename to utils/test/testapi/opnfv_testapi/resources/pod_models.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/project_handlers.py b/utils/test/testapi/opnfv_testapi/resources/project_handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/project_handlers.py rename to utils/test/testapi/opnfv_testapi/resources/project_handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/project_models.py b/utils/test/testapi/opnfv_testapi/resources/project_models.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/project_models.py rename to utils/test/testapi/opnfv_testapi/resources/project_models.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py b/utils/test/testapi/opnfv_testapi/resources/result_handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py rename to utils/test/testapi/opnfv_testapi/resources/result_handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/result_models.py b/utils/test/testapi/opnfv_testapi/resources/result_models.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/result_models.py rename to utils/test/testapi/opnfv_testapi/resources/result_models.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/testcase_handlers.py b/utils/test/testapi/opnfv_testapi/resources/testcase_handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/testcase_handlers.py rename to utils/test/testapi/opnfv_testapi/resources/testcase_handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/testcase_models.py b/utils/test/testapi/opnfv_testapi/resources/testcase_models.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/resources/testcase_models.py rename to utils/test/testapi/opnfv_testapi/resources/testcase_models.py diff --git a/utils/test/result_collection_api/opnfv_testapi/router/__init__.py b/utils/test/testapi/opnfv_testapi/router/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/router/__init__.py rename to utils/test/testapi/opnfv_testapi/router/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/router/url_mappings.py b/utils/test/testapi/opnfv_testapi/router/url_mappings.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/router/url_mappings.py rename to utils/test/testapi/opnfv_testapi/router/url_mappings.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/__init__.py b/utils/test/testapi/opnfv_testapi/tests/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/__init__.py rename to utils/test/testapi/opnfv_testapi/tests/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/__init__.py b/utils/test/testapi/opnfv_testapi/tests/unit/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/__init__.py rename to utils/test/testapi/opnfv_testapi/tests/unit/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/fake_pymongo.py b/utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/fake_pymongo.py rename to utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_base.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_base.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_base.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_base.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_fake_pymongo.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_fake_pymongo.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_fake_pymongo.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_fake_pymongo.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_pod.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_pod.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_pod.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_pod.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_project.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_project.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_project.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_project.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_result.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_result.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_testcase.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_testcase.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_testcase.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_testcase.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_version.py b/utils/test/testapi/opnfv_testapi/tests/unit/test_version.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tests/unit/test_version.py rename to utils/test/testapi/opnfv_testapi/tests/unit/test_version.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/README.md b/utils/test/testapi/opnfv_testapi/tornado_swagger/README.md similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/README.md rename to utils/test/testapi/opnfv_testapi/tornado_swagger/README.md diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/__init__.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/__init__.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/__init__.py rename to utils/test/testapi/opnfv_testapi/tornado_swagger/__init__.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/handlers.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/handlers.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/handlers.py rename to utils/test/testapi/opnfv_testapi/tornado_swagger/handlers.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/settings.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/settings.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/settings.py rename to utils/test/testapi/opnfv_testapi/tornado_swagger/settings.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/swagger.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/swagger.py rename to utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py diff --git a/utils/test/result_collection_api/opnfv_testapi/tornado_swagger/views.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py similarity index 100% rename from utils/test/result_collection_api/opnfv_testapi/tornado_swagger/views.py rename to utils/test/testapi/opnfv_testapi/tornado_swagger/views.py diff --git a/utils/test/result_collection_api/requirements.txt b/utils/test/testapi/requirements.txt similarity index 100% rename from utils/test/result_collection_api/requirements.txt rename to utils/test/testapi/requirements.txt diff --git a/utils/test/result_collection_api/run_test.sh b/utils/test/testapi/run_test.sh similarity index 100% rename from utils/test/result_collection_api/run_test.sh rename to utils/test/testapi/run_test.sh diff --git a/utils/test/result_collection_api/setup.cfg b/utils/test/testapi/setup.cfg similarity index 100% rename from utils/test/result_collection_api/setup.cfg rename to utils/test/testapi/setup.cfg diff --git a/utils/test/result_collection_api/setup.py b/utils/test/testapi/setup.py similarity index 100% rename from utils/test/result_collection_api/setup.py rename to utils/test/testapi/setup.py diff --git a/utils/test/result_collection_api/test-requirements.txt b/utils/test/testapi/test-requirements.txt similarity index 100% rename from utils/test/result_collection_api/test-requirements.txt rename to utils/test/testapi/test-requirements.txt diff --git a/utils/test/result_collection_api/update/README.md b/utils/test/testapi/update/README.md similarity index 100% rename from utils/test/result_collection_api/update/README.md rename to utils/test/testapi/update/README.md diff --git a/utils/test/result_collection_api/update/__init__.py b/utils/test/testapi/update/__init__.py similarity index 100% rename from utils/test/result_collection_api/update/__init__.py rename to utils/test/testapi/update/__init__.py diff --git a/utils/test/result_collection_api/update/playbook-update.sh b/utils/test/testapi/update/playbook-update.sh similarity index 100% rename from utils/test/result_collection_api/update/playbook-update.sh rename to utils/test/testapi/update/playbook-update.sh diff --git a/utils/test/testapi/update/templates/__init__.py b/utils/test/testapi/update/templates/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/utils/test/result_collection_api/update/templates/backup_mongodb.py b/utils/test/testapi/update/templates/backup_mongodb.py similarity index 100% rename from utils/test/result_collection_api/update/templates/backup_mongodb.py rename to utils/test/testapi/update/templates/backup_mongodb.py diff --git a/utils/test/result_collection_api/update/templates/changes_in_mongodb.py b/utils/test/testapi/update/templates/changes_in_mongodb.py similarity index 100% rename from utils/test/result_collection_api/update/templates/changes_in_mongodb.py rename to utils/test/testapi/update/templates/changes_in_mongodb.py diff --git a/utils/test/result_collection_api/update/templates/restore_mongodb.py b/utils/test/testapi/update/templates/restore_mongodb.py similarity index 100% rename from utils/test/result_collection_api/update/templates/restore_mongodb.py rename to utils/test/testapi/update/templates/restore_mongodb.py diff --git a/utils/test/result_collection_api/update/templates/rm_images.sh b/utils/test/testapi/update/templates/rm_images.sh similarity index 100% rename from utils/test/result_collection_api/update/templates/rm_images.sh rename to utils/test/testapi/update/templates/rm_images.sh diff --git a/utils/test/result_collection_api/update/templates/rm_olds.sh b/utils/test/testapi/update/templates/rm_olds.sh similarity index 100% rename from utils/test/result_collection_api/update/templates/rm_olds.sh rename to utils/test/testapi/update/templates/rm_olds.sh diff --git a/utils/test/result_collection_api/update/templates/update_mongodb.py b/utils/test/testapi/update/templates/update_mongodb.py similarity index 100% rename from utils/test/result_collection_api/update/templates/update_mongodb.py rename to utils/test/testapi/update/templates/update_mongodb.py diff --git a/utils/test/result_collection_api/update/templates/utils.py b/utils/test/testapi/update/templates/utils.py similarity index 100% rename from utils/test/result_collection_api/update/templates/utils.py rename to utils/test/testapi/update/templates/utils.py diff --git a/utils/test/result_collection_api/update/test.yml b/utils/test/testapi/update/test.yml similarity index 100% rename from utils/test/result_collection_api/update/test.yml rename to utils/test/testapi/update/test.yml diff --git a/utils/test/result_collection_api/update/update.yml b/utils/test/testapi/update/update.yml similarity index 100% rename from utils/test/result_collection_api/update/update.yml rename to utils/test/testapi/update/update.yml diff --git a/utils/test/result_collection_api/update/update_api.py b/utils/test/testapi/update/update_api.py similarity index 100% rename from utils/test/result_collection_api/update/update_api.py rename to utils/test/testapi/update/update_api.py