summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>2016-07-20 03:09:51 +0900
committerHirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>2016-07-20 03:09:51 +0900
commit6bc4685f6b50fb8883c67b7f80b12ced6228d27b (patch)
tree62db22feeb184db2699b1344f17cfd1f261361b3
parent20047f2ad04dfcb4bc8d481fcb8c5b3f96157a60 (diff)
downloadpython-neutronclient-6bc4685f6b50fb8883c67b7f80b12ced6228d27b.tar.gz
Add functional test hook for fwaas command
This patch adds a hook into functional test so that fwaas command test runs. Change-Id: Ib4ba644b22db0df91a9b0c7011b46ece337198af Closes-Bug: #1604510
-rw-r--r--neutronclient/tests/functional/hooks/fwaas2
-rwxr-xr-x[-rw-r--r--]neutronclient/tests/functional/hooks/gate_hook.sh20
2 files changed, 22 insertions, 0 deletions
diff --git a/neutronclient/tests/functional/hooks/fwaas b/neutronclient/tests/functional/hooks/fwaas
new file mode 100644
index 0000000..0f04168
--- /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
index b44c237..9ad05aa 100644..100755
--- 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"