Reduce logging in the SFC test case

JIRA: FUNCTEST-446

Reduce the logs that appear in the Jenkins CI console to make the output
of the SFC test case more readable

- Redirect tacker installation logs to results folder
  /home/opnfv/functest/results/odl-sfc.log
- Split odl-sfc preparation into a new script
- Pipe STDERR in the sfc.py script so that "Added to known hosts"
  messages do not show in the output

Change-Id: Ibf871ade6827d4817f33623b935c5f1d904086bb
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>

1 files changed, 5 insertions, 12 deletions

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index deb505df..e402e0c3 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -147,18 +147,11 @@ function run_test(){
             python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report
         ;;
         "odl-sfc")
-            bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/server_presetup_CI.bash
-            ret_val=$?
-            if [ $ret_val != 0 ]; then
-                exit $ret_val
-            fi
-            bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/compute_presetup_CI.bash
-            ret_val=$?
-            if [ $ret_val != 0 ]; then
-                exit $ret_val
-            fi
-            source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc
-            python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py $report
+            ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+            # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
+            FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} bash ${ODL_SFC_DIR}/prepare_odl_sfc.bash || exit $?
+            source ${ODL_SFC_DIR}/tackerc
+            python ${ODL_SFC_DIR}/sfc.py $report
         ;;
         "parser")
             python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report