From 0f2665f9eb28bb2ecaab45a5bd70c87964210ac2 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Mon, 1 Feb 2016 18:08:56 +0100 Subject: Use generate_defaults instead of os_defaults fixed parameters JIRA: FUNCTEST-131 Running generate_defaults.py in prepare_env.sh (before running any test) will create a file with the CURRENT OpenStack objects in the deployment. After each test, the cleanup script will take into consideration those parameters instead of the specified in os_defaults.yaml Keep os_defaults.yaml for the moment Change-Id: I5f38fef47f0a6d79407d1d582b1e7d3713503e07 Signed-off-by: jose.lausuch (cherry picked from commit 47635924e6def36be3c44a047d91018e47a439eb) --- docker/prepare_env.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 4106e3bde..ea82ea1c0 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -221,7 +221,7 @@ if [ $RETVAL -ne 0 ]; then fi # Prepare Functest Environment -info "Functest: prepare Functest environment" +info "Preparing Functest environment..." python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start retval=$? if [ $retval != 0 ]; then @@ -229,6 +229,12 @@ if [ $retval != 0 ]; then exit $retval fi + +# Generate OpenStack defaults +info "Generating OpenStack defaults..." +python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/generate_defaults.py -d + + ifconfig eth0 mtu 1450 echo "1" > ${FUNCTEST_CONF_DIR}/env_active -- cgit 1.2.3-korg