From 6a3e84041e88c77fe47bc3312a3328dcd39117b8 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Wed, 8 Feb 2023 11:23:44 +0000 Subject: Automate S3P tests in Xacml - Trigger XACML S3P tests Issue-ID: POLICY-4156 Change-Id: Id0e43f2553f42f5099f9bcd29084a83afd1133c8 Signed-off-by: Wayne Dunican --- .../src/main/resources/testplans/perf.jmx | 12 +++--- testsuites/run-s3p-test.sh | 49 ++++++++++++++++++++++ .../src/main/resources/testplans/stability.jmx | 12 +++--- 3 files changed, 61 insertions(+), 12 deletions(-) create mode 100755 testsuites/run-s3p-test.sh diff --git a/testsuites/performance/src/main/resources/testplans/perf.jmx b/testsuites/performance/src/main/resources/testplans/perf.jmx index b02dc145..02cb94ff 100644 --- a/testsuites/performance/src/main/resources/testplans/perf.jmx +++ b/testsuites/performance/src/main/resources/testplans/perf.jmx @@ -20,32 +20,32 @@ API_HOST - ${__P(api_ip)} + localhost = PAP_HOST - ${__P(pap_ip)} + localhost = XACML_HOST - ${__P(xacml_ip)} + localhost = API_PORT - ${__P(api_port, 6969)} + ${__P(api_port, 30002)} = PAP_PORT - ${__P(pap_port, 6969)} + ${__P(pap_port, 30003)} = XACML_PORT - ${__P(xacml_port, 6969)} + ${__P(xacml_port, 30004)} = diff --git a/testsuites/run-s3p-test.sh b/testsuites/run-s3p-test.sh new file mode 100755 index 00000000..83fcbe2e --- /dev/null +++ b/testsuites/run-s3p-test.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# ============LICENSE_START======================================================= +# Copyright (C) 2023 Nordix Foundation. All rights reserved. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +#===MAIN===# +if [ -z "${WORKSPACE}" ]; then + export WORKSPACE=$(git rev-parse --show-toplevel) +fi + +export TESTDIR=${WORKSPACE}/testsuites +export XACML_PERF_TEST_FILE=$TESTDIR/performance/src/main/resources/testplans/perf.jmx +export XACML_STAB_TEST_FILE=$TESTDIR/stability/src/main/resources/testplans/stability.jmx + +if [ $1 == "run" ] +then + + mkdir automate-performance;cd automate-performance; + git clone "https://gerrit.onap.org/r/policy/docker" + cd docker/csit + + if [ $2 == "performance" ] + then + bash start-s3p-tests.sh run $XACML_PERF_TEST_FILE; + elif [ $2 == "stability" ] + then + bash start-s3p-tests.sh run $XACML_STAB_TEST_FILE; + else + echo "echo Invalid arguments provided. Usage: $0 [option..] {performance | stability}" + fi + +else + echo "Invalid arguments provided. Usage: $0 [option..] {run | uninstall}" +fi + diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 069f3ec7..4fe780f1 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -20,32 +20,32 @@ API_HOST - ${__P(api_ip)} + localhost = PAP_HOST - ${__P(pap_ip)} + localhost = XACML_HOST - ${__P(xacml_ip)} + localhost = API_PORT - ${__P(api_port, 6969)} + ${__P(api_port, 30002)} = PAP_PORT - ${__P(pap_port, 6969)} + ${__P(pap_port, 30003)} = XACML_PORT - ${__P(xacml_port, 6969)} + ${__P(xacml_port, 30004)} = -- cgit 1.2.3-korg