From f5854fd32c19c44d32a3e6739b30271d4dccd393 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Mon, 31 Jul 2017 15:50:46 +0300 Subject: [SDC] code rebase for sdc resync to LF Change-Id: If6d87c9e324f508a8a6b80b10a03d1843901472e Signed-off-by: Michael Lando --- .../src/main/resources/scripts/dataMigration.sh | 56 ---------------------- .../main/resources/scripts/dataMigration1607.sh | 33 ------------- .../main/resources/scripts/dataMigration1610.sh | 41 ---------------- .../main/resources/scripts/dataMigration1702.sh | 35 -------------- .../main/resources/scripts/dataMigration1707.sh | 35 -------------- .../src/main/resources/scripts/validationTool.sh | 3 +- 6 files changed, 2 insertions(+), 201 deletions(-) delete mode 100644 asdctool/src/main/resources/scripts/dataMigration.sh delete mode 100644 asdctool/src/main/resources/scripts/dataMigration1607.sh delete mode 100644 asdctool/src/main/resources/scripts/dataMigration1610.sh delete mode 100644 asdctool/src/main/resources/scripts/dataMigration1702.sh delete mode 100644 asdctool/src/main/resources/scripts/dataMigration1707.sh (limited to 'asdctool/src/main/resources/scripts') diff --git a/asdctool/src/main/resources/scripts/dataMigration.sh b/asdctool/src/main/resources/scripts/dataMigration.sh deleted file mode 100644 index e1f4f24a30..0000000000 --- a/asdctool/src/main/resources/scripts/dataMigration.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -############################## -# Data Migration -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $1) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" - -case $1 in - 1604) - command="java $JVM_LOG_FILE -cp $JARS $mainClass migrate-1602-1604 $@" - echo $command - ;; - 1607) - command="sh ./dataMigration1607.sh $@" - echo $command - ;; - 1610) - command="sh ./dataMigration1610.sh $@" - echo $command - ;; - 1702) - command="sh ./dataMigration1702.sh $@" - echo $command - ;; - 1707) - command="sh ./dataMigration1707.sh $@" - echo $command - ;; - *) - echo "No migration for this version $1" - ;; -esac - -$command -result=$? - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/dataMigration1607.sh b/asdctool/src/main/resources/scripts/dataMigration1607.sh deleted file mode 100644 index 027852d882..0000000000 --- a/asdctool/src/main/resources/scripts/dataMigration1607.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -############################## -# Data Migration 1607 -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" - -command="java $JVM_LOG_FILE -cp $JARS $mainClass migrate-1604-1607 $@" -echo $command - -$command -result=$? - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/dataMigration1610.sh b/asdctool/src/main/resources/scripts/dataMigration1610.sh deleted file mode 100644 index 45d61adeee..0000000000 --- a/asdctool/src/main/resources/scripts/dataMigration1610.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -############################## -# Data Migration 1610 -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" - -command="java $JVM_LOG_FILE -cp $JARS $mainClass fix-properties $@" -echo $command - -$command -result=$? - -if [ $result -eq 0 ] -then - command="java $JVM_LOG_FILE -cp $JARS $mainClass align-tosca-artifacts $@" - echo $command - $command - result=$? -fi - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/dataMigration1702.sh b/asdctool/src/main/resources/scripts/dataMigration1702.sh deleted file mode 100644 index f2bf56e4ef..0000000000 --- a/asdctool/src/main/resources/scripts/dataMigration1702.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -############################## -# Data Migration 1702 -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" - -command="java $JVM_LOG_FILE -cp $JARS $mainClass migrate-1610-1702 $@" -echo $command - -$command -result=$? - - - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/dataMigration1707.sh b/asdctool/src/main/resources/scripts/dataMigration1707.sh deleted file mode 100644 index 11a151a7c3..0000000000 --- a/asdctool/src/main/resources/scripts/dataMigration1707.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -############################## -# Data Migration 1707 -############################## - -CURRENT_DIR=`pwd` -BASEDIR=$(dirname $0) - -if [ ${BASEDIR:0:1} = "/" ] -then - FULL_PATH=$BASEDIR -else - FULL_PATH=$CURRENT_DIR/$BASEDIR -fi - -source ${FULL_PATH}/baseOperation.sh - -mainClass="org.openecomp.sdc.asdctool.main.MigrationMenu" - -command="java $JVM_LOG_FILE -Xmx6000M -cp $JARS $mainClass migrate-1702-1707 $@" -echo $command - -$command -result=$? - - - -echo "***********************************" -echo "***** $result *********************" -echo "***********************************" - -exit $result - - diff --git a/asdctool/src/main/resources/scripts/validationTool.sh b/asdctool/src/main/resources/scripts/validationTool.sh index 23eaeb8da7..58cd7f3f6a 100644 --- a/asdctool/src/main/resources/scripts/validationTool.sh +++ b/asdctool/src/main/resources/scripts/validationTool.sh @@ -18,7 +18,8 @@ source ${FULL_PATH}/baseOperation.sh mainClass="org.openecomp.sdc.asdctool.main.ValidationTool" -command="java $JVM_LOG_FILE -cp $JARS $mainClass reportOutput.txt /home/vagrant/catalog-be/config/catalog-be/" +#command="java $JVM_LOG_FILE -cp $JARS $mainClass reportOutput.txt /home/vagrant/catalog-be/config/catalog-be/" +command="java $JVM_LOG_FILE -cp $JARS $mainClass . /apps/jetty/base/be/config/catalog-be/" echo $command $command -- cgit 1.2.3-korg