Changes to support new ODL

[appc/deployment.git] / installation / appc / src / main / scripts / startODL.sh

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 5ff7b32..e38b317 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -4,7 +4,7 @@
 # ============LICENSE_START=======================================================
 # APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-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.
@@ -18,21 +18,22 @@
 # 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.
 ###
 
 #
-# This script takes care of installing the SDN-C & APP-C platform components 
-#  if not already installed, and starts the APP-C Docker 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/onap/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}
 
+appcInstallStartTime=$(date +%s)
+
 #
 # Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties
 #
@@ -64,18 +65,19 @@ 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 "Installing APP-C database"
+       echo "Installing APPC database"
        ${APPC_HOME}/bin/installAppcDb.sh
        echo "Starting OpenDaylight"
        ${ODL_HOME}/bin/start
        echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
        sleep ${SLEEP_TIME}
-       echo "Inserting modified installFeatures.sh for sdnc"
-       rm ${SDNC_HOME}/bin/installFeatures.sh
-       cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh
-       echo "Installing SDN-C platform features"
+       echo "Copying a working version of the logging configuration into the opendaylight etc folder"
+       cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg
+       echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder"
+       cp ${APPC_HOME}/data/aaf-cadi-shiro.jar ${ODL_HOME}/deploy/aaf-cadi-shiro.jar
+       echo "Installing SDNC platform features"
        ${SDNC_HOME}/bin/installFeatures.sh
        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
        then
@@ -83,17 +85,38 @@ then
                ${SDNC_HOME}/svclogic/bin/install.sh
        fi
        
-       echo "Installing APP-C platform features"
+       echo "Installing APPC platform features"
        ${APPC_HOME}/bin/installFeatures.sh
+       
+       
        if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
        then
-               echo "Installing directed graphs for APP-C"
+               echo "Installing APPC DGs using platform-logic"
                ${APPC_HOME}/svclogic/bin/install.sh
        fi
 
-       echo "Restarting OpenDaylight"
-       ${ODL_HOME}/bin/stop
+       if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ]
+       then
+               echo "Installing APPC JSON DGs converted to XML using dg-loader"
+               ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh
+       fi
+       
+       echo "Adding a property system.properties for AAF cadi.properties location"
+       echo "" >> ${ODL_HOME}/etc/system.properties
+       echo "cadi_prop_files=${APPC_HOME}/data/properties/cadi.properties" >> ${ODL_HOME}/etc/system.properties
+       echo "" >> ${ODL_HOME}/etc/system.properties
+       
+       echo "Copying a working version of the shiro configuration into the opendaylight etc folder"
+       cp ${APPC_HOME}/data/shiro.ini ${ODL_HOME}/etc/shiro.ini
+
+    echo "Restarting OpenDaylight"
+    ${ODL_HOME}/bin/stop
+    echo "Waiting 60 seconds for OpenDaylight stop to complete"
+    sleep 60
        echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
+       appcInstallEndTime=$(date +%s)
+       echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
+
 exec ${ODL_HOME}/bin/karaf