diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-11-17 07:42:27 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-11-18 08:27:14 -0500 |
| commit | 0f24452edf1361992895bf65545be25fe8ccd821 (patch) | |
| tree | c32a38eaa8a39a40e78b6ee8dac18f2b868caa3a /odlsli/src/main | |
| parent | af1e381905d099dd9454ab4bf4d6d965ef5d00dd (diff) | |
Add integration test for odlsli docker
Add integration test for odlsli docker
Change-Id: Ie8140a1c9e480d368cd6653ea80efb58f44eb6dd
Issue-ID: CCSDK-2986
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'odlsli/src/main')
| -rw-r--r-- | odlsli/src/main/resources/org.ops4j.pax.logging.cfg | 2 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installSdncDb.sh | 6 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/odlsli/src/main/resources/org.ops4j.pax.logging.cfg b/odlsli/src/main/resources/org.ops4j.pax.logging.cfg index ee35ef70..7e3aead5 100644 --- a/odlsli/src/main/resources/org.ops4j.pax.logging.cfg +++ b/odlsli/src/main/resources/org.ops4j.pax.logging.cfg @@ -29,7 +29,7 @@ log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi log4j2.rootLogger.appenderRef.Console.ref = Console log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter -log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF} +log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${env:KARAF_CONSOLE_LOG_LEVEL\:-OFF} # Loggers configuration diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh index efd7fe02..fb97b073 100644 --- a/odlsli/src/main/scripts/installSdncDb.sh +++ b/odlsli/src/main/scripts/installSdncDb.sh @@ -22,7 +22,7 @@ ### CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} +MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma} @@ -30,7 +30,7 @@ SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl} # Create tablespace and user account -mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql <<-END +mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END CREATE DATABASE ${SDNC_DB_DATABASE}; CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}'; CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}'; @@ -41,5 +41,5 @@ END if [ -f ${CCSDK_HOME}/data/odlsli.dump ] then -mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump +mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump fi diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 4d608577..310acfd7 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -28,7 +28,7 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} +MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} @@ -36,7 +36,7 @@ INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} # Wait for database # echo "Waiting for mysql" -until mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql &> /dev/null +until mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null do printf "." sleep 1 |