summaryrefslogtreecommitdiffstats
path: root/catalog-dao/src
AgeCommit message (Collapse)AuthorFilesLines
2017-10-23remove neo4j classesYuli Shlosberg25-3270/+0
Change-Id: I7a9b781c30d4eb269c19dfdaa5d230807a97f08b Issue-Id: SDC-487 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit 00fca27997c4a4a473823c4dc0123c074dac7b50)
2017-10-22add more unit tests remove importsYuli Shlosberg2-9/+36
Change-Id: If2274759f929f595e63d71cc70c374268c019947 Issue-Id: SDC-467 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit b947eb599bfab4599ce1b0c0573b1701c646e429)
2017-10-22add more unit tests to BE componentsYuli Shlosberg16-34/+1080
Change-Id: I23a72857d669f03e8cb7e543c006fed3318670b0 Issue-Id: SDC-467 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit 6dc570c66839fe239b63f1aa8da489c520fb215d)
2017-10-22add more unit tests to BE componentsYuli Shlosberg30-87/+1924
Change-Id: Ic14375454aac2960cd9b250e98991ca073e17a24 Issue-Id: SDC-467 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit 8c4c1dd56dedace1c59d32f5c51c285da05301bf)
2017-10-22add unit tests to BE componentsYuli Shlosberg51-0/+8523
Change-Id: Ic22f03832f1810f51958db2e7dba5569a9bf1cd7 Issue-Id: SDC-467 Signed-off-by: Yuli Shlosberg <ys9693@att.com> (cherry picked from commit 031b1e4dc965195624fb0c574376cba1b0c57488)
2017-08-10[SDC] code syncMichael Lando1-1/+1
Change-Id: Ia33a7874802b8ac2f49aed9199e109ea509e950e Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-20[SDC] 1710 rebase + pom modificationsMichael Lando4-90/+12
Change-Id: I1f9c0a5201576c7a6b124f6a786db12c1a8cd7c0 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-18[SDC] rebase 1710Michael Lando2-0/+30
Change-Id: I07fced02f40a57700d9d35ed3ba498bca351fb13 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-17[SDC] rebase 1710 codeMichael Lando9-44/+311
Change-Id: I532ed68979fee7840ea8a5395e7e965b155fb9f9 Signed-off-by: Michael Lando <ml636r@att.com>
2017-07-12Remove Exceptions.convertToRuntimeEx()Gary Wu3-41/+4
The uses of Exceptions.convertToRuntimeEx() had two problems: 1. The cast from IOException to RuntimeException will fail because they are incompatible types; 2. They make it unclear that an exception is being thrown. This change replaces their uses with direct throws of RuntimeExceptions. Change-Id: I3af60da2bdd3230c568744f747a5910d797073c8 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-07-12[sdc] rebase updateMichael Lando20-0/+400
Change-Id: I8f1fc7150975122dd9f3f4e653b9983064b399a6 Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-18[sdc] update code of sdcMichael Lando1-1/+1
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-11[SDC-29] rebase continue work to align sourceMichael Lando8-33/+54
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando <ml636r@att.com>
2017-06-09[SDC-29] catalog 1707 rebase commit.Michael Lando77-1339/+2787
Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando <ml636r@att.com>
2017-02-19Initial OpenECOMP SDC commitMichael Lando182-0/+27263
Change-Id: I0924d5a6ae9cdc161ae17c68d3689a30d10f407b Signed-off-by: Michael Lando <ml636r@att.com>
udo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
#!/bin/bash
REMOTE_DEBUG=false
RERUN=true
JAVA_OPTION=""
debug_port=8000
TEST_SUITES=testSuites
fileName=testng-failed.xml

function help_usage ()
{
	echo
	echo "$0 (<jar_file_name> <suite file name>) [-r/rerun <true/false> -d/debug <true/false>]"
	echo "nohup ./startTest.sh ui-ci-1707.0.5-SNAPSHOT-jar-with-dependencies.jar extendedSanity.xml -r false -d true &"
	echo "by default rerun is true and remote debug is false."
	echo
	exit 2
}

function isBoolean ()
{
	PARAM_NAME=$1
	VALUE=$2
	if [[ ${VALUE} != "true" ]] && [[ ${VALUE} != "false" ]]; then
		echo "Valid parameter" ${PARAM_NAME} "values are: true/false"
	        help_usage
	fi	
}

function prepareFailedXmlFile ()
{	
	echo "1="$1 "2="$2 "fileName="${fileName}
	PATTERN=`grep -w "test name=" ${FULL_PATH}/${TEST_SUITES}/$2 | awk -F'"' '{print $2}'`
	sed '/<test name="'${PATTERN}'"/,/<!-- '${PATTERN}' --/d' $1 > ${FULL_PATH}/${TEST_SUITES}/${fileName}
    sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName}
}

#main
[ $# -lt 2 ] && help_usage

JAR_FILE=$1
SUITE_FILE=$2

while [ $# -ne 0 ]; do
	case $1 in
		-r|rerun)
			RERUN=$2
            		isBoolean $1 ${RERUN}
			shift 1
			shift 1
		;;
		-d|debug)
			REMOTE_DEBUG=$2
           		isBoolean $1 ${REMOTE_DEBUG}
			shift 1
			shift 1
		;;		
		*)
			shift 1
		;;
	esac
done

CURRENT_DIR=`pwd`
BASEDIR=$(dirname $0)

if [ ${BASEDIR:0:1} = "/" ]
then
        FULL_PATH=$BASEDIR
else
        FULL_PATH=$CURRENT_DIR/$BASEDIR
fi
LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties
#############################################
TARGET_DIR=${FULL_PATH}/target
CONF_FILE=${FULL_PATH}/conf/attsdc.yaml

DEBUG=true
MainClass=org.openecomp.sdc.ci.tests.run.StartTest

TESTS_DIR=/opt/app/sdc/ci/resources/tests
COMPONENTS_DIR=/opt/app/sdc/ci/resources/components


TARGET_LOG_DIR="${TARGET_DIR}/"


######ADD USERS################

BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'`

ADD_USERS_SCRIPT="addUsersFromList_new.sh"
USER_LIST="userList.txt"
chmod +x ${ADD_USERS_SCRIPT}
echo "add users..."
`./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}`




if [ ${REMOTE_DEBUG} == "true" ]; then
    echo "Debug mode, Listen on port $debug_port";
    JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ;
fi  

cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" 


if [ $DEBUG == "true" ]
then
	$cmd
else
	$cmd >> /dev/null
fi

if [ ${RERUN} == "true" ]; then
    if [ -f ${TARGET_DIR}/${fileName} ]; then
        echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ...";
        prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE;
        SUITE_FILE=${fileName};
	cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
        $cmd;
    fi
fi

status=`echo $?`

source ExtentReport/versions.info
now=$(date +'%Y-%m-%d_%H_%M')
REPORT_NAME=${now}
VERSION=${osVersion}

if [[ $env == *"DEV20"* ]]
then
        MYENV="Nightly"
else
	MYENV=""
fi

COPY_REPORT_SCRIPT="copyToStorage.sh"
chmod +x ${COPY_REPORT_SCRIPT}
echo "copy report to storage..."
sh ./${COPY_REPORT_SCRIPT} ${REPORT_NAME} ${VERSION} ${MYENV}


MAILING_SCRIPT_NAME="sendMail.sh"
chmod +x ${MAILING_SCRIPT_NAME}
echo "Sending report via mail..."
`./${MAILING_SCRIPT_NAME} ${REPORT_NAME} ${VERSION} ${MYENV}`


echo "##################################################"
echo "################# status is ${status} #################" 
echo "##################################################"

exit $status