From b777c1a042ae8529b02fdb6394d271f6f24ce98c Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 26 Apr 2018 16:08:16 -0700 Subject: [PATCH] Move to new xml dg loader Made it so the xml dgs will load using the same loader as the json dgs currently use. Added the Generic_Restart to the activate list Change-Id: I26286238a6322f5f391ab44f26816f90ad71df56 Signed-off-by: Patrick Brady Issue-ID: APPC-863 --- installation/appc/src/main/scripts/startODL.sh | 5 ----- platform-logic/appc/src/main/resources/dg_activate.txt | 1 + platform-logic/installer/src/main/scripts/install-converted-dgs.sh | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index 90bb3f2..f58db40 100644 --- a/installation/appc/src/main/scripts/startODL.sh +++ b/installation/appc/src/main/scripts/startODL.sh @@ -91,11 +91,6 @@ then ${APPC_HOME}/bin/installFeatures.sh - if [ -x ${APPC_HOME}/svclogic/bin/install.sh ] - then - echo "Installing APPC DGs using platform-logic" - ${APPC_HOME}/svclogic/bin/install.sh - fi if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ] then diff --git a/platform-logic/appc/src/main/resources/dg_activate.txt b/platform-logic/appc/src/main/resources/dg_activate.txt index 7f84f5a..45ebc96 100644 --- a/platform-logic/appc/src/main/resources/dg_activate.txt +++ b/platform-logic/appc/src/main/resources/dg_activate.txt @@ -73,6 +73,7 @@ APPC:StopVM_VM:2.0.0:sync APPC:Stop_VM:2.0.0:sync APPC:StopApplication_VM_vSCP:2.0.0:sync APPC:Generic_Sync:2.0.0:sync +APPC:Generic_Restart:3.0.0:sync APPC:Generic_Audit:2.0.0:sync APPC:Start_VNF:2.0.0:sync APPC:Start_VNFC:2.0.0:sync 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 13e05b5..34c313c 100644 --- a/platform-logic/installer/src/main/scripts/install-converted-dgs.sh +++ b/platform-logic/installer/src/main/scripts/install-converted-dgs.sh @@ -49,6 +49,9 @@ mkdir -p ${DG_JSON_DIR}/converted-xml # Generate XML DGs from JSON DGs $JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/converted-xml +#Load legacy xml DGs to the SVC_LOGIC DB in the MySQL Docker Container +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLLoad ${SVCLOGIC_DIR}/graphs/appc ${APPC_HOME}/data/properties/dblib.properties + # Load converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container $JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/converted-xml ${APPC_HOME}/data/properties/dblib.properties -- 2.16.6