Create vnf directory in testcases

JIRA: FUNCTEST-358

Change-Id: I00dacef2a07e3980cc33cdbfad7ea238c1153599
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index cc5c82a..456b9db 100644 (file)
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -5,7 +5,7 @@ general:
         dir_odl:           testcases/Controllers/ODL/
         dir_rally:         testcases/OpenStack/rally/
         dir_tempest_cases: testcases/OpenStack/tempest/custom_tests/
-        dir_vIMS:          testcases/vIMS/
+        dir_vIMS:          testcases/vnf/vIMS/
         dir_onos:          testcases/Controllers/ONOS/Teston/
         dir_onos_sfc:           testcases/Controllers/ONOS/Sfc/
 

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 362cd9e..23cb827 100755 (executable)
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -102,7 +102,7 @@ function run_test(){
                 $serial_flag $clean_flag -m full $report
         ;;
         "vims")
-            python ${FUNCTEST_REPO_DIR}/testcases/vIMS/vIMS.py $clean_flag $report
+            python ${FUNCTEST_REPO_DIR}/testcases/vnf/vIMS/vIMS.py $clean_flag $report
         ;;
         "rally_full")
             python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/rally/run_rally-cert.py $clean_flag all $report

diff --git a/testcases/vIMS/clearwater.py b/testcases/vnf/vIMS/clearwater.py
similarity index 100%
rename from testcases/vIMS/clearwater.py
rename to testcases/vnf/vIMS/clearwater.py

diff --git a/testcases/vIMS/create_venv.sh b/testcases/vnf/vIMS/create_venv.sh
similarity index 100%
rename from testcases/vIMS/create_venv.sh
rename to testcases/vnf/vIMS/create_venv.sh

diff --git a/testcases/vIMS/orchestrator.py b/testcases/vnf/vIMS/orchestrator.py
similarity index 100%
rename from testcases/vIMS/orchestrator.py
rename to testcases/vnf/vIMS/orchestrator.py

diff --git a/testcases/vIMS/requirements.pip b/testcases/vnf/vIMS/requirements.pip
similarity index 100%
rename from testcases/vIMS/requirements.pip
rename to testcases/vnf/vIMS/requirements.pip

diff --git a/testcases/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
similarity index 100%
rename from testcases/vIMS/vIMS.py
rename to testcases/vnf/vIMS/vIMS.py