[DMAAP] Refactoring dmaap suites

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

diff --git a/scripts/dmaap-datarouter/datarouter-launch.sh b/scripts/dmaap-datarouter/datarouter-launch.sh
index 0339e38..6d38913 100644 (file)
--- a/scripts/dmaap-datarouter/datarouter-launch.sh
+++ b/scripts/dmaap-datarouter/datarouter-launch.sh
@@ -23,15 +23,14 @@ function dmaap_dr_launch() {
 
     subscribers_required=$1
     mkdir -p ${WORKSPACE}/archives/dmaap/dr/last_run_logs
-    cd ${WORKSPACE}/scripts/dmaap-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
     if [[ ${subscribers_required} == true ]]; then
-               docker-compose up -d
+        docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml up -d
     else
-        docker-compose up -d datarouter-prov datarouter-node mariadb
-       fi
+        docker-compose -f ${WORKSPACE}/scripts/dmaap-datarouter/docker-compose/docker-compose.yml up -d datarouter-prov datarouter-node mariadb
+    fi
 
     # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb
     for i in 1 2 3 4 5 6 7 8 9 10; do
@@ -74,17 +73,18 @@ function dmaap_dr_launch() {
     echo DR_NODE_IP=${DR_NODE_IP}
     echo DR_GATEWAY_IP=${DR_GATEWAY_IP}
     if [[ ${subscribers_required} == true ]]
-       then
-               DR_SUB_IP=`get-instance-ip.sh subscriber-node`
+    then
+        DR_SUB_IP=`get-instance-ip.sh subscriber-node`
         DR_SUB2_IP=`get-instance-ip.sh subscriber-node2`
         echo DR_SUB_IP=${DR_SUB_IP}
         echo DR_SUB2_IP=${DR_SUB2_IP}
-       fi
+    fi
 
 
     sudo sed -i "$ a $DR_PROV_IP dmaap-dr-prov" /etc/hosts
     sudo sed -i "$ a $DR_NODE_IP dmaap-dr-node" /etc/hosts
 
+    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"
 
     #Pass any variables required by Robot test suites in ROBOT_VARIABLES