From 44762cca7017b03a2832c16e389384bed91abffd Mon Sep 17 00:00:00 2001 From: rajendrajaiswal Date: Wed, 31 Jul 2019 15:45:04 +0000 Subject: [PATCH] Update to Setup and Testcases due to PM Mapper dmaap plugin feature Change-Id: I81945e730019a6035e838b71094eb8616eaee235 Issue-ID: DCAEGEN2-1581 Signed-off-by: rajendrajaiswal --- .../5G-bulkpm/composefile/docker-compose-e2e.yml | 2 +- plans/usecases/5G-bulkpm/setup.sh | 16 +++++++++++----- plans/usecases/5G-bulkpm/teardown.sh | 3 --- tests/usecases/5G-bulkpm/BulkpmE2E.robot | 14 +++++--------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index 59da2d9f..35340551 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -86,7 +86,7 @@ services: ports: - "8433:8433" extra_hosts: - - "dmaap-dr-node:DR_NODE_IP" + - "dmaap-dr-node:5.5.5.5" consul: container_name: consul diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 1bba4f30..31ac2272 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -136,7 +136,7 @@ export DMAAP_MR_IP=${DMAAP_MR_IP} # Data File Collector configuration : -sed -i 's/DR_NODE_IP/'$DR_NODE_IP'/g' docker-compose.yml +sed -i 's/5.5.5.5/'$DR_NODE_IP'/g' docker-compose.yml cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/ sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json @@ -157,7 +157,7 @@ sleep 2 # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' cbs) ] + [ $(docker inspect --format '{{ .State.Running }}' cbs) ] then echo "Data Router, Consul, Config Binding Service Services Running" break @@ -201,7 +201,7 @@ cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapp CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs) sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml -sed -i 's/4.4.4.4/'$DMAAP_MR_IP'/g' docker-compose.yml +sed -i 's/4.4.4.4/'$MARIADB'/g' docker-compose.yml docker-compose up -d cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose @@ -221,19 +221,25 @@ docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass pmmapper docker restart pmmapper sleep 5 +# Simulation setup for Message Router +docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js mariadb:/ +docker exec mariadb /bin/bash -c "apt update" +sleep 2 +docker exec mariadb /bin/bash -c "apt install nodejs -y" +sleep 10 +docker exec mariadb /bin/bash -c "nodejs mrserver.js &" & + # Create PM Mapper feed and create PM Mapper subscriber on data router #curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 # Create PM Mapper tocic in Message Router -curl -v -X POST http://${DMAAP_MR_IP}:3904/topics/create -d @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json -H "Content-Type: application/json" PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log cat /tmp/pmmapper.log docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv" sleep 10 curl -k https://$DR_PROV_IP:8443/internal/prov -curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 #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 SFTP_IP:${SFTP_IP}" diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh index 782a289c..73aaf3bd 100644 --- a/plans/usecases/5G-bulkpm/teardown.sh +++ b/plans/usecases/5G-bulkpm/teardown.sh @@ -7,9 +7,6 @@ sleep 3 echo "===== PM MAPPER LOG ========" cat /tmp/pmmapper_docker.log.robot sleep 2 -echo "===== MR LOG ========" -cat /tmp/mr.log -sleep 2 kill-instance.sh $DMAAP kill-instance.sh $KAFKA kill-instance.sh $ZOOKEEPER diff --git a/tests/usecases/5G-bulkpm/BulkpmE2E.robot b/tests/usecases/5G-bulkpm/BulkpmE2E.robot index cac93f7f..e89d4d67 100644 --- a/tests/usecases/5G-bulkpm/BulkpmE2E.robot +++ b/tests/usecases/5G-bulkpm/BulkpmE2E.robot @@ -24,9 +24,7 @@ ${CLI_EXEC_CLI_FILECONSUMER_CP} docker cp fileconsumer-node:/opt/app/su ${CLI_EXEC_RENAME_METADATA} mv %{WORKSPACE}/A20181002.0000-1000-0015-1000_5G.xml.M %{WORKSPACE}/metadata.json ${CLI_EXEC_CLI_PMMAPPER_LOG} docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper_docker.log.robot ${CLI_EXEC_CLI_PMMAPPER_LOG_GREP} grep "XML validation successful Event" /tmp/pmmapper_docker.log.robot -${CLI_EXEC_MR_PMMAPPER_TOPIC} curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 > /tmp/mr.log -${CLI_EXEC_CLI_PMMAPPER_TOPIC_LOG_GREP} grep "perf3gpp_RnNode-Ericsson_pmMeasResult" /tmp/mr.log - +${CLI_EXEC_CLI_PMMAPPER_LOG_GREP_VES} grep "Successfully published VES events to messagerouter" /tmp/pmmapper_docker.log.robot ${metadataSchemaPath} %{WORKSPACE}/tests/usecases/5G-bulkpm/assets/metadata.schema.json ${metadataJsonPath} %{WORKSPACE}/metadata.json @@ -115,13 +113,11 @@ Verify PM-Mapper successfully receives uncompressed the PM XML file Should Be Equal As Strings ${cli_cmd_output.rc} 0 Should Contain ${cli_cmd_output.stdout} XML validation successful Event -Verify PM-Mapper successfully publishes PMMeasResult VES onto the Message Router Topic PM_MAPPER +Verify PM-Mapper successfully publishes VES event the Message Router [Tags] Bulk_PM_E2E_08 [Documentation] Check that PM-Mapper publishes VES onto the Message Router - ${cli_cmd_output}= Run Process ${CLI_EXEC_MR_PMMAPPER_TOPIC} shell=yes - Log ${cli_cmd_output.stdout} - Should Be Equal As Strings ${cli_cmd_output.rc} 0 - ${cli_cmd_output}= Run Process ${CLI_EXEC_CLI_PMMAPPER_TOPIC_LOG_GREP} shell=yes + ${cli_cmd_output}= Run Process ${CLI_EXEC_CLI_PMMAPPER_LOG} shell=yes Log ${cli_cmd_output.stdout} Should Be Equal As Strings ${cli_cmd_output.rc} 0 - Should Contain ${cli_cmd_output.stdout} perf3gpp_RnNode-Ericsson_pmMeasResult \ No newline at end of file + ${cli_cmd_output}= Run Process ${CLI_EXEC_CLI_PMMAPPER_LOG_GREP_VES} shell=yes + Should Contain ${cli_cmd_output.stdout} Successfully published VES events to messagerouter \ No newline at end of file -- 2.16.6