X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fdmaapbc;h=0ade56be8cae8c4b606b50b52a604695c94f98d8;hb=a246d9509e0f68ad10d6d17387a376fbc155bb14;hp=5254108443515788d9f4ae7ceb9ce2ad22353f24;hpb=038b4a47c7194b51106cf2c325078924403defea;p=dmaap%2Fbuscontroller.git

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 5254108..0ade56b 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -1,4 +1,25 @@
 #!/bin/bash
+#
+# ============LICENSE_START==========================================
+# org.onap.dmaap
+# ===================================================================
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END============================================
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+#
 
 umask 0022
 TZ=GMT0
@@ -10,7 +31,8 @@ PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jdk/
 export PATH
 CLASSPATH=`echo $APP_ROOT/etc $APP_ROOT/lib/*.jar | tr ' ' ':'` 
 export CLASSPATH
-CONTAINER_CONFIG=/opt/app/config/conf
+CONFIGMAP_ROOT=/opt/app/config
+CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf
 MAIN=org.onap.dmaap.dbcapi.server.Main 
 
 
@@ -134,11 +156,42 @@ status() {
 	fi
 }
 
+init() {
+	if [ ! -d $CONFIGMAP_ROOT ]
+	then
+		echo $CONFIGMAP_ROOT does not exist
+		return
+	fi
+
+	#loop on get /dmaap until we get a good response to indicate other provisioning can continue
+	rc=999
+	while [ $rc != "200" ]
+	do
+		sleep 10
+		rc=`curl -s -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap`
+		echo "get dmaap response=${rc}"
+	done
+
+	cd $CONFIGMAP_ROOT
+	# order is important in this next list
+	for uri in dmaap dcaeLocations mr_clusters topics feeds
+	do
+		if [ -d ${uri} ]
+		then
+			for j in `ls ${uri}/*.json`
+			do
+				curl -v -X POST -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}
+			done
+		fi
+	done
+}
+
 set -x
 case "$1" in
 'deploy')
 	config
 	start
+	init
 	wait
 	;;
 'start')
@@ -160,13 +213,13 @@ case "$1" in
 	exit 1
 	;;
 esac
-		ls -l $APP_ROOT/logs/EELF
+		ls -l $APP_ROOT/logs/ONAP
 		echo "------------ tail -100 error.log ---------------"
-		tail -100  $APP_ROOT/logs/EELF/error.log
+		tail -100  $APP_ROOT/logs/ONAP/error.log
 		echo "------------ tail -100 server.log ---------------"
-		tail -100  $APP_ROOT/logs/EELF/server.log
+		tail -100  $APP_ROOT/logs/ONAP/server.log
 		echo "------------ tail -100 application.log ---------------"
-		tail -100 $APP_ROOT/logs/EELF/application.log
+		tail -100 $APP_ROOT/logs/ONAP/application.log
 
 		echo "Check $APP_ROOT/ok_to_exit"
 		while [ ! -f $APP_ROOT/ok_to_exit ]