diff --git a/contrib/devstack/lib/murano b/contrib/devstack/lib/murano index 1d1d4cd4..78b5f826 100644 --- a/contrib/devstack/lib/murano +++ b/contrib/devstack/lib/murano @@ -34,6 +34,7 @@ MURANO_CONF_DIR=${MURANO_CONF_DIR:-/etc/murano} MURANO_CONF_FILE=${MURANO_CONF_DIR}/murano.conf MURANO_POLICY_FILE=${MURANO_CONF_DIR}/policy.json MURANO_DEBUG=${MURANO_DEBUG:-True} +MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=${MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT:-False} MURANO_SERVICE_HOST=${MURANO_SERVICE_HOST:-$SERVICE_HOST} MURANO_SERVICE_PORT=${MURANO_SERVICE_PORT:-8082} diff --git a/functionaltests/post_test_hook.sh b/functionaltests/post_test_hook.sh index c46507c0..05f5f7e7 100755 --- a/functionaltests/post_test_hook.sh +++ b/functionaltests/post_test_hook.sh @@ -1,21 +1,15 @@ #!/bin/bash -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. # This script is executed inside post_test_hook function in devstack gate. cd /opt/stack/new/murano/functionaltests -sudo ./run_tests.sh + +# Allow to execute other run_tests_*.sh script based on first parameter +RUN_TEST_SUFFIX="" +if [ "$#" -ge 1 ]; then + RUN_TEST_SUFFIX=_$1 +fi +sudo ./run_tests$RUN_TEST_SUFFIX.sh RETVAL=$? # Copy tempest log files to be published among other logs upon job completion diff --git a/functionaltests/pre_test_hook.sh b/functionaltests/pre_test_hook.sh index df384823..b24a0798 100755 --- a/functionaltests/pre_test_hook.sh +++ b/functionaltests/pre_test_hook.sh @@ -1,22 +1,10 @@ #!/bin/bash -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. # This script is executed inside pre_test_hook function in desvstack gate. # Install Murano devstack integration +source ./pre_test_hook_common.sh MURANO_BASE=/opt/stack/new/murano/contrib/devstack -DEVSTACK_BASE=/opt/stack/new/devstack cp $MURANO_BASE/lib/* $DEVSTACK_BASE/lib cp $MURANO_BASE/extras.d/* $DEVSTACK_BASE/extras.d diff --git a/functionaltests/pre_test_hook_common.sh b/functionaltests/pre_test_hook_common.sh new file mode 100755 index 00000000..5648299b --- /dev/null +++ b/functionaltests/pre_test_hook_common.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +DEVSTACK_BASE=/opt/stack/new/devstack diff --git a/functionaltests/pre_test_hook_congress.sh b/functionaltests/pre_test_hook_congress.sh new file mode 100755 index 00000000..d4536fad --- /dev/null +++ b/functionaltests/pre_test_hook_congress.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Install Congress devstack integration +source ./pre_test_hook_common.sh +CONGRESS_BASE=/opt/stack/new/congress/contrib/devstack +cp $CONGRESS_BASE/lib/* $DEVSTACK_BASE/lib +cp $CONGRESS_BASE/extras.d/* $DEVSTACK_BASE/extras.d + diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh index 4044add9..f843a3bc 100755 --- a/functionaltests/run_tests.sh +++ b/functionaltests/run_tests.sh @@ -1,35 +1,5 @@ #!/bin/bash -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# How many seconds to wait for the API to be responding before giving up -API_RESPONDING_TIMEOUT=20 - -if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8082/v1/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then - echo "Murano API failed to respond within ${API_RESPONDING_TIMEOUT} seconds" - exit 1 -fi - -echo "Successfully contacted Murano API" - -# Where tempest code lives -TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} - -# Add tempest source tree to PYTHONPATH -export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR - -#installing requirements for tempest -pip install -r $TEMPEST_DIR/requirements.txt +source ./run_tests_common.sh nosetests -sv ../murano/tests/functional/api/v1 ../murano/tests/functional/cli/simple_read_only - diff --git a/functionaltests/run_tests_common.sh b/functionaltests/run_tests_common.sh new file mode 100755 index 00000000..1e9410e4 --- /dev/null +++ b/functionaltests/run_tests_common.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# Intended be sourced by other scripts + +# How many seconds to wait for the API to be responding before giving up +API_RESPONDING_TIMEOUT=20 + +if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:8082/v1/ 2>/dev/null | grep -q 'Authentication required' ; do sleep 1; done"; then + echo "Murano API failed to respond within ${API_RESPONDING_TIMEOUT} seconds" + exit 1 +fi + +echo "Successfully contacted Murano API" + +# Where tempest code lives +TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} + +# Add tempest source tree to PYTHONPATH +export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR + +#installing requirements for tempest +pip install -r $TEMPEST_DIR/requirements.txt diff --git a/functionaltests/run_tests_congress.sh b/functionaltests/run_tests_congress.sh new file mode 100755 index 00000000..14013c28 --- /dev/null +++ b/functionaltests/run_tests_congress.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +source ./run_tests_common.sh + +nosetests -sv ../murano/tests/functional/engine/test_policy_enf.py \ No newline at end of file