Merge "[DMAAP] Refactoring dmaap suites"

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

diff --git a/plans/dmaap-buscontroller/with_mr/setup.sh b/plans/dmaap-buscontroller/with_mr/setup.sh
index 0163686..74bfb0c 100755 (executable)
--- a/plans/dmaap-buscontroller/with_mr/setup.sh
+++ b/plans/dmaap-buscontroller/with_mr/setup.sh
@@ -19,36 +19,21 @@
 # ============LICENSE_END=========================================================
 # 
 #
+# Place the scripts in run order:
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
+dmaap_mr_launch
+MRC_IP=${IP}
 
-if [ "$USE_EXISTING_DMAAP" = "Y" ]
-then
-       ROBOT_VARIABLES="-v AAF_IP:0.0.0 -v MRC_IP:172.18.0.3 -v DRPS_IP:0.0.0.0 -v DMAAPBC_IP:172.17.0.4"
-else
+mkdir -p ${WORKSPACE}/archives/dmaapmr/last_run_logs
 
-       # Place the scripts in run order:
-       source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
-       dmaap_mr_launch
-       MRC_IP=${IP}
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+dmaapbc_launch $MRC_IP
+DMAAP_BC_IP=${DMAAP_BC_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}
-       DRPS_IP=0.0.0.0
-
-       source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
-       dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
-       DMAAPBC_IP=${IP}
-
-
-       echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP 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}
-       set +x
-fi
+echo "DMAAP_BC_IP=$DMAAP_BC_IP"
 
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES=" -v DMAAP_BC_IP:${DMAAP_BC_IP}"
+set -x
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAP_BC_IP}
+set +x