Corrected path for clean_openstack.py

Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index f2c45c9..89c44e4 100755 (executable)
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -126,7 +126,7 @@ fi
 
 # Generate OpenStack defaults
 info "Generating OpenStack defaults..."
-python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py $debug
+python ${FUNCTEST_REPO_DIR}/utils/generate_defaults.py $debug
 
 ifconfig eth0 mtu 1450
 

diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index 1ef90b2..f51c9e1 100755 (executable)
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -53,7 +53,7 @@ function clean_openstack(){
     if [ $clean == true ]; then
         echo -e "\n"
         info "Cleaning Openstack environment..."
-        python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \
+        python ${FUNCTEST_REPO_DIR}/utils/clean_openstack.py \
             $debug
         echo -e "\n"
     fi

diff --git a/docs/userguide/runfunctest.rst b/docs/userguide/runfunctest.rst
index b7bdda2..05f7ddf 100644 (file)
--- a/docs/userguide/runfunctest.rst
+++ b/docs/userguide/runfunctest.rst
@@ -69,7 +69,7 @@ the test name or names separated by commas in the following list:
 
 Functest includes cleaning mechanism in order to remove
 all the OpenStack resources except what was present before running any test. The script
-*$repos_dir/functest/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py*
+*$repos_dir/functest/utils/generate_defaults.py*
 is called once by *prepare_env.sh* when setting up the Functest environment
 to snapshot all the OpenStack resources (images, networks, volumes, security groups,
 tenants, users) so that an eventual cleanup does not remove any of this defaults.