X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=fdb2c58273b7c309818c2b330d93b51f667f1530;hb=6989e98ea8d2293aa90aacc1b864fb724643156e;hp=fd4055bf4a7e9b2fb52ae3ba364b64f2b7336940;hpb=45868047871fb6234b9c79568fe65d506128458e;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index fd4055b..fdb2c58 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -2,9 +2,9 @@
 
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# APPC
 # ================================================================================
-# Copyright (C) 2017 OpenECOMP
+# Copyright (C) 2017-2019 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.
@@ -20,12 +20,15 @@
 # ============LICENSE_END=========================================================
 ###
 
-# Install SDN-C & APP-C platform components if not already installed and start container
+#
+# This script takes care of installing the SDNC & APPC platform components 
+#  if not already installed, and starts the APPC Docker Container
+#
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
@@ -42,14 +45,6 @@ if [ -z "$DMAAP_TOPIC_ENV" ]
 		echo "DMAAP_TOPIC_ENV shell variable exists and it's $DMAAP_TOPIC_ENV"
 fi
 
-
-echo "Adding a value to property appc.asdc.env in appc.properties for appc-asdc-listener feature"
-echo "" >> $APPC_HOME/data/properties/appc.properties
-echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties
-echo "" >> $APPC_HOME/data/properties/appc.properties
-
-
-
 #
 # Wait for database to init properly
 #
@@ -63,31 +58,38 @@ echo -e "\nmysql ready"
 
 if [ ! -f ${SDNC_HOME}/.installed ]
 then
-	echo "Installing SDN-C database"
+	echo "Installing SDNC database"
 	${SDNC_HOME}/bin/installSdncDb.sh
-	echo "Starting OpenDaylight"
-	${ODL_HOME}/bin/start
-	echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-	sleep ${SLEEP_TIME}
-	echo "Installing SDN-C platform features"
-	${SDNC_HOME}/bin/installFeatures.sh
+	echo "Installing APPC database"
+	${APPC_HOME}/bin/installAppcDb.sh
+	echo "Installing ODL Host Key"
+	${SDNC_HOME}/bin/installOdlHostKey.sh
+
 	if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
 	then
 		echo "Installing directed graphs"
 		${SDNC_HOME}/svclogic/bin/install.sh
 	fi
 	
-	echo "Installing APP-C platform features"
-	${APPC_HOME}/bin/installFeatures.sh
-	if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
+	
+	
+
+	if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ]
 	then
-		echo "Installing directed graphs for APP-C"
-		${APPC_HOME}/svclogic/bin/install.sh
+		echo "Installing APPC JSON DGs converted to XML using dg-loader"
+		${APPC_HOME}/svclogic/bin/install-converted-dgs.sh
 	fi
-
-	echo "Restarting OpenDaylight"
-	${ODL_HOME}/bin/stop
-	echo "Installed at `date`" > ${SDNC_HOME}/.installed
+	
+echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
+echo "Starting ODL/APPC"
+ODL_BOOT_FEATURES_EXTRA="odl-netconf-connector,odl-restconf-noauth,odl-netconf-clustered-topology,odl-mdsal-clustering"
+sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+exec ${APPC_HOME}/bin/dockerInstall.sh &
+echo "Starting OpenDaylight"
+exec ${ODL_HOME}/bin/karaf server