X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdmaap-buscontroller%2Fwith_mr%2Fsetup.sh;fp=plans%2Fdmaap-buscontroller%2Fwith_mr%2Fsetup.sh;h=74bfb0c5a4f07de81c24dae4445d2b70d5f7f203;hb=7b4a3af0a9e4a0046b303e532640bc3e4a3420e5;hp=01636867ef25dc602556219bfb827ad395b27db1;hpb=ddd487752cf6eddd891d7b8fe5062316a932414d;p=integration%2Fcsit.git

diff --git a/plans/dmaap-buscontroller/with_mr/setup.sh b/plans/dmaap-buscontroller/with_mr/setup.sh
index 01636867..74bfb0c5 100755
--- 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