prepare startODL for new sdnrinit

adapt start script to look for the right sdnr init jar

Issue-ID: SDNC-1510
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I0ff44799a2ce69f6e26b867642480c1f1225987c

Former-commit-id: 22146a5df538c394348cdab2b72e7cc0f6e0b157

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index f029e87..8dd0027 100755 (executable)
--- 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