diff options
author | Sastry Isukapalli <sastry@research.att.com> | 2018-03-28 22:21:30 -0400 |
---|---|---|
committer | Sastry Isukapalli <sastry@research.att.com> | 2018-03-28 22:57:12 -0400 |
commit | ab7a87456538e561d60d209fe534c175ddd0269c (patch) | |
tree | 1724b218d148f989cf8e3647bc1bd703526f08c8 /test/functest/scripts | |
parent | ad29f38cbcb164a7f328b26daf789dbff90deb98 (diff) |
Functest scripts, simulators, and payloads
osdf/adapters/policy/utils.py:
Removed duplicated code (group_policies and group_policies_gen are very similar,
and group_policies seems to be not used
osdf/optimizers/placementopt/conductor/api_builder.py:
changed param name from "grouped_policies" to "flat_policies"
tox.ini
added starup and shutdown of simulators (flask app with mock payloads) in tox tests
rest all files/changes in "test/" folder
quite a few payload files
Patch set 2: removed a "print()" statement from simulator code
Issue-ID: OPTFRA-22
Change-Id: I0006c577fc459c7c884b55e8316c689afd151780
Signed-off-by: Sastry Isukapalli <sastry@research.att.com>
Diffstat (limited to 'test/functest/scripts')
-rw-r--r-- | test/functest/scripts/sanity-check-simulators.sh | 11 | ||||
-rwxr-xr-x | test/functest/scripts/start-simulators.sh | 50 | ||||
-rwxr-xr-x | test/functest/scripts/stop-simulators.sh | 37 |
3 files changed, 98 insertions, 0 deletions
diff --git a/test/functest/scripts/sanity-check-simulators.sh b/test/functest/scripts/sanity-check-simulators.sh new file mode 100644 index 0000000..93c5372 --- /dev/null +++ b/test/functest/scripts/sanity-check-simulators.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +for x in policy has-api so-callback; do + curl http://localhost:5000/simulated/healthy/$x + curl http://localhost:5000/simulated/unhealthy/$x + curl http://localhost:5000/simulated/ERROR/$x + curl http://localhost:5000/simulated/success/$x +done + +curl -d '{"A1": "B1"}' http://localhost:5000/simulated/policy/pdp-has-vcpe-good/getConfig +curl -d '{"A1": "B1"}' http://localhost:5000/simulated/oof/has-api/flow1-success-simple/main.json diff --git a/test/functest/scripts/start-simulators.sh b/test/functest/scripts/start-simulators.sh new file mode 100755 index 0000000..11767e0 --- /dev/null +++ b/test/functest/scripts/start-simulators.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# 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 in osdf/test/functest/scripts/ + +SCRIPTDIR=$(dirname $(readlink -f $0)) +FUNC_TEST_DIR=$(dirname $SCRIPTDIR) +TEST_DIR=$(dirname $FUNC_TEST_DIR) +OSDF_DIR=$(dirname $TEST_DIR) +SIMULATORS_DIR=$FUNC_TEST_DIR/simulators + +# Copy policy files from $TEST_DIR/policy-local-files into $SIMULATORS_DIR/policy/response-payloads +( + cd $SIMULATORS_DIR + cp $TEST_DIR/policy-local-files/*.json $SIMULATORS_DIR/policy/response-payloads/pdp-has-vcpe-good +) + + +# start the flask application after linking the code location and config folder +( + cd $SIMULATORS_DIR + ln -s $OSDF_DIR/osdf . + ln -s $SIMULATORS_DIR/simulated-config config + + XPID=$(ps -x | grep "python oof_dependencies_simulators.py" | grep -v grep | awk '{print $1}') + if [ -z "$XPID" ]; then + python oof_dependencies_simulators.py > simulator-logs 2>&1 & + sleep 5 + fi +) + + + diff --git a/test/functest/scripts/stop-simulators.sh b/test/functest/scripts/stop-simulators.sh new file mode 100755 index 0000000..c9dd126 --- /dev/null +++ b/test/functest/scripts/stop-simulators.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# 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 in osdf/test/functest/scripts/ + +# We don't need all the directory names here and the "cd", but it may be needed later on +# Also, it will be a guard against some bad config where the directory doesn't exist + +SCRIPTDIR=$(dirname $(readlink -f $0)) +FUNC_TEST_DIR=$(dirname $SCRIPTDIR) +TEST_DIR=$(dirname $FUNC_TEST_DIR) +OSDF_DIR=$(dirname $TEST_DIR) +SIMULATORS_DIR=$FUNC_TEST_DIR/simulators + +cd $SIMULATORS_DIR + +XPID=$(ps -x | grep "python oof_dependencies_simulators.py" | grep -v grep | awk '{print $1}') +if [ -n "$XPID" ]; then + kill $XPID +fi |