sdnc sdnr database init script fails

[sdnc/oam.git] / installation / sdnc / src / main / scripts / startODL.sh

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index f029e87..ee4e19f 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -85,8 +85,8 @@ 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=$(find "$ODL_HOME/system" -name "sdnr-wt-data-provider-setup-$CCSDKFEATUREVERSION.jar")
+  INITCMD="${INITCMD} ${FN} $SDNRDBCOMMAND"
   printf "%s\n" "Execute: $INITCMD"
   n=0
   until [ $n -ge 5 ] ; do
@@ -108,6 +108,9 @@ install_sdnrwt_features() {
     if ! $SDNRDM; then
       addToFeatureBoot "$SDNRODLUX_BOOTFEATURES"
     fi
+    if $SDNR_NETCONF_CALLHOME_ENABLED; then
+      addToFeatureBoot "$SDNR_NETCONF_CALLHOME_FEATURE"
+    fi
   fi
 }
 install_sdnr_oauth_features() {
@@ -242,6 +245,7 @@ SDNRWT=${SDNRWT:-false}
 SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature}
 SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth}
 SDNRDM=${SDNRDM:-false}
+SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false}
 # Add devicemanager features
 SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-feature-aggregator-devicemanager}
 SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base,${SDNRDM_SDM_LIST}}
@@ -253,7 +257,13 @@ SDNRDBCOMMAND=${SDNRDBCOMMAND:--c init -db $SDNRDBURL -dbu $SDNRDBUSERNAME -dbp
 
 SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
 SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
-A1_ADAPTER_NORTHBOUND=${A1_ADAPTER_NORTHBOUND:-true}
+SDNR_NETCONF_CALLHOME_FEATURE=${SDNR_NETCONF_CALLHOME_FEATURE:-odl-netconf-callhome-ssh}
+# if only SDNR features then do not start A1 adapter
+if $SDNRONLY ; then
+  A1_ADAPTER_NORTHBOUND=false
+else
+  A1_ADAPTER_NORTHBOUND=${A1_ADAPTER_NORTHBOUND:-true}
+fi
 A1_ADAPTER_NORTHBOUND_BOOTFEATURES=${A1_ADAPTER_NORTHBOUND_BOOTFEATURES:-a1-adapter-northbound}
 
 NOTOK=1
@@ -301,6 +311,7 @@ printf "%s\n" "  SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
 printf "%s\n" "  AAF_ENABLED=$SDNC_AAF_ENABLED"
 printf "%s\n" "  SERVICE_NAME=$SERVICE_NAME"
 printf "%s\n" "  NAMESPACE=$NAMESPACE"
+printf "%s\n" "  SDNR_NETCONF_CALLHOME_ENABLED=$SDNR_NETCONF_CALLHOME_ENABLED"
 
 if "$SDNC_AAF_ENABLED"; then
        export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local