123 files changed, 71 insertions, 64 deletions

diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index d6497678a..cca4959a9 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -1,13 +1,13 @@
 general:
     directories:
         # Relative to the path where the repo is cloned:
-        dir_vping:         testcases/OpenStack/vPing/
-        dir_odl:           testcases/Controllers/ODL/
-        dir_rally:         testcases/OpenStack/rally/
-        dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/
-        dir_vIMS:          testcases/vnf/vIMS/
-        dir_onos:          testcases/Controllers/ONOS/Teston/
-        dir_onos_sfc:           testcases/Controllers/ONOS/Sfc/
+        dir_vping:         functest/opnfv_tests/OpenStack/vPing/
+        dir_odl:           functest/opnfv_tests/Controllers/ODL/
+        dir_rally:         functest/opnfv_tests/OpenStack/rally/
+        dir_tempest_cases: functest/opnfv_tests/OpenStack/tempest/custom_tests/
+        dir_vIMS:          functest/opnfv_tests/vnf/vIMS/
+        dir_onos:          functest/opnfv_tests/Controllers/ONOS/Teston/
+        dir_onos_sfc:      functest/opnfv_tests/Controllers/ONOS/Sfc/
 
         # Absolute path
         dir_repos:          /home/opnfv/repos
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 6fdc42666..640180059 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -37,6 +37,7 @@ if [[ "${CI_DEBUG,,}" == "true" ]];then
 fi
 
 FUNCTEST_REPO_DIR=${repos_dir}/functest
+FUNCTEST_TEST_DIR=${repos_dir}/functest/functest/opnfv_tests
 FUNCTEST_CONF_DIR=/home/opnfv/functest/conf
 
 export PYTHONUNBUFFERED=1
@@ -81,39 +82,39 @@ function run_test(){
 
     case $test_name in
         "healthcheck")
-            ${FUNCTEST_REPO_DIR}/testcases/OpenStack/healthcheck/healthcheck.sh
+            ${FUNCTEST_TEST_DIR}/OpenStack/healthcheck/healthcheck.sh
         ;;
         "vping_ssh")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m ssh $report
+            python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m ssh $report
         ;;
         "vping_userdata")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/vPing/vping.py -m userdata $report
+            python ${FUNCTEST_TEST_DIR}/OpenStack/vPing/vping.py -m userdata $report
         ;;
         "odl")
             odl_tests
             [[ "$report" == "-r" ]] && args=-p
-            ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/OpenDaylightTesting.py \
+            ${FUNCTEST_TEST_DIR}/Controllers/ODL/OpenDaylightTesting.py \
                 --keystoneip $keystone_ip --neutronip $neutron_ip \
                 --osusername ${OS_USERNAME} --ostenantname ${OS_TENANT_NAME} \
                 --ospassword ${OS_PASSWORD} \
                 --odlip $odl_ip --odlwebport $odl_port ${args}
         ;;
         "tempest_smoke_serial")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+            python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
                 $clean_flag -s -m smoke $report
         ;;
         "tempest_full_parallel")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+            python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
                 $serial_flag $clean_flag -m full $report
         ;;
         "vims")
-            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report
+            python ${FUNCTEST_TEST_DIR}/vnf/vIMS/vIMS.py $clean_flag $report
         ;;
         "rally_full")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report
+            python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py $clean_flag all $report
         ;;
         "rally_sanity")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py \
+            python ${FUNCTEST_TEST_DIR}/OpenStack/rally/run_rally-cert.py \
                 $clean_flag --sanity all $report
         ;;
         "bgpvpn")
@@ -121,17 +122,17 @@ function run_test(){
             python ${sdnvpn_repo_dir}/run_tests.py $report
         ;;
         "onos")
-            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py
+            python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py
         ;;
         "onos_sfc")
-            python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/onosfunctest.py -t sfc
+            python ${FUNCTEST_TEST_DIR}/Controllers/ONOS/Teston/onosfunctest.py -t sfc
         ;;
         "promise")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/promise.py $report
+            python ${FUNCTEST_TEST_DIR}/features/promise.py $report
             sleep 10 # to let the instances terminate
         ;;
         "doctor")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py $report
+            python ${FUNCTEST_TEST_DIR}/features/doctor.py $report
         ;;
         "ovno")
             # suite under rewritting for colorado
@@ -144,29 +145,29 @@ function run_test(){
             python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
         ;;
         "copper")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report
+            python ${FUNCTEST_TEST_DIR}/features/copper.py $report
         ;;
         "moon")
             python ${repos_dir}/moon/tests/run_tests.py $report
         ;;
         "multisite")
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py
-            python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \
+            python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/gen_tempest_conf.py
+            python ${FUNCTEST_TEST_DIR}/OpenStack/tempest/run_tempest.py \
                 $clean_flag -s -m feature_multisite $report \
-                -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf
+                -c ${FUNCTEST_TEST_DIR}/OpenStack/tempest/tempest_multisite.conf
         ;;
         "domino")
-            python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report
+            python ${FUNCTEST_TEST_DIR}/features/domino.py $report
         ;;
         "odl-sfc")
-            ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+            ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc
             # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash
             FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $?
             source ${ODL_SFC_DIR}/tackerc
             python ${ODL_SFC_DIR}/sfc_colorado1.py $report
         ;;
         "parser")
-            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report
+            python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report
         ;;
         *)
             echo "The test case '${test_name}' does not exist."
diff --git a/ci/testcases.yaml b/ci/testcases.yaml
index 22509e611..afd329868 100644
--- a/ci/testcases.yaml
+++ b/ci/testcases.yaml
@@ -93,7 +93,7 @@ tiers:
                     installer: ''
                     scenario: 'odl'
                 run:
-                    module: 'functest.testcases.Controllers.ODL.OpenDaylightTesting'
+                    module: 'functest.opnfv_tests.Controllers.ODL.OpenDaylightTesting'
                     class: 'ODLTestCases'
 
             -
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0291c6619..42c24ec0f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -121,7 +121,7 @@ ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img /home/opnfv/func
 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 RUN curl -L https://get.rvm.io | bash -s stable
 
-RUN /bin/bash -c ". /home/opnfv/repos/functest/testcases/features/sfc/tacker_client_install.sh"
+RUN /bin/bash -c ". /home/opnfv/repos/functest/functest/opnfv_tests/features/sfc/tacker_client_install.sh"
 RUN cd ${repos_dir}/bgpvpn && pip install .
 RUN cd ${repos_dir}/kingbird && pip install -e .
 RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install
diff --git a/__init__.py b/functest/__init__.py
index e69de29bb..e69de29bb 100644
--- a/__init__.py
+++ b/functest/__init__.py
diff --git a/cli/__init__.py b/functest/cli/__init__.py
index e69de29bb..e69de29bb 100644
--- a/cli/__init__.py
+++ b/functest/cli/__init__.py
diff --git a/cli/cli_base.py b/functest/cli/cli_base.py
index 827f8a4b6..827f8a4b6 100644
--- a/cli/cli_base.py
+++ b/functest/cli/cli_base.py
diff --git a/cli/commands/__init__.py b/functest/cli/commands/__init__.py
index e69de29bb..e69de29bb 100644
--- a/cli/commands/__init__.py
+++ b/functest/cli/commands/__init__.py
diff --git a/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index 572012643..572012643 100644
--- a/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
diff --git a/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index 2f3f329f3..2f3f329f3 100644
--- a/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
diff --git a/cli/commands/cli_testcase.py b/functest/cli/commands/cli_testcase.py
index 510d740ba..510d740ba 100644
--- a/cli/commands/cli_testcase.py
+++ b/functest/cli/commands/cli_testcase.py
diff --git a/cli/commands/cli_tier.py b/functest/cli/commands/cli_tier.py
index aa0541981..aa0541981 100644
--- a/cli/commands/cli_tier.py
+++ b/functest/cli/commands/cli_tier.py
diff --git a/cli/functest-complete.sh b/functest/cli/functest-complete.sh
index f01490713..f01490713 100644
--- a/cli/functest-complete.sh
+++ b/functest/cli/functest-complete.sh
diff --git a/cli/setup.py b/functest/cli/setup.py
index 21547e158..21547e158 100644
--- a/cli/setup.py
+++ b/functest/cli/setup.py
diff --git a/core/TestCasesBase.py b/functest/core/TestCasesBase.py
index 3d6b82d52..3d6b82d52 100644
--- a/core/TestCasesBase.py
+++ b/functest/core/TestCasesBase.py
diff --git a/core/__init__.py b/functest/core/__init__.py
index e69de29bb..e69de29bb 100644
--- a/core/__init__.py
+++ b/functest/core/__init__.py
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
index 8c003abfd..8c003abfd 100755
--- a/testcases/Controllers/ODL/OpenDaylightTesting.py
+++ b/functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
diff --git a/testcases/Controllers/ODL/__init__.py b/functest/opnfv_tests/Controllers/ODL/__init__.py
index e69de29bb..e69de29bb 100644
--- a/testcases/Controllers/ODL/__init__.py
+++ b/functest/opnfv_tests/Controllers/ODL/__init__.py
diff --git a/testcases/Controllers/ONOS/Sfc/README.md b/functest/opnfv_tests/Controllers/ONOS/Sfc/README.md
index ae63ee214..ae63ee214 100644
--- a/testcases/Controllers/ONOS/Sfc/README.md
+++ b/functest/opnfv_tests/Controllers/ONOS/Sfc/README.md
diff --git a/testcases/Controllers/ONOS/Sfc/Sfc.py b/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
index bea2828d2..bea2828d2 100755
--- a/testcases/Controllers/ONOS/Sfc/Sfc.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc.py
diff --git a/testcases/Controllers/ONOS/Sfc/Sfc_fun.py b/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
index 69e076d05..69e076d05 100644
--- a/testcases/Controllers/ONOS/Sfc/Sfc_fun.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Sfc/Sfc_fun.py
diff --git a/testcases/Controllers/ONOS/Teston/Readme.txt b/functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt
index 7393f59a1..7393f59a1 100644
--- a/testcases/Controllers/ONOS/Teston/Readme.txt
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/Readme.txt
diff --git a/testcases/Controllers/ONOS/Teston/__init__.py b/functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py
index e69de29bb..e69de29bb 100644
--- a/testcases/Controllers/ONOS/Teston/__init__.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/__init__.py
diff --git a/testcases/Controllers/ONOS/Teston/adapters/__init__.py b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py
index e69de29bb..e69de29bb 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/__init__.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/__init__.py
diff --git a/testcases/Controllers/ONOS/Teston/adapters/client.py b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
index 6b3285e5e..6b3285e5e 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/client.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/client.py
diff --git a/testcases/Controllers/ONOS/Teston/adapters/connection.py b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
index b2a2e3d88..b2a2e3d88 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/connection.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/connection.py
diff --git a/testcases/Controllers/ONOS/Teston/adapters/environment.py b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
index f2755b669..f2755b669 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/environment.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/environment.py
diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
index 5c42c35e8..603e9933c 100644
--- a/testcases/Controllers/ONOS/Teston/adapters/foundation.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/adapters/foundation.py
@@ -26,10 +26,10 @@ class foundation:
 
         # currentpath = os.getcwd()
         REPO_PATH = ft_utils.FUNCTEST_REPO + '/'
-        currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI'
+        currentpath = REPO_PATH + 'opnfv_tests/Controllers/ONOS/Teston/CI'
         self.cipath = currentpath
         self.logdir = os.path.join(currentpath, 'log')
-        self.workhome = currentpath[0: currentpath.rfind('testcases') - 1]
+        self.workhome = currentpath[0: currentpath.rfind('opnfv_tests') - 1]
         self.Result_DB = ''
         filename = time.strftime('%Y-%m-%d-%H-%M-%S') + '.log'
         self.logfilepath = os.path.join(self.logdir, filename)
diff --git a/testcases/Controllers/ONOS/Teston/dependencies/onos b/functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos
index bb02fa899..bb02fa899 100644
--- a/testcases/Controllers/ONOS/Teston/dependencies/onos
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/dependencies/onos
diff --git a/testcases/Controllers/ONOS/Teston/log/gitignore b/functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore
index e69de29bb..e69de29bb 100644
--- a/testcases/Controllers/ONOS/Teston/log/gitignore
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/log/gitignore
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py
index c8045fd12..c8045fd12 100755
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/functest/opnfv_tests/Controllers/ONOS/Teston/onosfunctest.py
diff --git a/testcases/Controllers/__init__.py b/functest/opnfv_tests/Controllers/__init__.py
index e69de29bb..e69de29bb 100644
--- a/testcases/Controllers/__init__.py
+++ b/functest/opnfv_tests/Controllers/__init__.py
diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py
index 50cdf8a57..50cdf8a57 100755
--- a/testcases/OpenStack/examples/create_instance_and_ip.py
+++ b/functest/opnfv_tests/OpenStack/examples/create_instance_and_ip.py
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh
index 996aadcf7..996aadcf7 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/functest/opnfv_tests/OpenStack/healthcheck/healthcheck.sh
diff --git a/testcases/OpenStack/rally/blacklist.txt b/functest/opnfv_tests/OpenStack/rally/blacklist.txt
index 3a17fa616..3a17fa616 100644
--- a/testcases/OpenStack/rally/blacklist.txt
+++ b/functest/opnfv_tests/OpenStack/rally/blacklist.txt
diff --git a/testcases/OpenStack/rally/macro/macro.yaml b/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
index 48c0333e9..48c0333e9 100644
--- a/testcases/OpenStack/rally/macro/macro.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/macro/macro.yaml
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
index 8b8adce40..8b8adce40 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/functest/opnfv_tests/OpenStack/rally/run_rally-cert.py
diff --git a/testcases/OpenStack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
index e844e33f6..e844e33f6 100644
--- a/testcases/OpenStack/rally/scenario/full/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-cinder.yaml
diff --git a/testcases/OpenStack/rally/scenario/full/opnfv-heat.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
index 6f3a5c163..6f3a5c163 100644
--- a/testcases/OpenStack/rally/scenario/full/opnfv-heat.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-heat.yaml
diff --git a/testcases/OpenStack/rally/scenario/full/opnfv-neutron.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
index 0a773533a..0a773533a 100644
--- a/testcases/OpenStack/rally/scenario/full/opnfv-neutron.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-neutron.yaml
diff --git a/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
index d7622093d..d7622093d 100644
--- a/testcases/OpenStack/rally/scenario/full/opnfv-nova.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/full/opnfv-nova.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-authenticate.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
index a04e4c1c1..a04e4c1c1 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-authenticate.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-authenticate.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
index 3a67e7457..3a67e7457 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-glance.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-keystone.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
index bfc9948b3..bfc9948b3 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-keystone.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-keystone.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-quotas.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
index a0682acce..a0682acce 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-quotas.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-quotas.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-requests.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
index 161369786..161369786 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-requests.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-requests.yaml
diff --git a/testcases/OpenStack/rally/scenario/opnfv-vm.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
index 74f509925..74f509925 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-vm.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/opnfv-vm.yaml
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
index 5962b1db5..5962b1db5 100644
--- a/testcases/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-cinder.yaml
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-heat.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
index dc34cc3f2..dc34cc3f2 100644
--- a/testcases/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-heat.yaml
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
index 159f2b633..159f2b633 100644
--- a/testcases/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-neutron.yaml
diff --git a/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
index e2795cf71..e2795cf71 100644
--- a/testcases/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/sanity/opnfv-nova.yaml
diff --git a/testcases/OpenStack/rally/scenario/support/instance_dd_test.sh b/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
index e3bf23405..e3bf23405 100755
--- a/testcases/OpenStack/rally/scenario/support/instance_dd_test.sh
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/support/instance_dd_test.sh
diff --git a/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
index a22487e33..a22487e33 100644
--- a/testcases/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/autoscaling_policy.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/default.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
index eb4f2f2dd..eb4f2f2dd 100644
--- a/testcases/OpenStack/rally/scenario/templates/default.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/default.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
index 2dd676c11..2dd676c11 100644
--- a/testcases/OpenStack/rally/scenario/templates/random_strings.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/random_strings.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
index b3f505fa6..b3f505fa6 100644
--- a/testcases/OpenStack/rally/scenario/templates/resource_group.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/resource_group.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
index 909f45d21..909f45d21 100644
--- a/testcases/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_ports.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
index 826ca9dae..826ca9dae 100644
--- a/testcases/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/server_with_volume.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
index cf34879ca..cf34879ca 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_autoscaling_policy_inplace.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
index e06d42e01..e06d42e01 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_add.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
index d02593e3b..d02593e3b 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_delete.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
index 46d8bff4c..46d8bff4c 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_random_strings_replace.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
index 891074ebc..891074ebc 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_increase.yaml.template
diff --git a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
index b4d1d1730..b4d1d1730 100644
--- a/testcases/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
+++ b/functest/opnfv_tests/OpenStack/rally/scenario/templates/updated_resource_group_reduce.yaml.template
diff --git a/testcases/OpenStack/rally/task.yaml b/functest/opnfv_tests/OpenStack/rally/task.yaml
index c482f120d..c482f120d 100644
--- a/testcases/OpenStack/rally/task.yaml
+++ b/functest/opnfv_tests/OpenStack/rally/task.yaml
diff --git a/testcases/OpenStack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt
index 5c8581f66..5c8581f66 100644
--- a/testcases/OpenStack/tempest/custom_tests/blacklist.txt
+++ b/functest/opnfv_tests/OpenStack/tempest/custom_tests/blacklist.txt
diff --git a/testcases/OpenStack/tempest/custom_tests/defcore_req.txt b/functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt
index bb1d172df..bb1d172df 100644
--- a/testcases/OpenStack/tempest/custom_tests/defcore_req.txt
+++ b/functest/opnfv_tests/OpenStack/tempest/custom_tests/defcore_req.txt
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py
index ca671d00d..ca671d00d 100755
--- a/testcases/OpenStack/tempest/gen_tempest_conf.py
+++ b/functest/opnfv_tests/OpenStack/tempest/gen_tempest_conf.py
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/functest/opnfv_tests/OpenStack/tempest/run_tempest.py
index d2c01c604..d2c01c604 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/functest/opnfv_tests/OpenStack/tempest/run_tempest.py
diff --git a/testcases/OpenStack/vPing/ping.sh b/functest/opnfv_tests/OpenStack/vPing/ping.sh
index 693b86825..693b86825 100755
--- a/testcases/OpenStack/vPing/ping.sh
+++ b/functest/opnfv_tests/OpenStack/vPing/ping.sh
diff --git a/testcases/OpenStack/vPing/vping.py b/functest/opnfv_tests/OpenStack/vPing/vping.py
index 90f664568..90f664568 100755
--- a/testcases/OpenStack/vPing/vping.py
+++ b/functest/opnfv_tests/OpenStack/vPing/vping.py
diff --git a/testcases/OpenStack/vPing/vping_util.py b/functest/opnfv_tests/OpenStack/vPing/vping_util.py
index cf5a28dbd..ccd9db064 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/functest/opnfv_tests/OpenStack/vPing/vping_util.py
@@ -339,7 +339,7 @@ def transfer_ping_script(ssh, floatip):
     logger.info("Trying to transfer ping.sh to %s..." % floatip)
     scp = SCPClient(ssh.get_transport())
 
-    ping_script = FUNCTEST_REPO + "/testcases/OpenStack/vPing/ping.sh"
+    ping_script = FUNCTEST_REPO + "/opnfv_tests/OpenStack/vPing/ping.sh"
     try:
         scp.put(ping_script, "~/")
     except:
diff --git a/testcases/__init__.py b/functest/opnfv_tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/testcases/__init__.py
+++ b/functest/opnfv_tests/__init__.py
diff --git a/testcases/features/copper.py b/functest/opnfv_tests/features/copper.py
index ab0162626..ab0162626 100755
--- a/testcases/features/copper.py
+++ b/functest/opnfv_tests/features/copper.py
diff --git a/testcases/features/doctor.py b/functest/opnfv_tests/features/doctor.py
index 00e5c1d6b..00e5c1d6b 100755
--- a/testcases/features/doctor.py
+++ b/functest/opnfv_tests/features/doctor.py
diff --git a/testcases/features/domino.py b/functest/opnfv_tests/features/domino.py
index 7705c07bd..7705c07bd 100755
--- a/testcases/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
diff --git a/testcases/features/multisite.py b/functest/opnfv_tests/features/multisite.py
index 6d492182c..6d492182c 100755
--- a/testcases/features/multisite.py
+++ b/functest/opnfv_tests/features/multisite.py
diff --git a/testcases/features/promise.py b/functest/opnfv_tests/features/promise.py
index cce0f5dc1..cce0f5dc1 100755
--- a/testcases/features/promise.py
+++ b/functest/opnfv_tests/features/promise.py
diff --git a/testcases/features/sfc/SSHUtils.py b/functest/opnfv_tests/features/sfc/SSHUtils.py
index 9c8c2c727..9c8c2c727 100644
--- a/testcases/features/sfc/SSHUtils.py
+++ b/functest/opnfv_tests/features/sfc/SSHUtils.py
diff --git a/testcases/features/sfc/compute_presetup_CI.bash b/functest/opnfv_tests/features/sfc/compute_presetup_CI.bash
index 36148aa15..36148aa15 100755
--- a/testcases/features/sfc/compute_presetup_CI.bash
+++ b/functest/opnfv_tests/features/sfc/compute_presetup_CI.bash
diff --git a/testcases/features/sfc/correct_classifier.bash b/functest/opnfv_tests/features/sfc/correct_classifier.bash
index fb08af5c1..fb08af5c1 100755
--- a/testcases/features/sfc/correct_classifier.bash
+++ b/functest/opnfv_tests/features/sfc/correct_classifier.bash
diff --git a/testcases/features/sfc/delete.sh b/functest/opnfv_tests/features/sfc/delete.sh
index c04ae6375..c04ae6375 100755
--- a/testcases/features/sfc/delete.sh
+++ b/functest/opnfv_tests/features/sfc/delete.sh
diff --git a/testcases/features/sfc/ovs_utils.py b/functest/opnfv_tests/features/sfc/ovs_utils.py
index 20ab5a7e3..20ab5a7e3 100644
--- a/testcases/features/sfc/ovs_utils.py
+++ b/functest/opnfv_tests/features/sfc/ovs_utils.py
diff --git a/testcases/features/sfc/prepare_odl_sfc.bash b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.bash
index 80ed9bd92..c4d8f4f81 100755
--- a/testcases/features/sfc/prepare_odl_sfc.bash
+++ b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.bash
@@ -13,7 +13,7 @@
 #
 
 ODL_SFC_LOG=/home/opnfv/functest/results/odl-sfc.log
-ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/testcases/features/sfc
+ODL_SFC_DIR=${FUNCTEST_REPO_DIR}/opnfv_tests/features/sfc
 
 # Split the output to the log file and redirect STDOUT and STDERR to /dev/null
 bash ${ODL_SFC_DIR}/server_presetup_CI.bash |& \
diff --git a/testcases/features/sfc/prepare_odl_sfc.py b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py
index 78f4d7646..3d700b8a7 100755
--- a/testcases/features/sfc/prepare_odl_sfc.py
+++ b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py
@@ -33,7 +33,7 @@ except:
     INSTALLER_IP = "10.20.0.2"
 
 os.environ['ODL_SFC_LOG'] = "/home/opnfv/functest/results/odl-sfc.log"
-os.environ['ODL_SFC_DIR'] = FUNCTEST_REPO_DIR + "/testcases/features/sfc"
+os.environ['ODL_SFC_DIR'] = FUNCTEST_REPO_DIR + "/opnfv_tests/features/sfc"
 
 command = os.environ['ODL_SFC_DIR'] + ("/server_presetup_CI.bash | "
                                        "tee -a ${ODL_SFC_LOG} "
diff --git a/testcases/features/sfc/server_presetup_CI.bash b/functest/opnfv_tests/features/sfc/server_presetup_CI.bash
index 240353f5b..240353f5b 100755
--- a/testcases/features/sfc/server_presetup_CI.bash
+++ b/functest/opnfv_tests/features/sfc/server_presetup_CI.bash
diff --git a/testcases/features/sfc/sfc.py b/functest/opnfv_tests/features/sfc/sfc.py
index 2cc7ac9c0..17ffef225 100755
--- a/testcases/features/sfc/sfc.py
+++ b/functest/opnfv_tests/features/sfc/sfc.py
@@ -43,7 +43,7 @@ SUBNET_CIDR = "11.0.0.0/24"
 ROUTER_NAME = "example-router"
 SECGROUP_NAME = "example-sg"
 SECGROUP_DESCR = "Example Security group"
-SFC_TEST_DIR = REPO_PATH + "/testcases/features/sfc/"
+SFC_TEST_DIR = REPO_PATH + "/opnfv_tests/features/sfc/"
 TACKER_SCRIPT = SFC_TEST_DIR + "sfc_tacker.bash"
 TACKER_CHANGECLASSI = SFC_TEST_DIR + "sfc_change_classi.bash"
 ssh_options = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
diff --git a/testcases/features/sfc/sfc_change_classi.bash b/functest/opnfv_tests/features/sfc/sfc_change_classi.bash
index 70375ab3b..70375ab3b 100755
--- a/testcases/features/sfc/sfc_change_classi.bash
+++ b/functest/opnfv_tests/features/sfc/sfc_change_classi.bash
diff --git a/testcases/features/sfc/sfc_colorado1.py b/functest/opnfv_tests/features/sfc/sfc_colorado1.py
index d31541d13..6965f283a 100755
--- a/testcases/features/sfc/sfc_colorado1.py
+++ b/functest/opnfv_tests/features/sfc/sfc_colorado1.py
@@ -302,7 +302,7 @@ def main():
 
         # CREATION OF THE 2 SF ####
 
-        tacker_script = "%s/testcases/features/sfc/%s" % \
+        tacker_script = "%s/opnfv_tests/features/sfc/%s" % \
                         (FUNCTEST_REPO, TACKER_SCRIPT)
         logger.info("Executing tacker script: '%s'" % tacker_script)
         subprocess.call(tacker_script, shell=True)
@@ -492,7 +492,7 @@ def main():
 
         # CHANGE OF CLASSIFICATION #
         logger.info("Changing the classification")
-        tacker_classi = "%s/testcases/features/sfc/%s" % \
+        tacker_classi = "%s/opnfv_tests/features/sfc/%s" % \
                         (FUNCTEST_REPO, TACKER_CHANGECLASSI)
         subprocess.call(tacker_classi, shell=True)
 
@@ -568,7 +568,7 @@ def main():
             break
         else:
             logger.info("Iterating again!")
-            delete = "bash %s/testcases/features/sfc/delete.sh" % \
+            delete = "bash %s/opnfv_tests/features/sfc/delete.sh" % \
                      (FUNCTEST_REPO)
             try:
                 subprocess.call(delete, shell=True, stderr=subprocess.PIPE)
diff --git a/testcases/features/sfc/sfc_tacker.bash b/functest/opnfv_tests/features/sfc/sfc_tacker.bash
index 690d5f52e..690d5f52e 100755
--- a/testcases/features/sfc/sfc_tacker.bash
+++ b/functest/opnfv_tests/features/sfc/sfc_tacker.bash
diff --git a/testcases/features/sfc/tacker_client_install.sh b/functest/opnfv_tests/features/sfc/tacker_client_install.sh
index adb9a44be..adb9a44be 100755
--- a/testcases/features/sfc/tacker_client_install.sh
+++ b/functest/opnfv_tests/features/sfc/tacker_client_install.sh
diff --git a/testcases/features/sfc/test-vnfd1.yaml b/functest/opnfv_tests/features/sfc/test-vnfd1.yaml
index 5c672e388..5c672e388 100644
--- a/testcases/features/sfc/test-vnfd1.yaml
+++ b/functest/opnfv_tests/features/sfc/test-vnfd1.yaml
diff --git a/testcases/features/sfc/test-vnfd2.yaml b/functest/opnfv_tests/features/sfc/test-vnfd2.yaml
index 8a570ab92..8a570ab92 100644
--- a/testcases/features/sfc/test-vnfd2.yaml
+++ b/functest/opnfv_tests/features/sfc/test-vnfd2.yaml
diff --git a/testcases/security_scan/config.ini b/functest/opnfv_tests/security_scan/config.ini
index b97de80fa..b97de80fa 100644
--- a/testcases/security_scan/config.ini
+++ b/functest/opnfv_tests/security_scan/config.ini
diff --git a/testcases/security_scan/connect.py b/functest/opnfv_tests/security_scan/connect.py
index 18ca96d80..18ca96d80 100644
--- a/testcases/security_scan/connect.py
+++ b/functest/opnfv_tests/security_scan/connect.py
diff --git a/testcases/security_scan/examples/xccdf-rhel7-server-upstream.ini b/functest/opnfv_tests/security_scan/examples/xccdf-rhel7-server-upstream.ini
index 43b2e82d6..43b2e82d6 100644
--- a/testcases/security_scan/examples/xccdf-rhel7-server-upstream.ini
+++ b/functest/opnfv_tests/security_scan/examples/xccdf-rhel7-server-upstream.ini
diff --git a/testcases/security_scan/examples/xccdf-standard.ini b/functest/opnfv_tests/security_scan/examples/xccdf-standard.ini
index bfbcf82d3..bfbcf82d3 100644
--- a/testcases/security_scan/examples/xccdf-standard.ini
+++ b/functest/opnfv_tests/security_scan/examples/xccdf-standard.ini
diff --git a/testcases/security_scan/scripts/createfiles.py b/functest/opnfv_tests/security_scan/scripts/createfiles.py
index b828901a5..b828901a5 100644
--- a/testcases/security_scan/scripts/createfiles.py
+++ b/functest/opnfv_tests/security_scan/scripts/createfiles.py
diff --git a/testcases/security_scan/scripts/internet_check.py b/functest/opnfv_tests/security_scan/scripts/internet_check.py
index 1bed50a70..1bed50a70 100644
--- a/testcases/security_scan/scripts/internet_check.py
+++ b/functest/opnfv_tests/security_scan/scripts/internet_check.py
diff --git a/testcases/security_scan/security_scan.py b/functest/opnfv_tests/security_scan/security_scan.py
index 98e6b7a8c..4e0407fba 100755
--- a/testcases/security_scan/security_scan.py
+++ b/functest/opnfv_tests/security_scan/security_scan.py
@@ -33,7 +33,7 @@ __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security'
 # Global vars
 INSTALLER_IP = os.getenv('INSTALLER_IP')
 oscapbin = 'sudo /bin/oscap'
-functest_dir = '%s/testcases/security_scan/' % ft_utils.FUNCTEST_REPO
+functest_dir = '%s/opnfv_tests/security_scan/' % ft_utils.FUNCTEST_REPO
 
 # Apex Spefic var needed to query Undercloud
 if os.getenv('OS_AUTH_URL') is None:
diff --git a/testcases/vnf/vIMS/clearwater.py b/functest/opnfv_tests/vnf/vIMS/clearwater.py
index 7236f4fba..7236f4fba 100644
--- a/testcases/vnf/vIMS/clearwater.py
+++ b/functest/opnfv_tests/vnf/vIMS/clearwater.py
diff --git a/testcases/vnf/vIMS/create_venv.sh b/functest/opnfv_tests/vnf/vIMS/create_venv.sh
index 575fd177c..575fd177c 100755
--- a/testcases/vnf/vIMS/create_venv.sh
+++ b/functest/opnfv_tests/vnf/vIMS/create_venv.sh
diff --git a/testcases/vnf/vIMS/orchestrator.py b/functest/opnfv_tests/vnf/vIMS/orchestrator.py
index 61157a4fb..61157a4fb 100644
--- a/testcases/vnf/vIMS/orchestrator.py
+++ b/functest/opnfv_tests/vnf/vIMS/orchestrator.py
diff --git a/testcases/vnf/vIMS/requirements.pip b/functest/opnfv_tests/vnf/vIMS/requirements.pip
index ab26f6e02..ab26f6e02 100644
--- a/testcases/vnf/vIMS/requirements.pip
+++ b/functest/opnfv_tests/vnf/vIMS/requirements.pip
diff --git a/testcases/vnf/vIMS/vIMS.py b/functest/opnfv_tests/vnf/vIMS/vIMS.py
index 50aa715f4..50aa715f4 100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/functest/opnfv_tests/vnf/vIMS/vIMS.py
diff --git a/testcases/vnf/vRNC/parser.py b/functest/opnfv_tests/vnf/vRNC/parser.py
index 0381fd648..0381fd648 100755
--- a/testcases/vnf/vRNC/parser.py
+++ b/functest/opnfv_tests/vnf/vRNC/parser.py
diff --git a/unit_tests/__init__.py b/functest/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/unit_tests/__init__.py
+++ b/functest/tests/__init__.py
diff --git a/unit_tests/core/__init__.py b/functest/tests/unit/__init__.py
index e69de29bb..e69de29bb 100644
--- a/unit_tests/core/__init__.py
+++ b/functest/tests/unit/__init__.py
diff --git a/unit_tests/odl/__init__.py b/functest/tests/unit/core/__init__.py
index e69de29bb..e69de29bb 100644
--- a/unit_tests/odl/__init__.py
+++ b/functest/tests/unit/core/__init__.py
diff --git a/unit_tests/core/test_base.py b/functest/tests/unit/core/test_base.py
index 25faca0aa..25faca0aa 100644
--- a/unit_tests/core/test_base.py
+++ b/functest/tests/unit/core/test_base.py
diff --git a/utils/__init__.py b/functest/tests/unit/odl/__init__.py
index e69de29bb..e69de29bb 100644
--- a/utils/__init__.py
+++ b/functest/tests/unit/odl/__init__.py
diff --git a/unit_tests/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index cbe4df686..3f33dc88e 100644
--- a/unit_tests/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -16,7 +16,7 @@ import unittest
 from robot.errors import RobotError
 
 from functest.core import TestCasesBase
-from functest.testcases.Controllers.ODL import OpenDaylightTesting
+from functest.opnfv_tests.Controllers.ODL import OpenDaylightTesting
 
 
 class ODLTestCasesTesting(unittest.TestCase):
diff --git a/functest/tests/unit/utils/__init__.py b/functest/tests/unit/utils/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/functest/tests/unit/utils/__init__.py
diff --git a/functest/tests/unit/utils/test_utils.py b/functest/tests/unit/utils/test_utils.py
new file mode 100644
index 000000000..36313d25d
--- /dev/null
+++ b/functest/tests/unit/utils/test_utils.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2016 Orange and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+
+import logging
+import unittest
+
+from functest.utils import functest_utils
+
+
+class FunctestUtilsTesting(unittest.TestCase):
+
+    logging.disable(logging.CRITICAL)
+
+    def setUp(self):
+        self.test = functest_utils
+
+    def test_check_internet_connectivity(self):
+        self.assertTrue(self.test.check_internet_connectivity())
+# TODO
+# ...
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)
diff --git a/functest/utils/__init__.py b/functest/utils/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/functest/utils/__init__.py
diff --git a/utils/functest_logger.py b/functest/utils/functest_logger.py
index b154f563d..b154f563d 100644
--- a/utils/functest_logger.py
+++ b/functest/utils/functest_logger.py
diff --git a/utils/functest_utils.py b/functest/utils/functest_utils.py
index 41b6485d9..41b6485d9 100644
--- a/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
diff --git a/utils/functest_vacation.py b/functest/utils/functest_vacation.py
index 0ba094477..0ba094477 100644
--- a/utils/functest_vacation.py
+++ b/functest/utils/functest_vacation.py
diff --git a/utils/openstack_clean.py b/functest/utils/openstack_clean.py
index bf582dea2..bf582dea2 100755
--- a/utils/openstack_clean.py
+++ b/functest/utils/openstack_clean.py
diff --git a/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py
index 560cadbdb..560cadbdb 100755
--- a/utils/openstack_snapshot.py
+++ b/functest/utils/openstack_snapshot.py
diff --git a/utils/openstack_tacker.py b/functest/utils/openstack_tacker.py
index 3e0c9cf45..3e0c9cf45 100644
--- a/utils/openstack_tacker.py
+++ b/functest/utils/openstack_tacker.py
diff --git a/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index df6fb5d1a..df6fb5d1a 100755
--- a/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index bbe95cc8c..e050418c5 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -25,25 +25,9 @@ sudo touch /home/opnfv/functest/results/odl/stdout.txt
 sudo chmod -Rf a+rw /home/opnfv
 
 # Either Workspace is set (CI)
-# then useless log files must belong to jenkins:jenkins
-# or it is local tests and we do not care
 if [ -z $WORKSPACE ]
 then
     WORKSPACE="."
-else
-    sudo chown -Rf jenkins:jenkins /home/opnfv
-    # as we import the module from the home repo
-    # and in jenkins the name is different
-    # functest-verify-master != functest
-    # make some ugly adjustments...
-    cd $WORKSPACE
-    export PYTHONPATH="${PYTHONPATH}:$WORKSPACE"
-    cd ..
-
-    if [ ! -d "./functest" ]
-    then
-    ln -s functest-verify-master functest
-    fi
 fi
 
 
@@ -74,7 +58,7 @@ nosetests --with-xunit \
          --cover-package=functest.testcases.Controllers.ODL.OpenDaylightTesting \
          --cover-xml \
          --cover-html \
-         unit_tests
+         functest/tests/unit
 rc=$?
 
 deactivate
@@ -82,13 +66,6 @@ deactivate
 # *******
 # clean
 # *******
-# First as we had to start the test from ..
-# Push the results upstream for jenkins
-if [ $WORKSPACE != "." ]
-then
-    mv coverage.xml nosetests.xml $WORKSPACE
-fi
-
 # Clean useless logs
 if [ -d "/home/opnfv/functest/results" ]
 then