From: Mariusz Wagner Date: Mon, 18 Mar 2019 11:26:13 +0000 (+0000) Subject: Merge "Fix PRH CSITs with additionalFields" X-Git-Tag: 4.0.0-ONAP~130 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=45f722b43b6860fad063f6b1178e20c0219390af;hp=0a39148c4af6c663035d04f8c0e99afd22fd67b4;p=integration%2Fcsit.git Merge "Fix PRH CSITs with additionalFields" --- diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh index 071213ef..2924bd21 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh @@ -145,4 +145,4 @@ docker exec buscontroller /bin/sh -c "cat /opt/app/dmaapbc/logs/ONAP/application curl -k https://$DR_PROV_IP:8443/internal/prov #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DMAAPBC_IP:${DMAAPBC_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}" \ No newline at end of file +ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAPBC_IP:${DMAAPBC_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}" \ No newline at end of file diff --git a/plans/policy/drools-pdp/setup.sh b/plans/policy/drools-pdp/setup.sh new file mode 100755 index 00000000..a7ed4408 --- /dev/null +++ b/plans/policy/drools-pdp/setup.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Copyright 2017 AT&T Intellectual Property. 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. +# +# Place the scripts in run order: +source ${SCRIPTS}/common_functions.sh + +docker run --name i-mock -d jamesdbloom/mockserver +MOCK_IP=`get-instance-ip.sh i-mock` +echo ${MOCK_IP} + +docker inspect i-mock + +# Wait for initialization +for i in {1..10}; do + curl -sS ${MOCK_IP}:1080 && break + echo sleep $i + sleep $i +done + +${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP} + +source ${WORKSPACE}/scripts/policy/drools-pdp-script.sh + +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" +export PDP_IP=${PDP_IP} +export POLICY_IP=${POLICY_IP} +export DOCKER_IP=${DOCKER_IP} + +#Get current IP of VM +HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') +export HOST_IP=${HOST_IP} diff --git a/plans/usecase-ui-server/testsuite/teardown.sh b/plans/policy/drools-pdp/teardown.sh old mode 100644 new mode 100755 similarity index 57% rename from plans/usecase-ui-server/testsuite/teardown.sh rename to plans/policy/drools-pdp/teardown.sh index 46f5879b..f1f0b21c --- a/plans/usecase-ui-server/testsuite/teardown.sh +++ b/plans/policy/drools-pdp/teardown.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2017 CMCC, Inc. and others. All rights reserved. +# Copyright 2017 AT&T Intellectual Property. 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. @@ -15,8 +15,22 @@ # limitations under the License. # -# This script is sourced by run-csit.sh after Robot test completion. -kill-instance.sh msb_internal_apigateway -kill-instance.sh msb_discovery -kill-instance.sh msb_consul -kill-instance.sh usecase-ui-server +function kill_instance() { +local name=$1 +docker logs "${name}" >> "${WORKSPACE}"/archives/"${name}".log +docker kill "${name}" +docker rm -v "${name}" +} + +mkdir -p "${WORKSPACE}"/archives + +kill_instance i-mock +kill_instance drools +kill_instance pdp +kill_instance brmsgw +kill_instance pap +kill_instance nexus +kill_instance mariadb + +rm -fr "${WORK_DIR}" + diff --git a/plans/usecase-ui-server/testsuite/testplan.txt b/plans/policy/drools-pdp/testplan.txt similarity index 78% rename from plans/usecase-ui-server/testsuite/testplan.txt rename to plans/policy/drools-pdp/testplan.txt index af74191f..ccdc8ff9 100644 --- a/plans/usecase-ui-server/testsuite/testplan.txt +++ b/plans/policy/drools-pdp/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -usecase-ui/server/test.robot +policy/drools-pdp diff --git a/plans/usecase-ui-server/testsuite/setup.sh b/plans/usecase-ui-server/testsuite/setup.sh deleted file mode 100644 index b2641bec..00000000 --- a/plans/usecase-ui-server/testsuite/setup.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2017 CMCC, Inc. and others. 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. -# -# Place the scripts in run order: -# Start all process required for executing test case - -source ${SCRIPTS}/common_functions.sh - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul -MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` -echo MSB_CONSUL_IP=${MSB_CONSUL_IP} - -docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery -MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery` -echo DISCOVERY_IP=${MSB_DISCOVERY_IP} - -docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway -MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway` -echo MSB_IAG_IP=${MSB_IAG_IP} - -# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) -for i in {1..10}; do - curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break - echo sleep $i - sleep $i -done - -# Need some time for the initialization of MSB services -echo sleep 60 -sleep 60 - -# start usecase-ui-server -docker run -d --name usecase-ui-server -v /var/lib/mysql -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/usecase-ui/usecase-ui-server -USECASEUI_IP=`get-instance-ip.sh usecase-ui-server` - -# Wait for initialization -for i in {1..10}; do - curl -sS -m 1 ${USECASEUI_IP}:8901 && break - echo sleep $i - sleep $i -done - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v USECASEUI_IP:${USECASEUI_IP} -v SCRIPTS:${SCRIPTS}" diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 6f9b7591..3b766917 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -#Place the scripts in run order: +# Place the scripts in run order: source ${SCRIPTS}/common_functions.sh CSIT=TRUE @@ -174,7 +174,7 @@ sleep 10 #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT} -v DR_SUBSCIBER_IP:${DR_SUBSCIBER_IP}" -pip install jsonschema uuid +pip install jsonschema uuid simplejson # Wait container ready sleep 2 @@ -232,7 +232,7 @@ export DMAAP_MR_IP=${DMAAP_MR_IP} DFC_POD=$(kubectl -n onap get pods | grep datafile-collector | awk '{print $1}') export DFC_POD=${DFC_POD} -pip install jsonschema uuid +pip install jsonschema uuid simplejson # Clone DMaaP Data Router repo mkdir -p $WORKSPACE/archives/dmaapdr @@ -268,5 +268,4 @@ curl -k https://$DR_PROV_IP:8443/internal/prov #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT} -v DR_SUBSCIBER_IP:${DR_SUBSCIBER_IP} -v DFC_POD:${DFC_POD} -v HOST_IP:${HOST_IP} " -fi; - +fi; \ No newline at end of file diff --git a/scripts/policy/drools-pdp-script.sh b/scripts/policy/drools-pdp-script.sh new file mode 100755 index 00000000..0a128faf --- /dev/null +++ b/scripts/policy/drools-pdp-script.sh @@ -0,0 +1,208 @@ +#!/bin/bash +# +# Copyright 2017-2018 AT&T Intellectual Property. 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. +# +echo "This is ${WORKSPACE}/scripts/policy/drools-pdp-script.sh" + + +# the directory of the script +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +echo ${DIR} + +# the temp directory used, within $DIR +# omit the -p parameter to create a temporal directory in the default location +WORK_DIR=`mktemp -d -p "$DIR"` +echo ${WORK_DIR} + +cd ${WORK_DIR} + +# check if tmp dir was created +if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then + echo "Could not create temp dir" + exit 1 +fi + +# bring down maven +mkdir maven +cd maven +curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz +tar -xzvf apache-maven-3.3.9-bin.tar.gz +ls -l +export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin +${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v +cd .. + +ifconfig + +export IP=`ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}'` +if [ -z "$IP" ]; then + echo "Could not determine IP address" + exit 1 +fi +echo $IP + +if ! ifconfig docker0; then + export DOCKER_IP="$IP" +else + export DOCKER_IP=`ifconfig docker0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` +fi +echo $DOCKER_IP + +git clone http://gerrit.onap.org/r/oparent + +git clone http://gerrit.onap.org/r/policy/engine +cd engine/packages/docker +${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml +docker build -t onap/policy-pe target/policy-pe + +cd ${WORK_DIR} +git clone http://gerrit.onap.org/r/policy/drools-pdp +cd drools-pdp/packages/docker +${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml +docker build -t onap/policy-drools target/policy-drools + +cd ${WORK_DIR} +git clone http://gerrit.onap.org/r/policy/docker +cd docker + +chmod +x config/drools/drools-tweaks.sh + +echo $IP > config/pe/ip_addr.txt +ls -l config/pe/ip_addr.txt +cat config/pe/ip_addr.txt + +export MTU=9126 + +export PRELOAD_POLICIES=false +docker-compose -f docker-compose-integration.yml up -d + +if [ ! $? -eq 0 ]; then + echo "Docker compose failed" + exit 1 +fi + +docker ps + +POLICY_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' drools` +echo ${POLICY_IP} + +PDP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pdp` +echo ${PDP_IP} + +PAP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pap` +echo ${PAP_IP} + +BRMS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' brmsgw` +echo ${BRMS_IP} + +NEXUS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' nexus` +echo ${NEXUS_IP} + +MARIADB_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' mariadb` +echo ${MARIADB_IP} + +sleep 3m + +docker logs mariadb 2>&1 | grep -q "mysqld: ready for connections" +if [ $? -eq 0 ]; then + # mariadb is ok - sleep a little longer for others + sleep 2m + +else + echo mariadb is not ready + echo Restarting... + + docker kill drools pdp pap brmsgw nexus mariadb + docker rm -f drools pdp pap brmsgw nexus mariadb + + docker-compose -f docker-compose-integration.yml up -d + + if [ ! $? -eq 0 ]; then + echo "Docker compose failed" + exit 1 + fi + + docker ps + + POLICY_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' drools` + echo ${POLICY_IP} + + PDP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pdp` + echo ${PDP_IP} + + PAP_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' pap` + echo ${PAP_IP} + + BRMS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' brmsgw` + echo ${BRMS_IP} + + NEXUS_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' nexus` + echo ${NEXUS_IP} + + MARIADB_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' mariadb` + echo ${MARIADB_IP} + + sleep 5m +fi + +netstat -tnl + +docker logs mariadb +${DIR}/wait_for_port.sh ${MARIADB_IP} 3306 + +docker logs pap +${DIR}/wait_for_port.sh ${PAP_IP} 9091 + +docker logs pdp +${DIR}/wait_for_port.sh ${PDP_IP} 8081 + +docker logs brmsgw +${DIR}/wait_for_port.sh ${BRMS_IP} 9989 + +docker logs nexus +${DIR}/wait_for_port.sh ${NEXUS_IP} 8081 + +docker logs drools +${DIR}/wait_for_port.sh ${POLICY_IP} 9696 + +TIME_OUT=600 +INTERVAL=20 +TIME=0 +while [ "$TIME" -lt "$TIME_OUT" ]; do + curl -k -i --user "demo@people.osaaf.org:demo123456!" -H "ContentType: application/json" -H "Accept: application/json" https://${POLICY_IP}:9696/healthcheck && break + + echo Sleep: $INTERVAL seconds before testing if Policy is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds + sleep $INTERVAL + TIME=$(($TIME+$INTERVAL)) + +done + +TIME_OUT=600 +INTERVAL=20 +TIME=0 +while [ "$TIME" -lt "$TIME_OUT" ]; do + + curl -k -i -v -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'ClientAuth: cHl0aG9uOnRlc3Q=' -H 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' -H 'Environment: TEST' -d '{"policyName": ".*"}' https://${PDP_IP}:8081/pdp/api/getConfig && break + +echo Sleep: $INTERVAL seconds before testing if Policy is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds + sleep $INTERVAL + TIME=$(($TIME+$INTERVAL)) + +done + +# +# Add more sleep for everything to settle +# +sleep 3m diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml index 989b241f..4d20d4b4 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml @@ -1,678 +1,88 @@ - - - - - - - - - - - - pmLicConnectedUsersLevSamp - pmPagS1Discarded - pmRrcConnBrEnbMax - pmLic5MHzSectorCarrierActual - pmLic5Plus5MHzScTddActual - pmZtemporary34 - pmLicDlCapLicense - pmPagS1EdrxReceived - pmZtemporary35 - pmLicConnectedUsersLevSum - pmLicDlPrbCapLicense - pmPagS1RecDistr - pmRrcConnBrEnbLevSamp - pmLicUlPrbCapLicense - pmPagS1EdrxDiscarded - pmRimAssocMax - pmLicUlCapLicense - pmLicConnectedUsersDistr - pmMoFootprintMax - pmLic5Plus5MHzScFddActual - pmLicConnectedUsersTimeCong - pmPagS1Received - pmPagS1DiscDistr - pmRimReportErr - pmLicConnectedUsersMax - pmRrcConnBrEnbLevSum - pmLicConnectedUsersActual - pmLicConnectedUsersLicense - + + + + + + + + + + + + attTCHSeizures + succTCHSeizures + attImmediateAssignProcs + succImmediateAssignProcs + + 234 + 345 + 567 + 789 + + + 890 + 901 + 123 + 234 + + + 456 + 567 + 678 + 789 + true + + + + + + + attTCHSeizures1 + succTCHSeizures2 + attImmediateAssignProcs3 + succImmediateAssignProcs4 + 4 - 6 - 68 - 2759 - 2738 - 50 - 20 - 8 - 45 - 9 - 87 86,87,2,6,77,96,75,33,24 40 90 - 2 - 98 - 75 - 36,30,45,68,74,44,64,83,17,52,36,99,46,59,71,24,49,33,83,75,43,30,74,28 - 83 - 2634 - 10 - 69 - 58,2,40,80,81,47,73,100,91 - 32 - 37 - 16 - 38 - 92 false - - - - - pmHoExeSuccLteInterFRedirectCsg - pmHoPrepSuccNonMob - pmZtemporary73 - pmHoOscInterF - pmLbQualifiedUe - pmHoPrepAttLteInterFRedirectCsg - pmZtemporary74 - pmLbTpAcceptedUe - pmHoExeSuccLteInterF - pmHoExeAttLteIntraFTuneOut - pmHoPrepSuccLteIntraF - pmLbTpEvalUe - pmHoPrepAttLteInterFMbms - pmHoExeAttLteSpifho - pmCaRedirectQualifiedUe - pmHoWrongCellReestIntraF - pmAtoQualifiedUe - pmHoWrongCellInterF - pmHoExeAttLteInterFMbms - pmHoExeAttLteIntraF - pmZtemporary76 - pmHoExeAttNonMob - pmHoExeSuccNonMob - pmHoTooEarlyHoIntraF - pmCaRedirectMeasRepUe - pmHoPrepSuccLteInterFUl - pmHoExeSuccLteInterFLb - pmHoExeSuccLteIntraF - pmHoExeSuccLteInterFMbms - pmHoWrongCellReestInterF - pmHoPrepSuccLteInterFRedirectCsg - pmHoExeAttLteInterFRedirectCsg - pmSpifhoReportedUe - pmZtemporary75 - pmZtemporary79 - pmHoPrepAttLteSpifho - pmAtoMeasRepUe - pmHoTooEarlyHoInterF - pmZtemporary78 - pmHoPrepAttLteInterFUl - pmHoExeOutAttLteInterFQci1 - pmHoExeAttLteInterF - pmZtemporary36 - pmZtemporary77 - pmHoPrepAttLteInterF - pmHoPrepSuccLteInterFCaRedirect - pmHoPrepSuccLteInterFLb - pmZtemporary72 - pmHoExeSuccLteIntraFTuneOut - pmHoExecSuccLteInterFCaRedirect - pmHoExecAttLteInterFCaRedirect - pmHoPrepAttLteInterFLb - pmHoOscIntraF - pmHoPrepAttLteIntraF - pmHoPrepSuccLteInterF - pmHoTooLateHoInterF - pmHoPrepAttLteInterFCaRedirect - pmHoExeAttLteInterFLb - pmHoTooLateHoIntraF - pmHoPrepSuccLteInterFMbms - pmHoPrepAttNonMob - pmLbTpUlAcceptedUe - pmHoExeSuccLteSpifho - pmHoExeOutSuccLteInterFQci1 - pmLbMeasRepUe - pmHoPrepSuccLteSpifho - pmHoWrongCellIntraF - - 2 - 5 - 91 - 4 - 37 - 57 - 23 - 57 - 94 - 1 - 88 - 88 - 92 - 54 - 43 - 15 - 97 - 58 - 40 - 57 - 24 - 94 - 92 - 40 - 2 - 52 - 17 - 70 - 40 - 24 - 64 - 49 - 11 - 52 - 74 - 73 - 45 - 26 - 74 - 16 - 80 - 41 - 99 - 36 - 73 - 86 - 92 - 49 - 22 - 36 - 43 - 98 - 74 - 23 - 76 - 78 - 22 - 57 - 37 - 78 - 56 - 21 - 44 - 70 - 6 - 29 - 75 - false - - - 22 - 59 - 10 - 79 - 17 - 20 - 47 - 92 - 41 - 11 - 6 - 9 - 54 - 37 - 8 - 66 - 96 - 65 - 66 - 91 - 44 - 73 - 86 - 7 - 33 - 54 - 97 - 54 - 39 - 3 - 28 - 20 - 65 - 85 - 59 - 53 - 41 - 9 - 60 - 65 - 55 - 12 - 83 - 44 - 96 - 30 - 16 - 64 - 58 - 53 - 80 - 58 - 66 - 13 - 51 - 44 - 93 - 82 - 38 - 38 - 17 - 26 - 64 - 49 - 63 - 43 - 46 - false - - - 78 - 37 - 1 - 11 - 85 - 26 - 13 - 1 - 75 - 3 - 92 - 4 - 33 - 93 - 41 - 70 - 14 - 52 - 81 - 82 - 72 - 38 - 26 - 52 - 65 - 93 - 59 - 59 - 70 - 3 - 22 - 40 - 94 - 19 - 92 - 11 - 73 - 51 - 6 - 71 - 43 - 64 - 49 - 88 - 74 - 15 - 67 - 42 - 94 - 16 - 10 - 38 - 18 - 7 - 20 - 99 - 51 - 87 - 69 - 74 - 34 - 74 - 8 - 15 - 66 - 84 - 71 - false - - - 70 - 3 - 65 - 56 - 36 - 62 - 97 - 82 - 18 - 82 - 41 - 80 - 31 - 84 - 44 - 34 - 78 - 35 - 3 - 76 - 41 - 64 - 51 - 30 - 49 - 56 - 72 - 25 - 43 - 51 - 84 - 99 - 71 - 74 - 28 - 44 - 28 - 47 - 43 - 78 - 56 - 7 - 66 - 65 - 29 - 19 - 47 - 48 - 21 - 25 - 32 - 58 - 64 - 88 - 23 - 22 - 98 - 37 - 80 - 52 - 30 - 27 - 26 - 65 - 71 - 91 - 64 - false - - - - - - - pmCaRedirectMeasuredUe - pmMbmsInterestIndicationNonServ - pmMbmsInterestIndication - pmLbMeasuredUe - pmMbmsInterestIndicationPCell - pmMbmsInterestIndicationSCell - pmSpifhoMeasuredUe - pmAtoMeasuredUe - - 14 - 25 - 60 - 63 - 10 - 71 - 16 - 43 - false - - - - - - - pmPowerConsumption - pmVoltage - pmConsumedEnergy - pmConsumedEnergyAccumulated - - 44,88,3,61,33,74,92,10,14,83,96,34,13,7,6,92,77,1,69,5,85,19,11,11,12,56,93,94,0,48,96,50,83,20,66,31,90,9,97,11,30,40,89,20,64,84,7,24,76,61,5,39,55,39,31,70,96,58,38,38,39,48,20,55,9,71,49,56,39,59,91,45,2,81,5,31,35,34,8,91,20,65,8,57,89,45,5,83,12,55,84,3,20,54,73,96,45,35,99,52,42,17,92,47,86,87,29,93,34,59,66,50,46,40,84,76,72,90,75,28,98,87,36,44,24,0,57,35,77,34,29,69,90,86,47,61,76,39,22,59,15,4,80,7,99,83,54,25,25,53 - 19,69,83,75,92,1,65,86,80,24,2,89,61,38,47,76,4,80,19,57,76,28,74,20,19,49,10,99,50,98,7,57,2,1,28,97,92,56,39,48,33,72,58,86,77,91,15,14,78,50,10,78,67,5,76,98,50,4,80,38,13,16,63,27,68,72,95,33,98,60,50,26,91,52,61,57,89,23,81,10,54,85,30,25,69,54,86,28,33,67,1,92,61,38,78,24,78,49,65,15,39,71,49,70,2,20,33,39,9,23,94,25,95,40,66,13,59,91,27,27,16,63,81,84,68,84,87,21,86,70,69,55,97,66,35,49,7,70,37,69,51,42,13,5,84,1,63,47,77,71 - 39 - 2460 - false - - - - - - - ifHCOutBroadcastPkts - ifHCOutUcastPkts - ifOutErrors - ifHCInUcastPkts - ifInErrors - ifHCInBroadcastPkts - ifOutDiscards - ifInUnknownTags - ifInOctetRatePercentiles - ifHCInMulticastPkts - ifHCOutOctets - ifHCInOctets - ifInUnknownProtos - ifTotalLossOfSignalDuration - ifInDiscards - ifHCOutMulticastPkts - ifMaxLossOfSignalDuration - ifHCLossOfSignal - ifOutOctetRatePercentiles - ifMinLossOfSignalDuration - - 86 - 67 - 14 - 17 - 5 - 6 - 82 - 51 - 72,28,74,73,54,70,74 - 98 - 35 - 96 - 90 - 43 - 24 - 36 - 93 - 21 - 67,33,63,55,85,18,76 - 63 - false - - - - - - - pmZtemporary222 - pmEranCaPartnerBlock - pmEenbPktLateDlCa - pmCaCrntiUnavail - pmEenbPktLostDlCa - pmEenbPktDiscDlCa - pmZtemporary223 - pmEenbPktTransDlCa - pmEenbPktRecDlCa - pmZtemporary206 - - 30 - 66 - 51 - 20 - 95 - 69 - 83 - 0 - 100 - 44 - false - - - - - - - pmRimAssocAtt - pmRimAssocAttRetry - pmRimUpdateReceived - pmRimAssocRemoved - pmZtemporary99 - pmZtemporary98 - pmRimAssocTO - pmRimAssocSucc - pmRimUpdateAckSent - pmRimReportErr - - 89 - 4 - 70 - 48 - 89 - 72 - 38 - 1 - 2 - 10 - false - - - - - - - pmRimAssocSucc - pmRimAssocRemoved - pmZtemporary100 - pmRimUpdateReceived - pmRimAssocTO - pmRimUpdateAckSent - pmZtemporary101 - pmRimAssocAttRetry - pmRimReportErr - pmRimAssocAtt - - 62 - 46 - 45 - 68 - 39 - 37 - 81 - 19 - 73 - 49 - false - - - - - - - pmCapacityOfNodeBUlCeExt - pmCapacityOfNodeBDlCe - pmCapacityNodeBLimitUlCe - pmCapacityNodeBLimitDlCe - pmCapacityOfNodeBUlCe - - 51,27,56,76,61,76,24,1,24,52,61,6,85,94,53,97,14,80,60,79,58,88,69,81,98,94,78,70,26,10,61,9,94,46,33,55,51,3,31,67,11,39,33,22,3,9,94 - 14,46,49,30,86,1,55,50,52,41 - 2620 - 2849 - 87,4,90,14,22,9,36,94,60,72 - false - - - - - - - pmSumCapacityUlCe - pmSetupRejSwLoad - pmCapacityOfDlCe - pmCapacityOfUlCeExt - pmCapacityAllocAttDlCe - pmNoUlHwLimitEul - pmCapacityLimitDlCe - pmCapacityAllocRejDlCe - pmSetupAttempts - pmCpcUlActivityFactor - pmSumCapacityUlCeEulFach - pmCapacityOfUlCe - pmCapacityAllocAttUlCe - pmSamplesCapacityUlCe - pmCapacityAllocRejUlCe - pmIsUsersRatio - pmSamplesCapacityDlCe - pmSumCapacityUlCeStatic - pmCapacityUlCeEulFach - pmHwCePoolEul - pmSetupFailures - pmCapacityLimitUlCe - pmStaticHwCePoolEul - pmSumCapacityDlCe - pmSamplesCapacityUlCeStatic - - 91 - 5 - 61,11,27,47,65,88,67,59,78,51 - 97,81,23,87,89,44,11,68,77,0,72,5,45,11,11,56,11,1,87,86,83,5,36,37,82,25,99,77,5,72,90,23,74,99,53,72,48,13,52,24,90,74,2,15,63,96,27 - 2 - 72 - 2503 - 70 - 24 - 33,38,12,21,91,0,52,84,99,32,40,8,15,39,92,27,41,43,63,41 - 93 - 10,100,48,71,68,59,69,36,64,66 - 14 - 88 - 75 - 18 - 84 - 17 - 90,24,50,62,83,25,7,36,85,70,63 - 6,63,96,1,94,85,82,17,30,46,39,59,11,14,7,60,61,36,1,39,20,82,77,95,50,26,43,81,2,95,84,32,1,70,31,48,11,24,2,43,74,94,46,99,63,47,68,28,62,22,54,91,84,81,46,50,45,32,25,100,14,67,86,62,85,22,80,18,19,21,45,59,41,81,70,65,43,28,93,91,36,20,17,56,9,78,31,98,44,97,45,2,72,85,61,65,21,23,95,36,90,10,19,60,41,96,84,25,96,91,33,73,48,46,92,82,8,80,8,88,21,95,61,86,58,89,48,86,63 - 83 - 2824 - 7,66,20,8,41,18,98,71,57,28,13,53,53,77,70,31,99,62,50,19,63,3,75,43,17,91,30,34,21,62,77,67,90,11,66,11,77,51,27,55,95,66,98,45,67,60,76,42,55,94,17,87,61,8,52,24,71,7,36,5,73,63,59 - 38 - 65 - false - - - - - - - \ No newline at end of file + + + + + attTCHSeizures5 + succTCHSeizures6 + attImmediateAssignProcs7 + succImmediateAssignProcs8 + + 238 + 344 + 563 + 787 + + + 898 + 905 + 127 + 238 + + + 454 + 569 + 672 + 785 + true + + + + + + + diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/meas_result.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/A_meas_result.xml similarity index 100% rename from tests/dcaegen2-pmmapper/pmmapper/assets/meas_result.xml rename to tests/dcaegen2-pmmapper/pmmapper/assets/A_meas_result.xml diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/no_managed_element.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_managed_element.xml similarity index 100% rename from tests/dcaegen2-pmmapper/pmmapper/assets/no_managed_element.xml rename to tests/dcaegen2-pmmapper/pmmapper/assets/A_no_managed_element.xml diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/no_measdata.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_measdata.xml similarity index 100% rename from tests/dcaegen2-pmmapper/pmmapper/assets/no_measdata.xml rename to tests/dcaegen2-pmmapper/pmmapper/assets/A_no_measdata.xml diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json b/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json new file mode 100644 index 00000000..0abf8e3e --- /dev/null +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "gnb", + "vendorName": "Anon", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" + } \ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json new file mode 100644 index 00000000..4bd48839 --- /dev/null +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json @@ -0,0 +1,41 @@ +{ + "pm-mapper-filter": { + "filters":[{ + "pmDefVsn": "1.0", + "nfType": "5G", + "vendor": "Ericsson", + "measTypes": ["attTCHSeizures","succImmediateAssignProcs"] + }] + }, + "streams_subscribes": { + "dmaap_subscriber": { + "type": "data_router", + "aaf_username": null, + "aaf_password": null, + "dmaap_info": { + "location": "csit-pmmapper", + "delivery_url": "http://3gpppmmapper:8081/delivery", + "username": "username", + "password": "password", + "subscriber_id": "subscriber_id" + } + } + }, + "streams_publishes": { + "dmaap_publisher": { + "type": "message_router", + "aaf_password": null, + "dmaap_info": { + "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper", + "client_role": "org.onap.dmaap.client.pub", + "location": "csit-pmmapper", + "client_id": null + }, + "aaf_username": null + } + }, + "dmaap_dr_feed_id": "1", + "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", + "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete", + "services_calls": {} +} \ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json b/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json index 3a2340f2..da809d7b 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json @@ -1,5 +1,5 @@ { - "productName": "NrRadio", + "productName": "gnb", "vendorName": "Ericsson", "lastEpochMicrosec": "1538478000000", "sourceName": "oteNB5309", diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json new file mode 100644 index 00000000..fff43a15 --- /dev/null +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json @@ -0,0 +1,41 @@ +{ + "pm-mapper-filter": { + "filters":[{ + "pmDefVsn": "1.0", + "nfType": "5G", + "vendor": "Ericsson", + "measTypes": [] + }] + }, + "streams_subscribes": { + "dmaap_subscriber": { + "type": "data_router", + "aaf_username": null, + "aaf_password": null, + "dmaap_info": { + "location": "csit-pmmapper", + "delivery_url": "http://3gpppmmapper:8081/delivery", + "username": "username", + "password": "password", + "subscriber_id": "subscriber_id" + } + } + }, + "streams_publishes": { + "dmaap_publisher": { + "type": "message_router", + "aaf_password": null, + "dmaap_info": { + "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper", + "client_role": "org.onap.dmaap.client.pub", + "location": "csit-pmmapper", + "client_id": null + }, + "aaf_username": null + } + }, + "dmaap_dr_feed_id": "1", + "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", + "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete", + "services_calls": {} +} \ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot index bc32673d..311ee433 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot +++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot @@ -15,15 +15,20 @@ ${CLI_EXEC_CLI_SUBS} curl -k https://${DR_PROV_IP}:8443/inte ${PMMAPPER_BASE_URL} http://${PMMAPPER_IP}:8081 ${DELIVERY_ENDPOINT} /delivery ${HEALTHCHECK_ENDPOINT} /healthcheck -${NO_MANAGED_ELEMENT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/no_managed_element.xml -${NO_MEASDATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/no_measdata.xml -${MEASD_RESULT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/meas_result.xml +${NO_MANAGED_ELEMENT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_managed_element.xml +${NO_MEASDATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_measdata.xml +${MEASD_RESULT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_meas_result.xml ${VALID_METADATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json +${DIFF_VENDOR_METADATA} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json ${CLI_EXEC_CLI_PM_LOG} docker exec pmmapper /bin/sh -c "tail -5 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" -${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1/pm.xml +${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1/A20181002.0000-1000-0015-1000_5G.xml ${PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml ${PUBLISH_CONTENT_TYPE} application/octet-stream - +${CLI_EXEC_VENDOR_FILTER} curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json +${CLI_EXEC_PM_FILTER} curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json +${CLI_RESTART_PMMAPPER} docker restart pmmapper +${CLI_DELETE_SUB1} curl -i -X DELETE -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:DGL" -k https://localhost:8443/subs/1 +${CLI_DELETE_SUB2} curl -i -X DELETE -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:DGL" -k https://localhost:8443/subs/2 *** Test Cases *** @@ -74,8 +79,8 @@ Verify 3GPP PM Mapper received pushed PM data from Data Router ${valid_metatdata} Get File ${VALID_METADATA_PATH} ${resp}= PutCall ${PUBLISH_NODE_URL} 3 ${PM_DATA} ${PUBLISH_CONTENT_TYPE} ${valid_metatdata.replace("\n","")} pmmapper VerifyResponse ${resp.status_code} 204 - Sleep 10s - CheckLog ${CLI_EXEC_CLI_PM_LOG} XML validation successful + Sleep 10s + CheckLog ${CLI_EXEC_CLI_PM_LOG} Event Processed CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=3 Verify that PM Mapper logs successful when a file that contains measdata is provided @@ -85,7 +90,7 @@ Verify that PM Mapper logs successful when a file that contains measdata is prov ${valid_meas_result_content}= Get File ${MEASD_RESULT_PATH} ${valid_metatdata} Get File ${VALID_METADATA_PATH} ${headers}= Create Dictionary X-ONAP-RequestID=4 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=4 X-DMAAP-DR-META=${valid_metatdata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/filename data=${valid_meas_result_content} headers=${headers} + ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_meas_result.xml data=${valid_meas_result_content} headers=${headers} VerifyResponse ${resp.status_code} 200 CheckLog ${CLI_EXEC_CLI_PM_LOG} XML validation successful CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=4 @@ -97,7 +102,7 @@ Verify that PM Mapper logs successful when a file that contains no measdata is p ${valid_no_measdata_content}= Get File ${NO_MEASDATA_PATH} ${valid_metatdata} Get File ${VALID_METADATA_PATH} ${headers}= Create Dictionary X-ONAP-RequestID=5 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=3 X-DMAAP-DR-META=${valid_metatdata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/filename data=${valid_no_measdata_content} headers=${headers} + ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_no_measdata.xml data=${valid_no_measdata_content} headers=${headers} VerifyResponse ${resp.status_code} 200 CheckLog ${CLI_EXEC_CLI_PM_LOG} XML validation successful CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=5 @@ -109,11 +114,28 @@ Verify that PM Mapper throws Event failed validation against schema error when n ${no_managed_element_content}= Get File ${NO_MANAGED_ELEMENT_PATH} ${valid_metatdata} Get File ${VALID_METADATA_PATH} ${headers}= Create Dictionary X-ONAP-RequestID=6 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=2 X-DMAAP-DR-META=${valid_metatdata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/filename data=${no_managed_element_content} headers=${headers} + ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_no_managed_element.xml data=${no_managed_element_content} headers=${headers} VerifyResponse ${resp.status_code} 200 CheckLog ${CLI_EXEC_CLI_PM_LOG} XML validation failed CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=6 +Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering. + [Tags] PM_MAPPER_10 + [Documentation] Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering. + [Timeout] 1 minute + ${cli_cmd_output}= Run Process ${CLI_EXEC_VENDOR_FILTER} shell=yes + Should Be Equal As Strings ${cli_cmd_output.rc} 0 + ${cli_cmd_output}= Run Process ${CLI_DELETE_SUB1} shell=yes + Should Be Equal As Strings ${cli_cmd_output.rc} 0 + ${cli_cmd_output}= Run Process ${CLI_RESTART_PMMAPPER} shell=yes + Sleep 10s + ${valid_meas_result_content}= Get File ${MEASD_RESULT_PATH} + ${diff_vendor_metadata}= Get File ${DIFF_VENDOR_METADATA} + ${headers}= Create Dictionary X-ONAP-RequestID=7 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=2 X-DMAAP-DR-META=${diff_vendor_metadata.replace("\n","")} + ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_meas_result.xml data=${valid_meas_result_content} headers=${headers} + CheckLog ${CLI_EXEC_CLI_PM_LOG} Metadata does not match any filters, + CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=7 + *** Keywords *** @@ -129,7 +151,6 @@ PutCall ${resp}= Evaluate requests.put('${url}', data="""${data}""", headers=${headers}, verify=False, allow_redirects=False) requests [Return] ${resp} - CheckLog [Arguments] ${cli_exec_log_Path} ${string_to_check_in_log} ${cli_cmd_output}= Run Process ${cli_exec_log_Path} shell=yes diff --git a/tests/policy/drools-pdp/drools-pdp-test.robot b/tests/policy/drools-pdp/drools-pdp-test.robot new file mode 100644 index 00000000..fdb46a92 --- /dev/null +++ b/tests/policy/drools-pdp/drools-pdp-test.robot @@ -0,0 +1,17 @@ +*** Settings *** +Library Collections +Library RequestsLibrary +Library OperatingSystem +Library json + +*** Test Cases *** +Alive + [Documentation] Runs Policy PDP Alive Check + ${auth}= Create List demo@people.osaaf.org demo123456! + Log Creating session https://${POLICY_IP}:9696 + ${session}= Create Session policy https://${POLICY_IP}:9696 auth=${auth} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= Get Request policy /policy/pdp/engine headers=${headers} + Log Received response from policy ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Be Equal As Strings ${resp.json()['alive']} True diff --git a/tests/usecase-ui/server/test.robot b/tests/usecase-ui/server/test.robot deleted file mode 100644 index cae75c4f..00000000 --- a/tests/usecase-ui/server/test.robot +++ /dev/null @@ -1,14 +0,0 @@ -*** settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -Library json -Library HttpLibrary.HTTP - -*** Variables *** -@{return_ok_list}= 200 201 202 204 - -*** Test Cases *** -MonitorSwaggerTest - [Documentation] query Monitor swagger info rest test - Should Be Equal 2.0 2.0