From c5fa59548ce8eb4f4ac9b1584bd0e6b2c968a60b Mon Sep 17 00:00:00 2001 From: LiamBurke Date: Mon, 17 Sep 2018 14:34:05 +0100 Subject: Updates to BULKPM tests to add datarouter setup Change-Id: I4d794fcf108b9c7b5bc06c291ce075386c0155f8 Issue-ID: INT-649 Signed-off-by: LiamBurke --- test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh | 84 +++++++++++++++------- .../plans/dcae-bulkpm/bulkpm-suite/teardown.sh | 10 +-- 2 files changed, 65 insertions(+), 29 deletions(-) (limited to 'test/csit') diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh b/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh index 530d97da1..6df4b2f61 100644 --- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh +++ b/test/csit/plans/dcae-bulkpm/bulkpm-suite/setup.sh @@ -8,36 +8,78 @@ source ${SCRIPTS}/dcae-bulkpm/xNFSimulator.sh # Place the scripts in run order: source ${SCRIPTS}/common_functions.sh -#get current host IP addres -HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') +# Clone DMaaP Data Router repo +mkdir -p $WORKSPACE/archives/dmaapdr +cd $WORKSPACE/archives/dmaapdr + +git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master +cd datarouter +git pull +cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ + +# start DMaaP DR containers with docker compose and configuration from docker-compose.yml +docker login -u docker -p docker nexus3.onap.org:10001 +docker-compose up -d + +# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb +for i in {1..50}; do + if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] + then + echo "DR Service Running" + break + else + echo sleep $i + sleep $i + fi +done + +DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) +DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) +DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) +#Add the DR_NODE_IP to /etc/hosts +sudo echo "${DR_NODE_IP} dmaap-dr-node" >> /etc/hosts +sudo echo "${DR_PROV_IP} dmaap-dr-prov" >> /etc/hosts + +echo DR_PROV_IP=${DR_PROV_IP} +echo DR_NODE_IP=${DR_NODE_IP} +echo DR_GATEWAY_IP=${DR_GATEWAY_IP} + +docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP" +docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP" + +# Start DCAE VES Collector +cd $WORKSPACE/ +HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 echo VESC_IMAGE=${VESC_IMAGE} -# Start DCAE VES Collector -docker run -d -p 8080:8080/tcp -p 8443:8443/tcp -P --name vesc -e DMAAPHOST=${HOST_IP} ${VESC_IMAGE} +docker run -d --name vesc -e DMAAPHOST=${HOST_IP} ${VESC_IMAGE} +VESC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vesc) # Clone DMaaP Message Router repo mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr -#unset http_proxy https_proxy 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/ -# Update kafkfa and zookeeper properties in MsgRtrApi.propeties which will be copied to DMaaP Container -sed -i -e 's#nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1#wurstmeister/kafka:1.1.0#' $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml - # start DMaaP MR containers with docker compose and configuration from docker-compose.yml docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d +ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1") +KAFKA=$(docker ps -a -q --filter="name=kafka_1") +DMAAP=$(docker ps -a -q --filter="name=dmaap_1") + # Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper for i in {1..50}; do -if [ $(docker inspect --format '{{ .State.Running }}' dockercompose_kafka_1) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' dockercompose_zookeeper_1) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' dockercompose_dmaap_1) ] +if [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \ +[ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \ +[ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ] then echo "DMaaP Service Running" break @@ -48,16 +90,16 @@ fi done # Get IP address of DMAAP, KAFKA, Zookeeper -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_dmaap_1) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_kafka_1) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_zookeeper_1) +DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) +KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA) +ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER) echo DMAAP_MR_IP=${DMAAP_MR_IP} echo KAFKA_IP=${KAFKA_IP} echo ZOOKEEPER_IP=${ZOOKEEPER_IP} # Shutdown DMAAP Container -docker kill dockercompose_dmaap_1 +docker kill $DMAAP # Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites sed -i -e '/config.zk.servers=/ s/=.*/='$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties @@ -69,18 +111,12 @@ docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d sleep 5 -# Get IP address of DMAAP, KAFKA, Zookeeper and VESC -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_dmaap_1) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_kafka_1) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dockercompose_zookeeper_1) - -VESC_IP=`get-instance-ip.sh vesc` export VESC_IP=${VESC_IP} export HOST_IP=${HOST_IP} export DMAAP_MR_IP=${DMAAP_MR_IP} - -ROBOT_VARIABLES="-v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP}" +#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}" pip install jsonschema uuid # Wait container ready -sleep 2 +sleep 2 \ No newline at end of file diff --git a/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh b/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh index 85428dad9..1eb9a4ade 100644 --- a/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh +++ b/test/csit/plans/dcae-bulkpm/bulkpm-suite/teardown.sh @@ -1,8 +1,8 @@ #!/bin/bash echo "Starting teardown script" kill-instance.sh vesc -kill-instance.sh dockercompose_dmaap_1 -kill-instance.sh dockercompose_kafka_1 -kill-instance.sh dockercompose_zookeeper_1 - - +cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose +docker-compose down -v +cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ +docker-compose down -v +sudo sed -i '/dmaap/d' /etc/hosts \ No newline at end of file -- cgit 1.2.3-korg