[DMAAP] Refactoring dmaap suites

[integration/csit.git] / scripts / dmaap-buscontroller / dmaapbc-launch.sh

diff --git a/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/scripts/dmaap-buscontroller/dmaapbc-launch.sh
index 0a653fa..3e446d8 100755 (executable)
--- a/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+++ b/scripts/dmaap-buscontroller/dmaapbc-launch.sh
@@ -4,34 +4,23 @@
 # sets global var IP with assigned IP address
 
 function dmaapbc_launch() {
-       TAG="nexus3.onap.org:10001/onap/dmaap/buscontroller"
-       CONTAINER_NAME=dmaapbc
-       IP=""
+    export dmaap_prov_ip=$1
+    export dmaap_mr_ip=$1
+    cd ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose
+    docker-compose -f docker-compose-bc.yml up -d
 
-       cd ${WORKSPACE}/scripts/dmaap-buscontroller
+    sleep 10
 
-       TMP_CFG=/tmp/docker-databus-controller.conf
-       . ./onapCSIT.env > $TMP_CFG
-       ADDHOSTS=""
-       if [ ! -z "$2" ]
-       then
-               ADDHOSTS="$ADDHOSTS --add-host=message-router:$2"
-       fi
-       if [ ! -z "$3" ]
-       then
-               ADDHOSTS="$ADDHOSTS --add-host=dmaap-dr-prov:$3"
-       fi
-       docker run -d $ADDHOSTS --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG
-       IP=`get-instance-ip.sh ${CONTAINER_NAME}`
+    DMAAP_BC_IP=`get-instance-ip.sh dmaap-bc`
 
     source ${SCRIPTS}/common_functions.sh
-    bypass_ip_adress ${IP}
+    bypass_ip_adress ${DMAAP_BC_IP}
 
-       # Wait for initialization
-       for i in {1..10}; do
-       curl -sS ${IP}:8080 && break
-       echo sleep $i
-       sleep $i
-       done
+    # Wait for initialization
+    for i in 1 2 3 4 5 6 7 8 9 10; do
+        curl -sS ${DMAAP_BC_IP}:8080 && break
+        echo sleep ${i}
+        sleep ${i}
+    done
 
 }