aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-04-27 14:15:08 +0300
committervitikkan <viktor.tikkanen@nokia.com>2016-04-27 14:15:08 +0300
commit5dfb6fb78a7d4339a5b68147b46ab8aa49ebf866 (patch)
tree28db79ce089fde0f62bc2ad885246d00e9f5fdd8
parentaab51caef627cb40d78680563d984dd5c1dbbeef (diff)
Corrected path for clean_openstack.py
Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>
-rwxr-xr-xdocker/prepare_env.sh2
-rwxr-xr-xdocker/run_tests.sh2
-rw-r--r--docs/userguide/runfunctest.rst2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index f2c45c9a..89c44e4f 100755
--- 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 1ef90b24..f51c9e19 100755
--- 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 b7bdda28..05f7ddfa 100644
--- 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.