diff options
| -rw-r--r-- | installation/appc/src/main/scripts/installZips.sh | 4 | ||||
| -rw-r--r-- | platform-logic/installer/src/main/scripts/install-converted-dgs.sh | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh index 7d2f47d..51ae99c 100644 --- a/installation/appc/src/main/scripts/installZips.sh +++ b/installation/appc/src/main/scripts/installZips.sh @@ -94,6 +94,10 @@ rm -f /tmp/platform-logic-installer*.zip mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.appc.deployment:platform-logic-installer:${APPC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${targetDir} /tmp/platform-logic-installer*.zip +echo "Downloading dg-loader-provider jar from nexus" +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.appc.plugins:dg-loader-provider:1.1.0:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data +mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar + find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; cd $cwd diff --git a/platform-logic/installer/src/main/scripts/install-converted-dgs.sh b/platform-logic/installer/src/main/scripts/install-converted-dgs.sh index 5047a68..f787aca 100644 --- a/platform-logic/installer/src/main/scripts/install-converted-dgs.sh +++ b/platform-logic/installer/src/main/scripts/install-converted-dgs.sh @@ -30,6 +30,9 @@ export APPC_HOME=${APPC_HOME:-/opt/openecomp/appc} # SVCLOGIC_DIR env variable points to /opt/openecomp/appc/svclogic export SVCLOGIC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" +#Path to the dg-loader jar file +export DG_LOADER=${APPC_HOME}/data/dg-loader-provider-jar-with-dependencies.jar + # Check if the JSON Directory exists under the env. variable defined export DG_JSON_DIR=${SVCLOGIC_DIR}/graphs/appc/json/dg-loader-dgs echo "Processing DG JSON directory : ${DG_JSON_DIR}" @@ -39,19 +42,17 @@ then exit 1 fi -# Temporarily use wget to download the JAR needed to execute the dg-loader actions below (NEEDS TO GET THE JAR WITH DEPENDENCIES) -wget -P ${SVCLOGIC_DIR}/lib https://nexus.onap.org/content/groups/staging/org/openecomp/appc/plugins/dg-loader-provider/1.1.0/dg-loader-provider-1.1.0.jar cd ${DG_JSON_DIR} mkdir -p ${DG_JSON_DIR}/converted-xml # Generate XML DGs from JSON DGs -$JAVA_HOME/bin/java -cp ${SVCLOGIC_DIR}/lib/dg-loader-jar-with-dependencies.jar org.openecomp.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/converted-xml +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.openecomp.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/converted-xml # Load converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container -$JAVA_HOME/bin/java -cp ${SVCLOGIC_DIR}/lib/dg-loader-jar-with-dependencies.jar org.openecomp.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/converted-xml ${APPC_HOME}/data/properties/dblib.properties +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.openecomp.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/converted-xml ${APPC_HOME}/data/properties/dblib.properties # Activate converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container -$JAVA_HOME/bin/java -cp ${SVCLOGIC_DIR}/lib/dg-loader-jar-with-dependencies.jar org.openecomp.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${APPC_HOME}/data/properties/dblib.properties +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.openecomp.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${APPC_HOME}/data/properties/dblib.properties exit 0 |