From a2c1ca2f3d6eeddd32753b0742ab32e26ee02fbc Mon Sep 17 00:00:00 2001 From: rajendrajaiswal Date: Sun, 30 Sep 2018 16:42:27 +0100 Subject: Added New Test for File Consumer Issue-ID: INT-649 Change-Id: Ia209db425655fbcb9510a5a4154a354d04c8f57f Signed-off-by: Rajendra Jaiswal --- plans/usecases/5G-bulkpm/setup.sh | 6 ++++-- plans/usecases/5G-bulkpm/teardown.sh | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'plans') diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index c35df72f..03943451 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -6,7 +6,6 @@ source ${SCRIPTS}/common_functions.sh mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master -git pull cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ @@ -126,6 +125,7 @@ sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json docker cp /tmp/datafile_endpoints.json dfc:/config/ docker restart dfc +docker exec dfc /bin/sh -c "echo '${DR_NODE_IP}' dmaap-dr-node >> /etc/hosts" # SFTP Configuration: # Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server. @@ -138,4 +138,6 @@ docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/ad curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json -curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1ii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 \ No newline at end of file +curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 +sleep 60 +curl -k https://$DR_PROV_IP:8443/internal/prov \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh index c55f4398..954c5dc0 100644 --- a/plans/usecases/5G-bulkpm/teardown.sh +++ b/plans/usecases/5G-bulkpm/teardown.sh @@ -1,5 +1,6 @@ #!/bin/bash echo "Starting teardown script" +docker exec dfc /bin/sh -c "cat /opt/log/application.log" kill-instance.sh $DMAAP kill-instance.sh $KAFKA kill-instance.sh $ZOOKEEPER -- cgit 1.2.3-korg