adjust project directories

JIRA: BOTTLENECK-56

Change-Id: Ic9acad5eaa4917093bdb85a80960f796f5b4ba7f
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh
index d16d5ba..2eb3e16 100755 (executable)
--- 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 d22a885..8193651 100755 (executable)
--- 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 (executable)
index 3987262..0000000
--- 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
similarity index 92%
rename from ci/run_tests.sh
rename to run_tests.sh
index 0541e05..9ae89b1 100755 (executable)
--- 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/1-1-1.xml
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/mysql_conf/my.cnf
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/nsFile.txt
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/Makefile
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.properties
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/config.mk
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/cpu_mem.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsRW.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/run.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/sysstat_conf/CONFIG
rename to 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
similarity index 100%
rename from rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
rename to 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
similarity index 100%
rename from config/testcase_conf/rubbos/rubbos_1-1-1.yaml
rename to 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
similarity index 100%
rename from config/testcase_conf/rubbos/rubbos_1-2-1.yaml
rename to 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
similarity index 100%
rename from config/testcase_conf/vstf/tu1.yaml
rename to testsuites/rubbos/testcase_cfg/rubbos_1-2-1.yaml

diff --git a/config/testcase_conf/rubbos.yaml b/testsuites/rubbos/testsuite_story/rubbos_story1
similarity index 100%
rename from config/testcase_conf/rubbos.yaml
rename to 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 (executable)
index 0000000..40eb5f0
--- /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
similarity index 100%
rename from config/testcase_conf/vstf/tu3.yaml
rename to 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 (executable)
index 0000000..e69de29

diff --git a/testsuites/vstf/testsuite_story/vstf_story2 b/testsuites/vstf/testsuite_story/vstf_story2
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/vstf/README.rst b/testsuites/vstf/vstf_scripts/README.rst
similarity index 100%
rename from vstf/README.rst
rename to testsuites/vstf/vstf_scripts/README.rst

diff --git a/vstf/__init__.py b/testsuites/vstf/vstf_scripts/__init__.py
similarity index 100%
rename from vstf/__init__.py
rename to 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
similarity index 100%
rename from vstf/etc/vstf/amqp/amqp.ini
rename to 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
similarity index 100%
rename from vstf/etc/vstf/default/reporters.html-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/default/reporters.mail.mail-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/default/sw_perf.tool-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/Ti.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/Tn.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/Tnv.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/Tu.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/eth2eth.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/images.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/src.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/env/tester.json
rename to 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
similarity index 100%
rename from vstf/etc/vstf/perf/sw_perf.batch-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/perf/sw_perf.cpu-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/perf/sw_perf.device-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/perf/sw_perf.flownodes-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/perf/sw_perf.forwarding-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/reporter/reporters.template-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/spirent/optimize.ini
rename to 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
similarity index 100%
rename from vstf/etc/vstf/spirent/strategy.ini
rename to 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
similarity index 100%
rename from vstf/etc/vstf/user/reporters.html-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/user/reporters.mail.mail-settings
rename to 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
similarity index 100%
rename from vstf/etc/vstf/user/sw_perf.tool-settings
rename to testsuites/vstf/vstf_scripts/etc/vstf/user/sw_perf.tool-settings

diff --git a/vstf/install.sh b/testsuites/vstf/vstf_scripts/install.sh
similarity index 100%
rename from vstf/install.sh
rename to testsuites/vstf/vstf_scripts/install.sh

diff --git a/vstf/pylint.conf b/testsuites/vstf/vstf_scripts/pylint.conf
similarity index 100%
rename from vstf/pylint.conf
rename to testsuites/vstf/vstf_scripts/pylint.conf

diff --git a/vstf/requirements.txt b/testsuites/vstf/vstf_scripts/requirements.txt
similarity index 100%
rename from vstf/requirements.txt
rename to testsuites/vstf/vstf_scripts/requirements.txt

diff --git a/vstf/setup.cfg b/testsuites/vstf/vstf_scripts/setup.cfg
similarity index 100%
rename from vstf/setup.cfg
rename to testsuites/vstf/vstf_scripts/setup.cfg

diff --git a/vstf/setup.py b/testsuites/vstf/vstf_scripts/setup.py
similarity index 100%
rename from vstf/setup.py
rename to testsuites/vstf/vstf_scripts/setup.py

diff --git a/vstf/vstf/__init__.py b/testsuites/vstf/vstf_scripts/vstf/__init__.py
similarity index 100%
rename from vstf/vstf/__init__.py
rename to testsuites/vstf/vstf_scripts/vstf/__init__.py

diff --git a/vstf/vstf/agent/__init__.py b/testsuites/vstf/vstf_scripts/vstf/agent/__init__.py
similarity index 100%
rename from vstf/vstf/agent/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/agent.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/collect.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/commandline.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/device_manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/image_manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/source_manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/vm9pfs.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/vm_manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/basic/vm_xml_help.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/builder.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/driver_plugins/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/driver_plugins/manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/driver_plugins/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/driver_plugins/origin_driver.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/fsmonitor/FSMonitor.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/fsmonitor/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/fsmonitor/constant.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/fsmonitor/utils.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/plugins/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/plugins/libvirt_plugin.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/plugins/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/plugins/tester_env_plugin.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/vswitch_plugins/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/vswitch_plugins/bridge_plugin.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/vswitch_plugins/manager.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/vswitch_plugins/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/env/vswitch_plugins/ovs_plugin.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/equalizer/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/equalizer/equalizer.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/equalizer/get_info.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/equalizer/optimize.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/affctl.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/ethtool.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/iperf.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/netmap.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/netns.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/netperf.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/pktgen.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/qperf.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/sar.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/utils.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/vnstat.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/perf/vstfperf.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/softagent.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/spirent/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/spirent/spirent.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/spirent/tools.py
rename to 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
similarity index 100%
rename from vstf/vstf/agent/spirentagent.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/candy_text.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/cfgparser.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/check.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/cliutil.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/cmds.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/constants.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/daemon.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/decorator.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/excepts.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/input.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/log.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/message.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/perfmark.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/pyhtml.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/rsync.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/saltstack.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/ssh.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/test_func.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/unix.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/utils.py
rename to 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
similarity index 100%
rename from vstf/vstf/common/vstfcli.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/api_server.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/database/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/database/constants.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/database/dbinterface.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/database/tables.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/env_build/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/env_build/cfg_intent_parse.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/env_build/env_build.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/env_build/env_collect.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/fabricant.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/mail/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/mail/mail.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/mail/sendmail.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/candy_generator.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/data_factory.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/html/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/html/html_base.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/html/htmlcreator.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/element.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/pdfcreator.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/pdftemplate.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/story.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/pdf/styles.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/provider/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/provider/html_provider.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/report/provider/pdf_provider.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/reporters/reporter.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/Traffic-types.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/Traffic-types.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Ti-direct.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Ti-direct.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Ti.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Ti.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tn.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tn.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tnv.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tnv.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tu.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/deployment/Tu.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/iperf/Ti-3.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/iperf/Ti-3.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/logo.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-1.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-1.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-2.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-2.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-direct-1.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-direct-2.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-1.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-1.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-1v.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-1v.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-2.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-2.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-2v.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tn-2v.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-1.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-1.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-2.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-2.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-3.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/pktgen/Tu-3.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-1.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-1.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-1v.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-1v.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-2.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-2.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-2v.gif
rename to 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
similarity index 100%
rename from vstf/vstf/controller/res/spirent/Tn-2v.jpg
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/cpu_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/device_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/flows_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/forwarding_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/html_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/mail_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/perf_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/settings_input.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/template_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/tester_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/settings/tool_settings.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/spirent/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/spirent/appliance.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/spirent/common/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/spirent/common/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/spirent/common/result_analysis.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/flow_producer.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/perf_provider.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/performance.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/sw_perf/raw_data.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/configuration.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/model.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_cfg_intent_parse.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_collect.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_driver_function.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_env_build.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_perf.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/unittest/test_ssh.py
rename to 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
similarity index 100%
rename from vstf/vstf/controller/vstfadm.py
rename to 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
similarity index 100%
rename from vstf/vstf/rpc_frame_work/__init__.py
rename to 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
similarity index 100%
rename from vstf/vstf/rpc_frame_work/constant.py
rename to 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
similarity index 100%
rename from vstf/vstf/rpc_frame_work/rpc_consumer.py
rename to 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
similarity index 100%
rename from vstf/vstf/rpc_frame_work/rpc_producer.py
rename to testsuites/vstf/vstf_scripts/vstf/rpc_frame_work/rpc_producer.py