Fix CSIT test issues

Updated healthcheck to use RFC8040 style URL instead of Biermann.
Removed code that installs idm file to reset admin password - format
is not correct for Chlorine.

Issue-ID: CCSDK-3812
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I9f422325dc42c41a9d5b6943f784503217be7294

diff --git a/csit/scripts/healthcheck/health_check.sh b/csit/scripts/healthcheck/health_check.sh
index aed3b5a..de683b5 100644 (file)
--- a/csit/scripts/healthcheck/health_check.sh
+++ b/csit/scripts/healthcheck/health_check.sh
@@ -19,7 +19,8 @@
 ###############################################################################
 unset http_proxy https_proxy
 
-response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck )
+# response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck )
+response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/rests/operations/SLI-API:healthcheck )
 
 if [ "$response" == "200" ]; then
     echo "CCSDK health check passed."

diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index e1d3813..825f7a5 100644 (file)
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -4,7 +4,7 @@ FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
 USER root
 
 # Copy the opendaylight credentials
-COPY idmlight.db.mv.db $ODL_HOME/data
+# COPY idmlight.db.mv.db $ODL_HOME/data
 
 # Copy CCSDK mvn artifacts to ODL repository
 COPY system /tmp/system

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index d938724..d9c20cf 100644 (file)
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -25,7 +25,8 @@
 # Install SDN-C platform components if not already installed and start container
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+#ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
 INSTALLED_DIR=${INSTALLED_FILE:-${ODL_HOME}/current/daexim}