Merge "Set arm-pod-3 as non-ci POD"

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index a2a57d4..d15bf74 100644 (file)
--- 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/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 363423d..233cf08 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -110,6 +110,8 @@
             make
             # run basic sanity test
             make sanity
+            cd ../ci
+            ./build-vsperf.sh verify
 
 - job-template:
     name: 'vswitchperf-merge-{stream}'
@@ -162,3 +164,5 @@
             cd src
             make clobber
             make
+            cd ../ci
+            ./build-vsperf.sh merge

diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
index a1e7d5d..6b608a7 100644 (file)
--- a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
+++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp
@@ -239,5 +239,13 @@ class opnfv::server (
     multiple => true,
   }
 
+  # disable selinux in case of RHEL
+  if ($::osfamily == 'RedHat') {
+    class { 'selinux':
+      mode => 'disabled',
+    }
+  }
+
+  # update hosts
   create_resources('host', hiera_hash('hosts'))
 }

diff --git a/utils/test/dashboard/dashboard/conf/config.py b/utils/test/dashboard/dashboard/conf/config.py
index 44cf797..6114e90 100644 (file)
--- 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
 
 
@@ -27,6 +28,7 @@ class APIConfig:
         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/elastic2kibana/main.py b/utils/test/dashboard/dashboard/elastic2kibana/main.py
index 5af512e..112d222 100644 (file)
--- a/utils/test/dashboard/dashboard/elastic2kibana/main.py
+++ b/utils/test/dashboard/dashboard/elastic2kibana/main.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 import json
-import urlparse
 
 import argparse
 
@@ -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/mongo2elastic/main.py b/utils/test/dashboard/dashboard/mongo2elastic/main.py
index c2a8d11..688f55f 100644 (file)
--- a/utils/test/dashboard/dashboard/mongo2elastic/main.py
+++ b/utils/test/dashboard/dashboard/mongo2elastic/main.py
@@ -5,7 +5,6 @@ import json
 import os
 import subprocess
 import traceback
-import urlparse
 import uuid
 
 import argparse
@@ -188,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": {{
@@ -242,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')
@@ -253,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/etc/config.ini b/utils/test/dashboard/etc/config.ini
index d932798..77adc16 100644 (file)
--- 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/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py
index b527b78..653448e 100755 (executable)
--- 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 9ba02e8..74d6f19 100644 (file)
--- 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/3rd_party/static/.gitignore b/utils/test/testapi/3rd_party/static/.gitignore
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/.gitignore
rename to utils/test/testapi/3rd_party/static/.gitignore

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/static/css/screen.css b/utils/test/testapi/3rd_party/static/css/screen.css
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/css/screen.css
rename to utils/test/testapi/3rd_party/static/css/screen.css

diff --git a/utils/test/result_collection_api/3rd_party/static/endpoint.html b/utils/test/testapi/3rd_party/static/endpoint.html
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/endpoint.html
rename to utils/test/testapi/3rd_party/static/endpoint.html

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/static/images/throbber.gif b/utils/test/testapi/3rd_party/static/images/throbber.gif
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/images/throbber.gif
rename to utils/test/testapi/3rd_party/static/images/throbber.gif

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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/3rd_party/static/index.html b/utils/test/testapi/3rd_party/static/index.html
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/index.html
rename to utils/test/testapi/3rd_party/static/index.html

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/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/3rd_party/static/lib/swagger.js b/utils/test/testapi/3rd_party/static/lib/swagger.js
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/lib/swagger.js
rename to utils/test/testapi/3rd_party/static/lib/swagger.js

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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/3rd_party/static/o2c.html b/utils/test/testapi/3rd_party/static/o2c.html
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/o2c.html
rename to utils/test/testapi/3rd_party/static/o2c.html

diff --git a/utils/test/result_collection_api/3rd_party/static/swagger-ui.js b/utils/test/testapi/3rd_party/static/swagger-ui.js
similarity index 100%
rename from utils/test/result_collection_api/3rd_party/static/swagger-ui.js
rename to utils/test/testapi/3rd_party/static/swagger-ui.js

diff --git a/utils/test/result_collection_api/3rd_party/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/3rd_party/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 100%
rename from utils/test/result_collection_api/README.rst
rename to utils/test/testapi/README.rst

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 ffee4c2..b0272e6 100644 (file)
--- 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/result_collection_api/install.sh b/utils/test/testapi/install.sh
similarity index 100%
rename from utils/test/result_collection_api/install.sh
rename to utils/test/testapi/install.sh

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/result_collection_api/update/templates/__init__.py b/utils/test/testapi/update/templates/__init__.py
similarity index 100%
rename from utils/test/result_collection_api/update/templates/__init__.py
rename to utils/test/testapi/update/templates/__init__.py

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