Merge "CSITs for StndDefined event routing"

[integration/csit.git] / scripts / dmaap-message-router / dmaap-mr-launch.sh

diff --git a/scripts/dmaap-message-router/dmaap-mr-launch.sh b/scripts/dmaap-message-router/dmaap-mr-launch.sh
index 36d3168..4fef682 100755 (executable)
--- a/scripts/dmaap-message-router/dmaap-mr-launch.sh
+++ b/scripts/dmaap-message-router/dmaap-mr-launch.sh
@@ -34,7 +34,8 @@ function dmaap_mr_launch() {
                #
                # the default prefix for docker containers is the directory name containing the docker-compose.yml file.
                # It can be over-written by an env variable COMPOSE_PROJECT_NAME.  This env var seems to be set in the Jenkins CSIT environment
-               COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-docker-compose}
+               COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-dockercompose}
+               export COMPOSE_PROJECT_NAME=$COMPOSE_PREFIX
                echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
                echo "COMPOSE_PREFIX=$COMPOSE_PREFIX"
 
@@ -83,12 +84,13 @@ function dmaap_mr_launch() {
                docker-compose down 
 
                # Update kafkfa and zookeeper properties in MsgRtrApi.propeties which will be copied to DMaaP Container
-               sed -i -e 's/<zookeeper_host>/'$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties
-               sed -i -e 's/<kafka_host>:<kafka_port>/'$KAFKA_IP':9092/' /var/tmp/MsgRtrApi.properties
+               sed -i -e 's/<zookeeper_host>/zookeeper/' /var/tmp/MsgRtrApi.properties
+               sed -i -e 's/<kafka_host>:<kafka_port>/kafka:9092/' /var/tmp/MsgRtrApi.properties
 
                docker-compose build
                docker login -u docker -p docker nexus3.onap.org:10001
                docker-compose up -d 
+               docker ps
 
                # Wait for initialization of Docker containers
                for i in {1..50}; do
@@ -103,6 +105,21 @@ function dmaap_mr_launch() {
                                                sleep $i
                                fi
                done
+               DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_dmaap_1)
+               IP=${DMAAP_MR_IP}
+               KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_kafka_1)
+               ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_zookeeper_1)
+
+               echo "After restart of ZK and Kafka..."
+               echo DMAAP_MR_IP=${DMAAP_MR_IP}
+               echo IP=${IP}
+               echo KAFKA_IP=${KAFKA_IP}
+               echo ZOOKEEPER_IP=${ZOOKEEPER_IP}
+
+        source ${SCRIPTS}/common_functions.sh
+        bypass_ip_adress ${DMAAP_MR_IP}
+        bypass_ip_adress ${KAFKA_IP}
+        bypass_ip_adress ${ZOOKEEPER_IP}
 
                # Wait for initialization of docker services
                for i in {1..50}; do