diff --git a/neutronclient/tests/functional/hooks/fwaas b/neutronclient/tests/functional/hooks/fwaas new file mode 100644 index 000000000..0f04168ad --- /dev/null +++ b/neutronclient/tests/functional/hooks/fwaas @@ -0,0 +1,2 @@ +enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas +enable_service q-fwaas \ No newline at end of file diff --git a/neutronclient/tests/functional/hooks/gate_hook.sh b/neutronclient/tests/functional/hooks/gate_hook.sh old mode 100644 new mode 100755 index b44c237f1..9ad05aabf --- a/neutronclient/tests/functional/hooks/gate_hook.sh +++ b/neutronclient/tests/functional/hooks/gate_hook.sh @@ -4,6 +4,26 @@ set -ex VENV=${1:-"functional"} +GATE_DEST=$BASE/new +NEUTRONCLIENT_PATH=$GATE_DEST/python-neutronclient +GATE_HOOKS=$NEUTRONCLIENT_PATH/neutronclient/tests/functional/hooks +DEVSTACK_PATH=$GATE_DEST/devstack + +# Inject config from hook into localrc +function load_rc_hook { + local hook="$1" + config=$(cat $GATE_HOOKS/$hook) + export DEVSTACK_LOCAL_CONFIG+=" +# generated from hook '$hook' +${config} +" +} + +if [ "$VENV" == "functional" ] +then + load_rc_hook fwaas +fi + if [ "$VENV" == "functional-adv-svcs" ] then export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas"