From 119911d1ae4a06630d1250778b564e05d9fc3c0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=9Crre?= Date: Mon, 22 Mar 2021 06:33:48 +0100 Subject: [PATCH] prepare startODL for new sdnrinit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit adapt start script to look for the right sdnr init jar Issue-ID: SDNC-1510 Signed-off-by: Michael DÜrre Change-Id: I0ff44799a2ce69f6e26b867642480c1f1225987c Former-commit-id: 22146a5df538c394348cdab2b72e7cc0f6e0b157 --- installation/sdnc/src/main/scripts/startODL.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index f029e87f..8dd00279 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -85,8 +85,11 @@ cleanupFeatureBoot() { initialize_sdnrdb() { printf "SDN-R Database Initialization" INITCMD="$JAVA_HOME/bin/java -jar " - INITCMD="${INITCMD} $ODL_HOME/system/org/onap/ccsdk/features/sdnr/wt/sdnr-wt-data-provider-setup/$CCSDKFEATUREVERSION/sdnr-dmt.jar " - INITCMD="${INITCMD} $SDNRDBCOMMAND" + FN="$ODL_HOME/${FEATURES_SDNR}/sdnr-wt-data-provider-setup/$CCSDKFEATUREVERSION/sdnr-dmt.jar" + if [ ! -f "$FN" ];then + FN="$ODL_HOME/${FEATURES_SDNR}/sdnr-wt-data-provider-setup/$CCSDKFEATUREVERSION/sdnr-wt-data-provider-setup-$CCSDKFEATUREVERSION.jar" + fi + INITCMD="${INITCMD} ${FN} $SDNRDBCOMMAND" printf "%s\n" "Execute: $INITCMD" n=0 until [ $n -ge 5 ] ; do -- 2.16.6