317 files changed, 8 insertions, 9 deletions

diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh
index d16d5ba0..2eb3e16c 100755
--- a/ci/rubbos_docker_run.sh
+++ b/ci/rubbos_docker_run.sh
@@ -22,7 +22,7 @@ fi
 
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} -e BOTTLENECKS_BRANCH=${BOTTLENECKS_BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL}"
 volumes="-v ${BOTTLENECKS_TOP_DIR}:${BOTTLENECKS_TOP_DIR}"
-run_rubbos_testsuite=${BOTTLENECKS_TOP_DIR}/ci/run_test.sh -s rubbos
+run_rubbos_testsuite=${BOTTLENECKS_TOP_DIR}/run_tests.sh -s rubbos
 
 echo ${envs} ${ops} ${volumes}
 
@@ -34,4 +34,3 @@ ${cmd}
 echo "Bottlenecks: done!"
 
 set +ex
-
diff --git a/config/bottlenecks_cfg.yaml b/config/bottlenecks_cfg.yaml
index d22a8854..8193651f 100755
--- a/config/bottlenecks_cfg.yaml
+++ b/config/bottlenecks_cfg.yaml
@@ -1 +1 @@
-suite_prefix_config: /home/opnfv/bottlenecks/config/testcase_conf
+suite_prefix_config: /home/opnfv/bottlenecks/testsuites/
diff --git a/config/testcase_conf/vstf.yaml b/config/testcase_conf/vstf.yaml
deleted file mode 100755
index 39872626..00000000
--- a/config/testcase_conf/vstf.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tu1
-tu3
diff --git a/ci/run_tests.sh b/run_tests.sh
index 0541e051..9ae89b17 100755
--- a/ci/run_tests.sh
+++ b/run_tests.sh
@@ -33,10 +33,10 @@ function check_testcase(){
     check_suite="$1"
     case $check_suite in
          "-rubbos")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos
+             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos/testcase_cfg
          ;;
          "-vstf")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf
+             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg
          ;;
     esac
 
@@ -67,7 +67,7 @@ function run_test(){
     case $test_suite in
         "rubbos")
             info "Running rubbos test suite"
-            test_file="/home/opnfv/bottlenecks/config/testcase_conf/rubbos.yaml"
+            test_file="/home/opnfv/bottlenecks/testsuite/rubbos/testsuite_story/rubbos_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
@@ -83,7 +83,7 @@ function run_test(){
         ;;
         "vstf")
             info "Running vstf test suite"
-            test_file="/home/opnfv/bottlenecks/config/testcase_conf/vstf.yaml"
+            test_file="/home/opnfv/bottlenecks/testsuite/vstf/testsuite_story/vstf_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
diff --git a/rubbos/rubbos_scripts/1-1-1/1-1-1.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml
index 07a64362..07a64362 100644
--- a/rubbos/rubbos_scripts/1-1-1/1-1-1.xml
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml
diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf b/testsuites/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
index 819bfa63..819bfa63 100644
--- a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template b/testsuites/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
index 313d4d64..313d4d64 100644
--- a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
diff --git a/rubbos/rubbos_scripts/1-1-1/mysql_conf/my.cnf b/testsuites/rubbos/rubbos_scripts/1-1-1/mysql_conf/my.cnf
index af273226..af273226 100644
--- a/rubbos/rubbos_scripts/1-1-1/mysql_conf/my.cnf
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/mysql_conf/my.cnf
diff --git a/rubbos/rubbos_scripts/1-1-1/nsFile.txt b/testsuites/rubbos/rubbos_scripts/1-1-1/nsFile.txt
index 00c73f3d..00c73f3d 100644
--- a/rubbos/rubbos_scripts/1-1-1/nsFile.txt
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/nsFile.txt
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
index f84ded04..f84ded04 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Makefile b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Makefile
index 565b22be..565b22be 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Makefile
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Makefile
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.properties b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.properties
index dc3fbaaa..dc3fbaaa 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.properties
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.properties
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
index 37472041..37472041 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/config.mk b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/config.mk
index 9182da4d..9182da4d 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/config.mk
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/config.mk
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/cpu_mem.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/cpu_mem.sh
index 069cf079..069cf079 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/cpu_mem.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/cpu_mem.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
index 87a5fd8b..87a5fd8b 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
index 4e9258bc..4e9258bc 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsRW.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsRW.sh
index 2dbd9788..2dbd9788 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsRW.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsRW.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
index 0e8a4b43..0e8a4b43 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
index e0a32b6b..e0a32b6b 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
index 4c8c416a..4c8c416a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
index f516b061..f516b061 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
index 7e96fe81..7e96fe81 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
index 6f2555aa..6f2555aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
index 413ee958..413ee958 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
index 36ecde18..36ecde18 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
index 4c8c416a..4c8c416a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
index f516b061..f516b061 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
index f73ff9fd..f73ff9fd 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
index 6f2555aa..6f2555aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
index 413ee958..413ee958 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
index 36ecde18..36ecde18 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
index 4c8c416a..4c8c416a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
index f516b061..f516b061 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
index 7dfd60d9..7dfd60d9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
index 6f2555aa..6f2555aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
index 413ee958..413ee958 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
index 36ecde18..36ecde18 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
index 4c8c416a..4c8c416a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
index f516b061..f516b061 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
index f958638f..f958638f 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
index 6f2555aa..6f2555aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
index 413ee958..413ee958 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
index 36ecde18..36ecde18 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
index 4c8c416a..4c8c416a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
index f516b061..f516b061 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
index 5f218269..5f218269 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
index 6f2555aa..6f2555aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
index 413ee958..413ee958 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
index 36ecde18..36ecde18 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
index 1cfb0bc7..1cfb0bc7 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
index 428172ab..428172ab 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
index 77da6459..77da6459 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
index 2cacf966..2cacf966 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
index 74850b65..74850b65 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
index 1370bc77..1370bc77 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
index 4dd116aa..4dd116aa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
index 29316c57..29316c57 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
index 71cefa44..71cefa44 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
index 515ecea2..515ecea2 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
index 5f6cff8a..5f6cff8a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
index d0ff01ab..d0ff01ab 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
index 946f1007..946f1007 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
index b69cae88..b69cae88 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
index cc714164..cc714164 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
index da07ab36..da07ab36 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
index 96a47007..96a47007 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
index d5db08a0..d5db08a0 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
index a41dfce8..a41dfce8 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
index 24aa4fbb..24aa4fbb 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
index 604de026..604de026 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
index 88c62bec..88c62bec 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
index ddd52081..ddd52081 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
index 7d01066f..7d01066f 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
index 764ae737..764ae737 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
index e370cffa..e370cffa 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
index 75eb561c..75eb561c 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
index 9e17d7c9..9e17d7c9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
index 06bffaef..06bffaef 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
index 8434be82..8434be82 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
index 6ecf4832..6ecf4832 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
index f91b73fd..f91b73fd 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
index 94930eed..94930eed 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
index eeeab8b9..eeeab8b9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index 47cec3ad..47cec3ad 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
index e47b54d3..e47b54d3 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
index 8e57b2b2..8e57b2b2 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh b/testsuites/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
index 0d175eba..0d175eba 100755
--- a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/sysstat_conf/CONFIG b/testsuites/rubbos/rubbos_scripts/1-1-1/sysstat_conf/CONFIG
index 24bfca3a..24bfca3a 100644
--- a/rubbos/rubbos_scripts/1-1-1/sysstat_conf/CONFIG
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/sysstat_conf/CONFIG
diff --git a/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
index 525c4398..525c4398 100644
--- a/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
+++ b/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
diff --git a/config/testcase_conf/rubbos/rubbos_1-1-1.yaml b/testsuites/rubbos/run_rubbos.sh
index e69de29b..e69de29b 100755
--- a/config/testcase_conf/rubbos/rubbos_1-1-1.yaml
+++ b/testsuites/rubbos/run_rubbos.sh
diff --git a/config/testcase_conf/rubbos/rubbos_1-2-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml
index e69de29b..e69de29b 100755
--- a/config/testcase_conf/rubbos/rubbos_1-2-1.yaml
+++ b/testsuites/rubbos/testcase_cfg/rubbos_1-1-1.yaml
diff --git a/config/testcase_conf/vstf/tu1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-2-1.yaml
index e69de29b..e69de29b 100755
--- a/config/testcase_conf/vstf/tu1.yaml
+++ b/testsuites/rubbos/testcase_cfg/rubbos_1-2-1.yaml
diff --git a/config/testcase_conf/rubbos.yaml b/testsuites/rubbos/testsuite_story/rubbos_story1
index f3e7f31a..f3e7f31a 100755
--- a/config/testcase_conf/rubbos.yaml
+++ b/testsuites/rubbos/testsuite_story/rubbos_story1
diff --git a/testsuites/rubbos/testsuite_story/rubbos_story2 b/testsuites/rubbos/testsuite_story/rubbos_story2
new file mode 100755
index 00000000..40eb5f02
--- /dev/null
+++ b/testsuites/rubbos/testsuite_story/rubbos_story2
@@ -0,0 +1,2 @@
+rubbos_1-1-1
+rubbos_1-1-2
diff --git a/config/testcase_conf/vstf/tu3.yaml b/testsuites/vstf/run_vstf.sh
index e69de29b..e69de29b 100755
--- a/config/testcase_conf/vstf/tu3.yaml
+++ b/testsuites/vstf/run_vstf.sh
diff --git a/testsuites/vstf/testsuite_story/vstf_story1 b/testsuites/vstf/testsuite_story/vstf_story1
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/testsuites/vstf/testsuite_story/vstf_story1
diff --git a/testsuites/vstf/testsuite_story/vstf_story2 b/testsuites/vstf/testsuite_story/vstf_story2
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/testsuites/vstf/testsuite_story/vstf_story2
diff --git a/vstf/README.rst b/testsuites/vstf/vstf_scripts/README.rst
index 45fd0094..45fd0094 100644
--- a/vstf/README.rst
+++ b/testsuites/vstf/vstf_scripts/README.rst
diff --git a/vstf/__init__.py b/testsuites/vstf/vstf_scripts/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/__init__.py
+++ b/testsuites/vstf/vstf_scripts/__init__.py
diff --git a/vstf/etc/vstf/amqp/amqp.ini b/testsuites/vstf/vstf_scripts/etc/vstf/amqp/amqp.ini
index 8f355e68..8f355e68 100644
--- a/vstf/etc/vstf/amqp/amqp.ini
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/amqp/amqp.ini
diff --git a/vstf/etc/vstf/default/reporters.html-settings b/testsuites/vstf/vstf_scripts/etc/vstf/default/reporters.html-settings
index de75f70b..de75f70b 100644
--- a/vstf/etc/vstf/default/reporters.html-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/default/reporters.html-settings
diff --git a/vstf/etc/vstf/default/reporters.mail.mail-settings b/testsuites/vstf/vstf_scripts/etc/vstf/default/reporters.mail.mail-settings
index 89bbcb5f..89bbcb5f 100644
--- a/vstf/etc/vstf/default/reporters.mail.mail-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/default/reporters.mail.mail-settings
diff --git a/vstf/etc/vstf/default/sw_perf.tool-settings b/testsuites/vstf/vstf_scripts/etc/vstf/default/sw_perf.tool-settings
index e72a0bc2..e72a0bc2 100644
--- a/vstf/etc/vstf/default/sw_perf.tool-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/default/sw_perf.tool-settings
diff --git a/vstf/etc/vstf/env/Ti.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Ti.json
index d122ddde..d122ddde 100644
--- a/vstf/etc/vstf/env/Ti.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Ti.json
diff --git a/vstf/etc/vstf/env/Tn.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tn.json
index f731457e..f731457e 100644
--- a/vstf/etc/vstf/env/Tn.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tn.json
diff --git a/vstf/etc/vstf/env/Tnv.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tnv.json
index 3697dbbf..3697dbbf 100644
--- a/vstf/etc/vstf/env/Tnv.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tnv.json
diff --git a/vstf/etc/vstf/env/Tu.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tu.json
index 95bb81fc..95bb81fc 100644
--- a/vstf/etc/vstf/env/Tu.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/Tu.json
diff --git a/vstf/etc/vstf/env/eth2eth.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/eth2eth.json
index 5662ae15..5662ae15 100644
--- a/vstf/etc/vstf/env/eth2eth.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/eth2eth.json
diff --git a/vstf/etc/vstf/env/images.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/images.json
index a1c187cd..a1c187cd 100644
--- a/vstf/etc/vstf/env/images.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/images.json
diff --git a/vstf/etc/vstf/env/src.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/src.json
index 391b084c..391b084c 100644
--- a/vstf/etc/vstf/env/src.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/src.json
diff --git a/vstf/etc/vstf/env/tester.json b/testsuites/vstf/vstf_scripts/etc/vstf/env/tester.json
index 213658df..213658df 100644
--- a/vstf/etc/vstf/env/tester.json
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/env/tester.json
diff --git a/vstf/etc/vstf/perf/sw_perf.batch-settings b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.batch-settings
index 83c6970d..83c6970d 100644
--- a/vstf/etc/vstf/perf/sw_perf.batch-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.batch-settings
diff --git a/vstf/etc/vstf/perf/sw_perf.cpu-settings b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.cpu-settings
index 77b9304c..77b9304c 100644
--- a/vstf/etc/vstf/perf/sw_perf.cpu-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.cpu-settings
diff --git a/vstf/etc/vstf/perf/sw_perf.device-settings b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.device-settings
index e0dac25a..e0dac25a 100644
--- a/vstf/etc/vstf/perf/sw_perf.device-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.device-settings
diff --git a/vstf/etc/vstf/perf/sw_perf.flownodes-settings b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.flownodes-settings
index c9cc75b7..c9cc75b7 100644
--- a/vstf/etc/vstf/perf/sw_perf.flownodes-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.flownodes-settings
diff --git a/vstf/etc/vstf/perf/sw_perf.forwarding-settings b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.forwarding-settings
index 17f66434..17f66434 100644
--- a/vstf/etc/vstf/perf/sw_perf.forwarding-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/perf/sw_perf.forwarding-settings
diff --git a/vstf/etc/vstf/reporter/reporters.template-settings b/testsuites/vstf/vstf_scripts/etc/vstf/reporter/reporters.template-settings
index f0e4a29e..f0e4a29e 100644
--- a/vstf/etc/vstf/reporter/reporters.template-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/reporter/reporters.template-settings
diff --git a/vstf/etc/vstf/spirent/optimize.ini b/testsuites/vstf/vstf_scripts/etc/vstf/spirent/optimize.ini
index 23fefea7..23fefea7 100644
--- a/vstf/etc/vstf/spirent/optimize.ini
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/spirent/optimize.ini
diff --git a/vstf/etc/vstf/spirent/strategy.ini b/testsuites/vstf/vstf_scripts/etc/vstf/spirent/strategy.ini
index 08731505..08731505 100644
--- a/vstf/etc/vstf/spirent/strategy.ini
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/spirent/strategy.ini
diff --git a/vstf/etc/vstf/user/reporters.html-settings b/testsuites/vstf/vstf_scripts/etc/vstf/user/reporters.html-settings
index deaa69b8..deaa69b8 100644
--- a/vstf/etc/vstf/user/reporters.html-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/user/reporters.html-settings
diff --git a/vstf/etc/vstf/user/reporters.mail.mail-settings b/testsuites/vstf/vstf_scripts/etc/vstf/user/reporters.mail.mail-settings
index e5c7b44f..e5c7b44f 100644
--- a/vstf/etc/vstf/user/reporters.mail.mail-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/user/reporters.mail.mail-settings
diff --git a/vstf/etc/vstf/user/sw_perf.tool-settings b/testsuites/vstf/vstf_scripts/etc/vstf/user/sw_perf.tool-settings
index 2c63c085..2c63c085 100644
--- a/vstf/etc/vstf/user/sw_perf.tool-settings
+++ b/testsuites/vstf/vstf_scripts/etc/vstf/user/sw_perf.tool-settings
diff --git a/vstf/install.sh b/testsuites/vstf/vstf_scripts/install.sh
index 4a63a1e1..4a63a1e1 100644
--- a/vstf/install.sh
+++ b/testsuites/vstf/vstf_scripts/install.sh
diff --git a/vstf/pylint.conf b/testsuites/vstf/vstf_scripts/pylint.conf
index 6514d3c6..6514d3c6 100644
--- a/vstf/pylint.conf
+++ b/testsuites/vstf/vstf_scripts/pylint.conf
diff --git a/vstf/requirements.txt b/testsuites/vstf/vstf_scripts/requirements.txt
index 3d7e8037..3d7e8037 100644
--- a/vstf/requirements.txt
+++ b/testsuites/vstf/vstf_scripts/requirements.txt
diff --git a/vstf/setup.cfg b/testsuites/vstf/vstf_scripts/setup.cfg
index 923f9f7a..923f9f7a 100644
--- a/vstf/setup.cfg
+++ b/testsuites/vstf/vstf_scripts/setup.cfg
diff --git a/vstf/setup.py b/testsuites/vstf/vstf_scripts/setup.py
index bdecb375..bdecb375 100644
--- a/vstf/setup.py
+++ b/testsuites/vstf/vstf_scripts/setup.py
diff --git a/vstf/vstf/__init__.py b/testsuites/vstf/vstf_scripts/vstf/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/__init__.py
diff --git a/vstf/vstf/agent/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/agent/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/__init__.py
diff --git a/vstf/vstf/agent/agent.py b/testsuites/vstf/vstf_scripts/vstf/agent/agent.py
index b5745995..b5745995 100644
--- a/vstf/vstf/agent/agent.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/agent.py
diff --git a/vstf/vstf/agent/env/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/agent/env/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/__init__.py
diff --git a/vstf/vstf/agent/env/basic/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/agent/env/basic/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/__init__.py
diff --git a/vstf/vstf/agent/env/basic/collect.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/collect.py
index 126a7d55..126a7d55 100644
--- a/vstf/vstf/agent/env/basic/collect.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/collect.py
diff --git a/vstf/vstf/agent/env/basic/commandline.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/commandline.py
index e4df9b27..e4df9b27 100644
--- a/vstf/vstf/agent/env/basic/commandline.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/commandline.py
diff --git a/vstf/vstf/agent/env/basic/device_manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/device_manager.py
index 8b5387fe..8b5387fe 100644
--- a/vstf/vstf/agent/env/basic/device_manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/device_manager.py
diff --git a/vstf/vstf/agent/env/basic/image_manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/image_manager.py
index c3b5c6b3..c3b5c6b3 100644
--- a/vstf/vstf/agent/env/basic/image_manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/image_manager.py
diff --git a/vstf/vstf/agent/env/basic/source_manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/source_manager.py
index 6edd14ca..6edd14ca 100644
--- a/vstf/vstf/agent/env/basic/source_manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/source_manager.py
diff --git a/vstf/vstf/agent/env/basic/vm9pfs.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm9pfs.py
index 7364f8b2..7364f8b2 100644
--- a/vstf/vstf/agent/env/basic/vm9pfs.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm9pfs.py
diff --git a/vstf/vstf/agent/env/basic/vm_manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm_manager.py
index 60a3b37b..60a3b37b 100644
--- a/vstf/vstf/agent/env/basic/vm_manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm_manager.py
diff --git a/vstf/vstf/agent/env/basic/vm_xml_help.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm_xml_help.py
index 6f9131e7..6f9131e7 100644
--- a/vstf/vstf/agent/env/basic/vm_xml_help.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/basic/vm_xml_help.py
diff --git a/vstf/vstf/agent/env/builder.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/builder.py
index a66a8873..a66a8873 100644
--- a/vstf/vstf/agent/env/builder.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/builder.py
diff --git a/vstf/vstf/agent/env/driver_plugins/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/__init__.py
index fc9802be..fc9802be 100644
--- a/vstf/vstf/agent/env/driver_plugins/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/__init__.py
diff --git a/vstf/vstf/agent/env/driver_plugins/manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/manager.py
index 6f895656..6f895656 100644
--- a/vstf/vstf/agent/env/driver_plugins/manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/manager.py
diff --git a/vstf/vstf/agent/env/driver_plugins/model.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/model.py
index ddc07449..ddc07449 100644
--- a/vstf/vstf/agent/env/driver_plugins/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/model.py
diff --git a/vstf/vstf/agent/env/driver_plugins/origin_driver.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/origin_driver.py
index bf3c15c8..bf3c15c8 100644
--- a/vstf/vstf/agent/env/driver_plugins/origin_driver.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/driver_plugins/origin_driver.py
diff --git a/vstf/vstf/agent/env/fsmonitor/FSMonitor.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/FSMonitor.py
index e6559362..e6559362 100644
--- a/vstf/vstf/agent/env/fsmonitor/FSMonitor.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/FSMonitor.py
diff --git a/vstf/vstf/agent/env/fsmonitor/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/agent/env/fsmonitor/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/__init__.py
diff --git a/vstf/vstf/agent/env/fsmonitor/constant.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/constant.py
index 33b37eb4..33b37eb4 100644
--- a/vstf/vstf/agent/env/fsmonitor/constant.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/constant.py
diff --git a/vstf/vstf/agent/env/fsmonitor/utils.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/utils.py
index 5bdb4159..5bdb4159 100644
--- a/vstf/vstf/agent/env/fsmonitor/utils.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/fsmonitor/utils.py
diff --git a/vstf/vstf/agent/env/plugins/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/agent/env/plugins/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/__init__.py
diff --git a/vstf/vstf/agent/env/plugins/libvirt_plugin.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/libvirt_plugin.py
index 27af8063..27af8063 100644
--- a/vstf/vstf/agent/env/plugins/libvirt_plugin.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/libvirt_plugin.py
diff --git a/vstf/vstf/agent/env/plugins/model.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/model.py
index b19ceb96..b19ceb96 100644
--- a/vstf/vstf/agent/env/plugins/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/model.py
diff --git a/vstf/vstf/agent/env/plugins/tester_env_plugin.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/tester_env_plugin.py
index 0682aac8..0682aac8 100644
--- a/vstf/vstf/agent/env/plugins/tester_env_plugin.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/plugins/tester_env_plugin.py
diff --git a/vstf/vstf/agent/env/vswitch_plugins/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/agent/env/vswitch_plugins/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/__init__.py
diff --git a/vstf/vstf/agent/env/vswitch_plugins/bridge_plugin.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/bridge_plugin.py
index 21b8f82c..21b8f82c 100644
--- a/vstf/vstf/agent/env/vswitch_plugins/bridge_plugin.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/bridge_plugin.py
diff --git a/vstf/vstf/agent/env/vswitch_plugins/manager.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/manager.py
index 785a1db8..785a1db8 100644
--- a/vstf/vstf/agent/env/vswitch_plugins/manager.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/manager.py
diff --git a/vstf/vstf/agent/env/vswitch_plugins/model.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/model.py
index 5d700411..5d700411 100644
--- a/vstf/vstf/agent/env/vswitch_plugins/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/model.py
diff --git a/vstf/vstf/agent/env/vswitch_plugins/ovs_plugin.py b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/ovs_plugin.py
index 7ea56d4a..7ea56d4a 100644
--- a/vstf/vstf/agent/env/vswitch_plugins/ovs_plugin.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/env/vswitch_plugins/ovs_plugin.py
diff --git a/vstf/vstf/agent/equalizer/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/agent/equalizer/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/__init__.py
diff --git a/vstf/vstf/agent/equalizer/equalizer.py b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/equalizer.py
index 30e1de1f..30e1de1f 100644
--- a/vstf/vstf/agent/equalizer/equalizer.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/equalizer.py
diff --git a/vstf/vstf/agent/equalizer/get_info.py b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/get_info.py
index 0c92f979..0c92f979 100644
--- a/vstf/vstf/agent/equalizer/get_info.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/get_info.py
diff --git a/vstf/vstf/agent/equalizer/optimize.py b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/optimize.py
index 5a09900d..5a09900d 100644
--- a/vstf/vstf/agent/equalizer/optimize.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/equalizer/optimize.py
diff --git a/vstf/vstf/agent/perf/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/agent/perf/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/__init__.py
diff --git a/vstf/vstf/agent/perf/affctl.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/affctl.py
index 5b203632..5b203632 100644
--- a/vstf/vstf/agent/perf/affctl.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/affctl.py
diff --git a/vstf/vstf/agent/perf/ethtool.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/ethtool.py
index 3f4a3728..3f4a3728 100644
--- a/vstf/vstf/agent/perf/ethtool.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/ethtool.py
diff --git a/vstf/vstf/agent/perf/iperf.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/iperf.py
index 3105be4b..3105be4b 100644
--- a/vstf/vstf/agent/perf/iperf.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/iperf.py
diff --git a/vstf/vstf/agent/perf/netmap.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netmap.py
index 88a25444..88a25444 100644
--- a/vstf/vstf/agent/perf/netmap.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netmap.py
diff --git a/vstf/vstf/agent/perf/netns.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netns.py
index c3b73860..c3b73860 100644
--- a/vstf/vstf/agent/perf/netns.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netns.py
diff --git a/vstf/vstf/agent/perf/netperf.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netperf.py
index 99f1c904..99f1c904 100644
--- a/vstf/vstf/agent/perf/netperf.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/netperf.py
diff --git a/vstf/vstf/agent/perf/pktgen.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/pktgen.py
index 671e1aa7..671e1aa7 100644
--- a/vstf/vstf/agent/perf/pktgen.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/pktgen.py
diff --git a/vstf/vstf/agent/perf/qperf.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/qperf.py
index afdf44d7..afdf44d7 100644
--- a/vstf/vstf/agent/perf/qperf.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/qperf.py
diff --git a/vstf/vstf/agent/perf/sar.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/sar.py
index 0231d5c1..0231d5c1 100644
--- a/vstf/vstf/agent/perf/sar.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/sar.py
diff --git a/vstf/vstf/agent/perf/utils.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/utils.py
index 4f7ddb6a..4f7ddb6a 100644
--- a/vstf/vstf/agent/perf/utils.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/utils.py
diff --git a/vstf/vstf/agent/perf/vnstat.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/vnstat.py
index b12ac1af..b12ac1af 100644
--- a/vstf/vstf/agent/perf/vnstat.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/vnstat.py
diff --git a/vstf/vstf/agent/perf/vstfperf.py b/testsuites/vstf/vstf_scripts/vstf/agent/perf/vstfperf.py
index 8be3c4e5..8be3c4e5 100644
--- a/vstf/vstf/agent/perf/vstfperf.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/perf/vstfperf.py
diff --git a/vstf/vstf/agent/softagent.py b/testsuites/vstf/vstf_scripts/vstf/agent/softagent.py
index 6271a097..6271a097 100644
--- a/vstf/vstf/agent/softagent.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/softagent.py
diff --git a/vstf/vstf/agent/spirent/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/agent/spirent/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/__init__.py
diff --git a/vstf/vstf/agent/spirent/spirent.py b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/spirent.py
index 904de736..904de736 100644
--- a/vstf/vstf/agent/spirent/spirent.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/spirent.py
diff --git a/vstf/vstf/agent/spirent/tools.py b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/tools.py
index 088a7b13..088a7b13 100644
--- a/vstf/vstf/agent/spirent/tools.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/spirent/tools.py
diff --git a/vstf/vstf/agent/spirentagent.py b/testsuites/vstf/vstf_scripts/vstf/agent/spirentagent.py
index 8951f96d..8951f96d 100644
--- a/vstf/vstf/agent/spirentagent.py
+++ b/testsuites/vstf/vstf_scripts/vstf/agent/spirentagent.py
diff --git a/vstf/vstf/common/__init__.py b/testsuites/vstf/vstf_scripts/vstf/common/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/common/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/__init__.py
diff --git a/vstf/vstf/common/candy_text.py b/testsuites/vstf/vstf_scripts/vstf/common/candy_text.py
index 818ae767..818ae767 100644
--- a/vstf/vstf/common/candy_text.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/candy_text.py
diff --git a/vstf/vstf/common/cfgparser.py b/testsuites/vstf/vstf_scripts/vstf/common/cfgparser.py
index 9de5a2cd..9de5a2cd 100644
--- a/vstf/vstf/common/cfgparser.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/cfgparser.py
diff --git a/vstf/vstf/common/check.py b/testsuites/vstf/vstf_scripts/vstf/common/check.py
index 2ceddc04..2ceddc04 100644
--- a/vstf/vstf/common/check.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/check.py
diff --git a/vstf/vstf/common/cliutil.py b/testsuites/vstf/vstf_scripts/vstf/common/cliutil.py
index 541bba7b..541bba7b 100644
--- a/vstf/vstf/common/cliutil.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/cliutil.py
diff --git a/vstf/vstf/common/cmds.py b/testsuites/vstf/vstf_scripts/vstf/common/cmds.py
index 2952be2c..2952be2c 100644
--- a/vstf/vstf/common/cmds.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/cmds.py
diff --git a/vstf/vstf/common/constants.py b/testsuites/vstf/vstf_scripts/vstf/common/constants.py
index e054043e..e054043e 100644
--- a/vstf/vstf/common/constants.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/constants.py
diff --git a/vstf/vstf/common/daemon.py b/testsuites/vstf/vstf_scripts/vstf/common/daemon.py
index 35933dad..35933dad 100644
--- a/vstf/vstf/common/daemon.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/daemon.py
diff --git a/vstf/vstf/common/decorator.py b/testsuites/vstf/vstf_scripts/vstf/common/decorator.py
index 98d539f1..98d539f1 100644
--- a/vstf/vstf/common/decorator.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/decorator.py
diff --git a/vstf/vstf/common/excepts.py b/testsuites/vstf/vstf_scripts/vstf/common/excepts.py
index 833eefa4..833eefa4 100644
--- a/vstf/vstf/common/excepts.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/excepts.py
diff --git a/vstf/vstf/common/input.py b/testsuites/vstf/vstf_scripts/vstf/common/input.py
index 14ec8552..14ec8552 100644
--- a/vstf/vstf/common/input.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/input.py
diff --git a/vstf/vstf/common/log.py b/testsuites/vstf/vstf_scripts/vstf/common/log.py
index 415b003a..415b003a 100644
--- a/vstf/vstf/common/log.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/log.py
diff --git a/vstf/vstf/common/message.py b/testsuites/vstf/vstf_scripts/vstf/common/message.py
index d496990d..d496990d 100644
--- a/vstf/vstf/common/message.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/message.py
diff --git a/vstf/vstf/common/perfmark.py b/testsuites/vstf/vstf_scripts/vstf/common/perfmark.py
index 4f5c3978..4f5c3978 100644
--- a/vstf/vstf/common/perfmark.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/perfmark.py
diff --git a/vstf/vstf/common/pyhtml.py b/testsuites/vstf/vstf_scripts/vstf/common/pyhtml.py
index f3adee8d..f3adee8d 100644
--- a/vstf/vstf/common/pyhtml.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/pyhtml.py
diff --git a/vstf/vstf/common/rsync.py b/testsuites/vstf/vstf_scripts/vstf/common/rsync.py
index 2209dfd3..2209dfd3 100644
--- a/vstf/vstf/common/rsync.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/rsync.py
diff --git a/vstf/vstf/common/saltstack.py b/testsuites/vstf/vstf_scripts/vstf/common/saltstack.py
index 030bef5d..030bef5d 100644
--- a/vstf/vstf/common/saltstack.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/saltstack.py
diff --git a/vstf/vstf/common/ssh.py b/testsuites/vstf/vstf_scripts/vstf/common/ssh.py
index 7b85e086..7b85e086 100644
--- a/vstf/vstf/common/ssh.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/ssh.py
diff --git a/vstf/vstf/common/test_func.py b/testsuites/vstf/vstf_scripts/vstf/common/test_func.py
index 2a9a4c0d..2a9a4c0d 100644
--- a/vstf/vstf/common/test_func.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/test_func.py
diff --git a/vstf/vstf/common/unix.py b/testsuites/vstf/vstf_scripts/vstf/common/unix.py
index 97582c74..97582c74 100644
--- a/vstf/vstf/common/unix.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/unix.py
diff --git a/vstf/vstf/common/utils.py b/testsuites/vstf/vstf_scripts/vstf/common/utils.py
index f2e14096..f2e14096 100644
--- a/vstf/vstf/common/utils.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/utils.py
diff --git a/vstf/vstf/common/vstfcli.py b/testsuites/vstf/vstf_scripts/vstf/common/vstfcli.py
index 896bb1d6..896bb1d6 100644
--- a/vstf/vstf/common/vstfcli.py
+++ b/testsuites/vstf/vstf_scripts/vstf/common/vstfcli.py
diff --git a/vstf/vstf/controller/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/__init__.py
diff --git a/vstf/vstf/controller/api_server.py b/testsuites/vstf/vstf_scripts/vstf/controller/api_server.py
index a37bf4c1..a37bf4c1 100644
--- a/vstf/vstf/controller/api_server.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/api_server.py
diff --git a/vstf/vstf/controller/database/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/database/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/database/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/database/__init__.py
diff --git a/vstf/vstf/controller/database/constants.py b/testsuites/vstf/vstf_scripts/vstf/controller/database/constants.py
index e5070122..e5070122 100644
--- a/vstf/vstf/controller/database/constants.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/database/constants.py
diff --git a/vstf/vstf/controller/database/dbinterface.py b/testsuites/vstf/vstf_scripts/vstf/controller/database/dbinterface.py
index 410e1ee5..410e1ee5 100644
--- a/vstf/vstf/controller/database/dbinterface.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/database/dbinterface.py
diff --git a/vstf/vstf/controller/database/tables.py b/testsuites/vstf/vstf_scripts/vstf/controller/database/tables.py
index 55b02e5f..55b02e5f 100644
--- a/vstf/vstf/controller/database/tables.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/database/tables.py
diff --git a/vstf/vstf/controller/env_build/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/controller/env_build/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/__init__.py
diff --git a/vstf/vstf/controller/env_build/cfg_intent_parse.py b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/cfg_intent_parse.py
index b536e3b8..b536e3b8 100644
--- a/vstf/vstf/controller/env_build/cfg_intent_parse.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/cfg_intent_parse.py
diff --git a/vstf/vstf/controller/env_build/env_build.py b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/env_build.py
index 1d201b77..1d201b77 100644
--- a/vstf/vstf/controller/env_build/env_build.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/env_build.py
diff --git a/vstf/vstf/controller/env_build/env_collect.py b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/env_collect.py
index 6e32a05d..6e32a05d 100644
--- a/vstf/vstf/controller/env_build/env_collect.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/env_build/env_collect.py
diff --git a/vstf/vstf/controller/fabricant.py b/testsuites/vstf/vstf_scripts/vstf/controller/fabricant.py
index 3b1c082f..3b1c082f 100644
--- a/vstf/vstf/controller/fabricant.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/fabricant.py
diff --git a/vstf/vstf/controller/reporters/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/reporters/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/__init__.py
diff --git a/vstf/vstf/controller/reporters/mail/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/reporters/mail/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/__init__.py
diff --git a/vstf/vstf/controller/reporters/mail/mail.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/mail.py
index 6792ad91..6792ad91 100644
--- a/vstf/vstf/controller/reporters/mail/mail.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/mail.py
diff --git a/vstf/vstf/controller/reporters/mail/sendmail.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/sendmail.py
index a4d7bb0a..a4d7bb0a 100644
--- a/vstf/vstf/controller/reporters/mail/sendmail.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/mail/sendmail.py
diff --git a/vstf/vstf/controller/reporters/report/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/__init__.py
index 547db686..547db686 100644
--- a/vstf/vstf/controller/reporters/report/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/__init__.py
diff --git a/vstf/vstf/controller/reporters/report/candy_generator.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/candy_generator.py
index ea296550..ea296550 100644
--- a/vstf/vstf/controller/reporters/report/candy_generator.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/candy_generator.py
diff --git a/vstf/vstf/controller/reporters/report/data_factory.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/data_factory.py
index f9fc69d9..f9fc69d9 100644
--- a/vstf/vstf/controller/reporters/report/data_factory.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/data_factory.py
diff --git a/vstf/vstf/controller/reporters/report/html/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/reporters/report/html/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/__init__.py
diff --git a/vstf/vstf/controller/reporters/report/html/html_base.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/html_base.py
index 5769da79..5769da79 100644
--- a/vstf/vstf/controller/reporters/report/html/html_base.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/html_base.py
diff --git a/vstf/vstf/controller/reporters/report/html/htmlcreator.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/htmlcreator.py
index 695ea37f..695ea37f 100644
--- a/vstf/vstf/controller/reporters/report/html/htmlcreator.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/html/htmlcreator.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/reporters/report/pdf/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/__init__.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/element.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/element.py
index ef8b54df..ef8b54df 100644
--- a/vstf/vstf/controller/reporters/report/pdf/element.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/element.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/pdfcreator.py
index c33974ec..c33974ec 100644
--- a/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/pdfcreator.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/pdftemplate.py
index 69c65401..69c65401 100644
--- a/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/pdftemplate.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/story.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/story.py
index 940c20fb..940c20fb 100644
--- a/vstf/vstf/controller/reporters/report/pdf/story.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/story.py
diff --git a/vstf/vstf/controller/reporters/report/pdf/styles.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/styles.py
index 2860c245..2860c245 100644
--- a/vstf/vstf/controller/reporters/report/pdf/styles.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/pdf/styles.py
diff --git a/vstf/vstf/controller/reporters/report/provider/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/controller/reporters/report/provider/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/__init__.py
diff --git a/vstf/vstf/controller/reporters/report/provider/html_provider.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/html_provider.py
index 74c4c593..74c4c593 100644
--- a/vstf/vstf/controller/reporters/report/provider/html_provider.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/html_provider.py
diff --git a/vstf/vstf/controller/reporters/report/provider/pdf_provider.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/pdf_provider.py
index e1cb09ef..e1cb09ef 100644
--- a/vstf/vstf/controller/reporters/report/provider/pdf_provider.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/report/provider/pdf_provider.py
diff --git a/vstf/vstf/controller/reporters/reporter.py b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/reporter.py
index 654c9b83..654c9b83 100644
--- a/vstf/vstf/controller/reporters/reporter.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/reporters/reporter.py
diff --git a/vstf/vstf/controller/res/Traffic-types.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/Traffic-types.gif
index 4b1fc600..4b1fc600 100644
--- a/vstf/vstf/controller/res/Traffic-types.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/Traffic-types.gif
diff --git a/vstf/vstf/controller/res/Traffic-types.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/Traffic-types.jpg
index 07f23300..07f23300 100644
--- a/vstf/vstf/controller/res/Traffic-types.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/Traffic-types.jpg
diff --git a/vstf/vstf/controller/res/deployment/Ti-direct.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti-direct.gif
index c06a222b..c06a222b 100644
--- a/vstf/vstf/controller/res/deployment/Ti-direct.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti-direct.gif
diff --git a/vstf/vstf/controller/res/deployment/Ti-direct.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti-direct.jpg
index edb25cad..edb25cad 100644
--- a/vstf/vstf/controller/res/deployment/Ti-direct.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti-direct.jpg
diff --git a/vstf/vstf/controller/res/deployment/Ti.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti.gif
index 56ada3f6..56ada3f6 100644
--- a/vstf/vstf/controller/res/deployment/Ti.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti.gif
diff --git a/vstf/vstf/controller/res/deployment/Ti.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti.jpg
index 951b1c09..951b1c09 100644
--- a/vstf/vstf/controller/res/deployment/Ti.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Ti.jpg
diff --git a/vstf/vstf/controller/res/deployment/Tn.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tn.gif
index 4367ded0..4367ded0 100644
--- a/vstf/vstf/controller/res/deployment/Tn.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tn.gif
diff --git a/vstf/vstf/controller/res/deployment/Tn.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tn.jpg
index 45a17048..45a17048 100644
--- a/vstf/vstf/controller/res/deployment/Tn.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tn.jpg
diff --git a/vstf/vstf/controller/res/deployment/Tnv.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tnv.gif
index dfc0bd58..dfc0bd58 100644
--- a/vstf/vstf/controller/res/deployment/Tnv.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tnv.gif
diff --git a/vstf/vstf/controller/res/deployment/Tnv.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tnv.jpg
index fb47d8a3..fb47d8a3 100644
--- a/vstf/vstf/controller/res/deployment/Tnv.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tnv.jpg
diff --git a/vstf/vstf/controller/res/deployment/Tu.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tu.gif
index 426667ed..426667ed 100644
--- a/vstf/vstf/controller/res/deployment/Tu.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tu.gif
diff --git a/vstf/vstf/controller/res/deployment/Tu.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tu.jpg
index be62df75..be62df75 100644
--- a/vstf/vstf/controller/res/deployment/Tu.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/deployment/Tu.jpg
diff --git a/vstf/vstf/controller/res/iperf/Ti-3.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/iperf/Ti-3.gif
index e09094a2..e09094a2 100644
--- a/vstf/vstf/controller/res/iperf/Ti-3.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/iperf/Ti-3.gif
diff --git a/vstf/vstf/controller/res/iperf/Ti-3.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/iperf/Ti-3.jpg
index cdf75271..cdf75271 100644
--- a/vstf/vstf/controller/res/iperf/Ti-3.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/iperf/Ti-3.jpg
diff --git a/vstf/vstf/controller/res/logo.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/logo.jpg
index 9d524829..9d524829 100644
--- a/vstf/vstf/controller/res/logo.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/logo.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Ti-1.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-1.gif
index ed9e44ac..ed9e44ac 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-1.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-1.gif
diff --git a/vstf/vstf/controller/res/pktgen/Ti-1.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-1.jpg
index 5898769f..5898769f 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-1.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-1.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Ti-2.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-2.gif
index 59359b13..59359b13 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-2.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-2.gif
diff --git a/vstf/vstf/controller/res/pktgen/Ti-2.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-2.jpg
index ea4b2620..ea4b2620 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-2.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-2.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-1.gif
index 57b148c6..57b148c6 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-1.gif
diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-1.jpg
index 1255dc8e..1255dc8e 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-1.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-2.gif
index 43e58fbc..43e58fbc 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-2.gif
diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-2.jpg
index 898d68ee..898d68ee 100644
--- a/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Ti-direct-2.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tn-1.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1.gif
index 74407a94..74407a94 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-1.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tn-1.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1.jpg
index f3ea6e53..f3ea6e53 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-1.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tn-1v.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1v.gif
index 18681bbe..18681bbe 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-1v.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1v.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tn-1v.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1v.jpg
index 59d4ed5c..59d4ed5c 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-1v.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-1v.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tn-2.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2.gif
index e26db799..e26db799 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-2.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tn-2.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2.jpg
index 15ed91e3..15ed91e3 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-2.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tn-2v.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2v.gif
index 9ec54578..9ec54578 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-2v.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2v.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tn-2v.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2v.jpg
index 2ff06ea6..2ff06ea6 100644
--- a/vstf/vstf/controller/res/pktgen/Tn-2v.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tn-2v.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tu-1.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-1.gif
index 9f2357ad..9f2357ad 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-1.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-1.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tu-1.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-1.jpg
index ad2724a1..ad2724a1 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-1.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-1.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tu-2.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-2.gif
index b0a2cede..b0a2cede 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-2.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-2.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tu-2.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-2.jpg
index d47089b7..d47089b7 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-2.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-2.jpg
diff --git a/vstf/vstf/controller/res/pktgen/Tu-3.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-3.gif
index e0b15211..e0b15211 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-3.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-3.gif
diff --git a/vstf/vstf/controller/res/pktgen/Tu-3.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-3.jpg
index 579808c4..579808c4 100644
--- a/vstf/vstf/controller/res/pktgen/Tu-3.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/pktgen/Tu-3.jpg
diff --git a/vstf/vstf/controller/res/spirent/Tn-1.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1.gif
index 97510da0..97510da0 100644
--- a/vstf/vstf/controller/res/spirent/Tn-1.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1.gif
diff --git a/vstf/vstf/controller/res/spirent/Tn-1.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1.jpg
index 6886d316..6886d316 100644
--- a/vstf/vstf/controller/res/spirent/Tn-1.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1.jpg
diff --git a/vstf/vstf/controller/res/spirent/Tn-1v.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1v.gif
index cb7b668b..cb7b668b 100644
--- a/vstf/vstf/controller/res/spirent/Tn-1v.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1v.gif
diff --git a/vstf/vstf/controller/res/spirent/Tn-1v.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1v.jpg
index 3dec4382..3dec4382 100644
--- a/vstf/vstf/controller/res/spirent/Tn-1v.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-1v.jpg
diff --git a/vstf/vstf/controller/res/spirent/Tn-2.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2.gif
index 4eb6780a..4eb6780a 100644
--- a/vstf/vstf/controller/res/spirent/Tn-2.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2.gif
diff --git a/vstf/vstf/controller/res/spirent/Tn-2.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2.jpg
index 9d425af2..9d425af2 100644
--- a/vstf/vstf/controller/res/spirent/Tn-2.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2.jpg
diff --git a/vstf/vstf/controller/res/spirent/Tn-2v.gif b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2v.gif
index 21e31470..21e31470 100644
--- a/vstf/vstf/controller/res/spirent/Tn-2v.gif
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2v.gif
diff --git a/vstf/vstf/controller/res/spirent/Tn-2v.jpg b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2v.jpg
index 40a38292..40a38292 100644
--- a/vstf/vstf/controller/res/spirent/Tn-2v.jpg
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/res/spirent/Tn-2v.jpg
diff --git a/vstf/vstf/controller/settings/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/__init__.py
index 83b8d15d..83b8d15d 100644
--- a/vstf/vstf/controller/settings/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/__init__.py
diff --git a/vstf/vstf/controller/settings/cpu_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py
index a25af4c1..a25af4c1 100644
--- a/vstf/vstf/controller/settings/cpu_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/cpu_settings.py
diff --git a/vstf/vstf/controller/settings/device_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py
index 25f2c5bf..25f2c5bf 100644
--- a/vstf/vstf/controller/settings/device_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/device_settings.py
diff --git a/vstf/vstf/controller/settings/flows_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py
index 9cd1a1b7..9cd1a1b7 100644
--- a/vstf/vstf/controller/settings/flows_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/flows_settings.py
diff --git a/vstf/vstf/controller/settings/forwarding_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py
index 636ddfda..636ddfda 100644
--- a/vstf/vstf/controller/settings/forwarding_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/forwarding_settings.py
diff --git a/vstf/vstf/controller/settings/html_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py
index ce87733e..ce87733e 100644
--- a/vstf/vstf/controller/settings/html_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/html_settings.py
diff --git a/vstf/vstf/controller/settings/mail_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py
index db01097f..db01097f 100644
--- a/vstf/vstf/controller/settings/mail_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/mail_settings.py
diff --git a/vstf/vstf/controller/settings/perf_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py
index 610cb4ae..610cb4ae 100644
--- a/vstf/vstf/controller/settings/perf_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/perf_settings.py
diff --git a/vstf/vstf/controller/settings/settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py
index 2c712bb2..2c712bb2 100644
--- a/vstf/vstf/controller/settings/settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings.py
diff --git a/vstf/vstf/controller/settings/settings_input.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings_input.py
index 59652ed5..59652ed5 100644
--- a/vstf/vstf/controller/settings/settings_input.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/settings_input.py
diff --git a/vstf/vstf/controller/settings/template_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py
index b677c539..b677c539 100644
--- a/vstf/vstf/controller/settings/template_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/template_settings.py
diff --git a/vstf/vstf/controller/settings/tester_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py
index 554c8042..554c8042 100644
--- a/vstf/vstf/controller/settings/tester_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tester_settings.py
diff --git a/vstf/vstf/controller/settings/tool_settings.py b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py
index a84bc59f..a84bc59f 100644
--- a/vstf/vstf/controller/settings/tool_settings.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/settings/tool_settings.py
diff --git a/vstf/vstf/controller/spirent/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/spirent/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/__init__.py
diff --git a/vstf/vstf/controller/spirent/appliance.py b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/appliance.py
index d4c5be64..d4c5be64 100644
--- a/vstf/vstf/controller/spirent/appliance.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/appliance.py
diff --git a/vstf/vstf/controller/spirent/common/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/__init__.py
index c354d1f9..c354d1f9 100644
--- a/vstf/vstf/controller/spirent/common/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/__init__.py
diff --git a/vstf/vstf/controller/spirent/common/model.py b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/model.py
index a29794f4..a29794f4 100644
--- a/vstf/vstf/controller/spirent/common/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/model.py
diff --git a/vstf/vstf/controller/spirent/common/result_analysis.py b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/result_analysis.py
index b09a846d..b09a846d 100644
--- a/vstf/vstf/controller/spirent/common/result_analysis.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/spirent/common/result_analysis.py
diff --git a/vstf/vstf/controller/sw_perf/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/sw_perf/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/__init__.py
diff --git a/vstf/vstf/controller/sw_perf/flow_producer.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/flow_producer.py
index 4a3b02c2..4a3b02c2 100644
--- a/vstf/vstf/controller/sw_perf/flow_producer.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/flow_producer.py
diff --git a/vstf/vstf/controller/sw_perf/model.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/model.py
index c49df041..c49df041 100644
--- a/vstf/vstf/controller/sw_perf/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/model.py
diff --git a/vstf/vstf/controller/sw_perf/perf_provider.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/perf_provider.py
index 396e6eef..396e6eef 100644
--- a/vstf/vstf/controller/sw_perf/perf_provider.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/perf_provider.py
diff --git a/vstf/vstf/controller/sw_perf/performance.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/performance.py
index 3fe91e93..3fe91e93 100644
--- a/vstf/vstf/controller/sw_perf/performance.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/performance.py
diff --git a/vstf/vstf/controller/sw_perf/raw_data.py b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/raw_data.py
index aefb863d..aefb863d 100644
--- a/vstf/vstf/controller/sw_perf/raw_data.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/sw_perf/raw_data.py
diff --git a/vstf/vstf/controller/unittest/__init__.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/__init__.py
index df7d24d0..df7d24d0 100644
--- a/vstf/vstf/controller/unittest/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/__init__.py
diff --git a/vstf/vstf/controller/unittest/configuration.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/configuration.py
index 6312efa2..6312efa2 100644
--- a/vstf/vstf/controller/unittest/configuration.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/configuration.py
diff --git a/vstf/vstf/controller/unittest/model.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/model.py
index 4c38973e..4c38973e 100644
--- a/vstf/vstf/controller/unittest/model.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/model.py
diff --git a/vstf/vstf/controller/unittest/test_cfg_intent_parse.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_cfg_intent_parse.py
index a08607bb..a08607bb 100644
--- a/vstf/vstf/controller/unittest/test_cfg_intent_parse.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_cfg_intent_parse.py
diff --git a/vstf/vstf/controller/unittest/test_collect.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_collect.py
index 3e84d019..3e84d019 100644
--- a/vstf/vstf/controller/unittest/test_collect.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_collect.py
diff --git a/vstf/vstf/controller/unittest/test_driver_function.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_driver_function.py
index 8d45c7b3..8d45c7b3 100644
--- a/vstf/vstf/controller/unittest/test_driver_function.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_driver_function.py
diff --git a/vstf/vstf/controller/unittest/test_env_build.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_env_build.py
index e4529e48..e4529e48 100644
--- a/vstf/vstf/controller/unittest/test_env_build.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_env_build.py
diff --git a/vstf/vstf/controller/unittest/test_perf.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_perf.py
index 0258ab65..0258ab65 100644
--- a/vstf/vstf/controller/unittest/test_perf.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_perf.py
diff --git a/vstf/vstf/controller/unittest/test_ssh.py b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_ssh.py
index f2403551..f2403551 100644
--- a/vstf/vstf/controller/unittest/test_ssh.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/unittest/test_ssh.py
diff --git a/vstf/vstf/controller/vstfadm.py b/testsuites/vstf/vstf_scripts/vstf/controller/vstfadm.py
index 86641e7d..86641e7d 100644
--- a/vstf/vstf/controller/vstfadm.py
+++ b/testsuites/vstf/vstf_scripts/vstf/controller/vstfadm.py
diff --git a/vstf/vstf/rpc_frame_work/__init__.py b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/__init__.py
index 547db686..547db686 100644
--- a/vstf/vstf/rpc_frame_work/__init__.py
+++ b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/__init__.py
diff --git a/vstf/vstf/rpc_frame_work/constant.py b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/constant.py
index 84d0592a..84d0592a 100644
--- a/vstf/vstf/rpc_frame_work/constant.py
+++ b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/constant.py
diff --git a/vstf/vstf/rpc_frame_work/rpc_consumer.py b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/rpc_consumer.py
index fb54e5db..fb54e5db 100644
--- a/vstf/vstf/rpc_frame_work/rpc_consumer.py
+++ b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/rpc_consumer.py
diff --git a/vstf/vstf/rpc_frame_work/rpc_producer.py b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/rpc_producer.py
index abf2a7fc..abf2a7fc 100644
--- a/vstf/vstf/rpc_frame_work/rpc_producer.py
+++ b/testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/rpc_producer.py