Merge "Remove exec_test.sh"

diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index 08e089c..1bb8358 100644 (file)
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -392,7 +392,6 @@ follows::
         |   |-- check_os.sh
         |   |-- config_functest.yaml
         |   |-- config_patch.yaml
-        |   |-- exec_test.sh
         |   |-- generate_report.py
         |   |-- prepare_env.py
         |   |-- run_tests.py

diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh
deleted file mode 100755 (executable)
index 6f77610..0000000
--- a/functest/ci/exec_test.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-
-#
-# Author: Jose Lausuch (jose.lausuch@ericsson.com)
-#         Morgan Richomme (morgan.richomme@orange.com)
-# Installs the Functest framework within the Docker container
-# and run the tests automatically
-#
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-
-usage="Script to trigger the tests automatically.
-
-usage:
-    bash $(basename "$0") [-h|--help] [-t <test_name>]
-
-where:
-    -h|--help         show this help text
-    -r|--report       push results to database (false by default)
-    -s|--serial       run Tempest tests in one thread
-    -t|--test         run specific test case
-      <test_name>"
-
-
-report=""
-serial=false
-
-# Get the list of runnable tests
-# Check if we are in CI mode
-debug=""
-if [[ "${CI_DEBUG,,}" == "true" ]];then
-    debug="--debug"
-fi
-
-FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
-FUNCTEST_TEST_DIR=${REPOS_DIR}/functest/functest/opnfv_tests
-FUNCTEST_CONF_DIR=/home/opnfv/functest/conf
-
-export PYTHONUNBUFFERED=1
-
-function odl_tests(){
-    keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
-    neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
-    odl_ip=${neutron_ip}
-    odl_port=8080
-    odl_restport=8181
-    if [ "$INSTALLER_TYPE" == "fuel" ]; then
-        odl_port=8282
-    elif [ "$INSTALLER_TYPE" == "apex" ]; then
-        odl_ip=$SDN_CONTROLLER_IP
-        odl_port=8081
-        odl_restport=8081
-    elif [ "$INSTALLER_TYPE" == "netvirt" ]; then
-        odl_ip=$SDN_CONTROLLER_IP
-        odl_port=8081
-        odl_restport=8081
-    elif [ "$INSTALLER_TYPE" == "joid" ]; then
-        odl_ip=$SDN_CONTROLLER
-    elif [ "$INSTALLER_TYPE" == "compass" ]; then
-        odl_port=8181
-    else
-        odl_ip=$SDN_CONTROLLER_IP
-    fi
-}
-
-
-
-function run_test(){
-    test_name=$1
-    serial_flag=""
-    if [ $serial == "true" ]; then
-        serial_flag="-s"
-    fi
-
-    case $test_name in
-        "healthcheck")
-            ${FUNCTEST_TEST_DIR}/openstack/healthcheck/healthcheck.sh
-        ;;
-        "odl")
-            odl_tests
-            [[ "$report" == "-r" ]] && args=-p
-            ${FUNCTEST_TEST_DIR}/sdn/odl/odl.py \
-                --keystoneip $keystone_ip \
-                --neutronip $neutron_ip \
-                --odlip $odl_ip \
-                --odlrestconfport $odl_restport \
-                --odlwebport $odl_port \
-                --ospassword ${OS_PASSWORD} \
-                --ostenantname ${OS_TENANT_NAME} \
-                --osusername ${OS_USERNAME} \
-                ${args}
-        ;;
-        "ovno")
-            # suite under rewritting for colorado
-            # no need to run anything until refactoring done
-            # ${REPOS_DIR}/ovno/Testcases/RunTests.sh
-        ;;
-        *)
-            echo "The test case '${test_name}' does not exist."
-            exit 1
-    esac
-
-    if [[ $? != 0 ]]; then exit 1
-    else exit 0
-    fi
-}
-
-
-# Parse parameters
-while [[ $# > 0 ]]
-    do
-    key="$1"
-    case $key in
-        -h|--help)
-            echo "$usage"
-            exit 0
-            shift
-        ;;
-        -r|--report)
-            report="-r"
-        ;;
-        -s|--serial)
-            serial=true
-        ;;
-        -t|--test|--tests)
-            TEST="$2"
-            shift
-        ;;
-        *)
-            echo "unknown option $1 $2"
-            exit 1
-        ;;
-    esac
-    shift # past argument or value
-done
-
-
-# Source credentials
-echo "Sourcing Credentials ${creds} to run the test.."
-source ${creds}
-
-
-# Run test
-run_test $TEST

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 2706a80..0e951ef 100755 (executable)
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -32,13 +32,6 @@ from functest.utils.constants import CONST
 logger = ft_logger.Logger("run_tests").getLogger()
 
 
-""" global variables """
-EXEC_SCRIPT = ("%s/functest/ci/exec_test.sh" % CONST.dir_repo_functest)
-
-# This will be the return code of this script. If any of the tests fails,
-# this variable will change to Result.EX_ERROR
-
-
 class Result(enum.Enum):
     EX_OK = os.EX_OK
     EX_ERROR = -1
@@ -119,7 +112,7 @@ def update_test_info(test_name, result, duration):
                          "duration": duration})
 
 
-def get_run_dict_if_defined(testname):
+def get_run_dict(testname):
     try:
         dict = ft_utils.get_dict_by_test(testname)
         if not dict:
@@ -151,7 +144,7 @@ def run_test(test, tier_name, testcases=None):
         flags += " -r"
 
     result = testcase_base.TestcaseBase.EX_RUN_ERROR
-    run_dict = get_run_dict_if_defined(test_name)
+    run_dict = get_run_dict(test_name)
     if run_dict:
         try:
             module = importlib.import_module(run_dict['module'])
@@ -174,11 +167,7 @@ def run_test(test, tier_name, testcases=None):
             logger.exception("Cannot get class {}".format(
                 run_dict['class']))
     else:
-        cmd = ("%s%s" % (EXEC_SCRIPT, flags))
-        logger.info("Executing command {} because {} "
-                    "doesn't implement the new framework".format(
-                        cmd, test_name))
-        result = ft_utils.execute_command(cmd)
+        raise Exception("Cannot import the class for the test case.")
 
     if test.needs_clean() and GlobalVariables.CLEAN_FLAG:
         cleanup()