[DMAAP] Refactoring dmaap suites

[integration/csit.git] / plans / dmaap-buscontroller / with_dr / setup.sh

diff --git a/plans/dmaap-buscontroller/with_dr/setup.sh b/plans/dmaap-buscontroller/with_dr/setup.sh
index d9d8574..822f6a7 100755 (executable)
--- a/plans/dmaap-buscontroller/with_dr/setup.sh
+++ b/plans/dmaap-buscontroller/with_dr/setup.sh
@@ -19,39 +19,27 @@
 # ============LICENSE_END=========================================================
 # 
 #
-
 source ${SCRIPTS}/common_functions.sh
 
+COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-dockercompose}
+export COMPOSE_PROJECT_NAME=$COMPOSE_PREFIX
+echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
+echo "COMPOSE_PREFIX=$COMPOSE_PREFIX"
 
-if [ "$USE_EXISTING_DMAAP" = "Y" ]
-then
-       ROBOT_VARIABLES="-v AAF_IP:0.0.0 -v MRC_IP:0.0.0.0 -v DRPS_IP:172.17.0.3 -v DMAAPBC_IP:172.17.0.4"
-else
-
-       # Place the scripts in run order:
-       source ${WORKSPACE}/scripts/dmaap-buscontroller/dr-launch.sh
-       dmaap_dr_launch
-       DRPS_IP=${IP}
-
-       #source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
-       #start_mock "aaf" 
-       #AAF_IP=${IP}
-       AAF_IP=0.0.0.0
-       #start_mock "drps" 
-       #DRPS_IP=${IP}
-       MRC_IP=0.0.0.0
-
-       source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
-       dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
-       DMAAPBC_IP=${IP}
+source ${WORKSPACE}/scripts/dmaap-datarouter/datarouter-launch.sh
+# Launch DR. If true is passed, 2 subscriber containers are also deployed, else false.
+dmaap_dr_launch false
+DRPS_IP=${DR_PROV_IP}
 
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+dmaapbc_launch ${DRPS_IP}
+DMAAPBC_IP=${DMAAP_BC_IP}
 
-       echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
+echo "DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
 
-       # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-       ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
-       set -x
-       ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
-       set +x
-fi
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
+set -x
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP}
+set +x