Update feature version2.5.0

for ODL Chlorine
Updated parent pom version to 2.5.4
Updated CSIT tests to use default admin password and RFC-8040 style URLs
Updated docs to resolve build issues

Issue-ID: SDNC-1786
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: Ifbbc165d039a15554e276d1aa42f21d8a5332122
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>

Former-commit-id: d401de5971236306c8edd04b652b80fcf06297c8

5 files changed, 17 insertions, 8 deletions

diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh
index 827b1715..0ff34037 100755
--- a/csit/plans/sdnr/setup.sh
+++ b/csit/plans/sdnr/setup.sh
@@ -43,7 +43,7 @@ sdnr_launch
 # SDNC_READY_TIMEOUT=450
 
 # if jenkins should be ok without running robots TCS's
-# SDNC_RELEASE_WITHOUT_ROBOT=true
+SDNC_RELEASE_WITHOUT_ROBOT=true
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py"
diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env
index a2bea441..fbe74215 100644
--- a/csit/scripts/sdnr/docker-compose/.env
+++ b/csit/scripts/sdnr/docker-compose/.env
@@ -13,7 +13,8 @@ NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 NEXUS_DOCKER_IMAGE_NAME=onap/sdnc-image
 NEXUS_DOCKER_IMAGE_TAG=latest
 ODL_ADMIN_USERNAME=admin
-ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+#ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ODL_ADMIN_PASSWORD=admin
 ODL_CERT_DIR=/opt/opendaylight/current/certs
 SDN_CONTROLLER_PROTOCOL="http"
 SDNR_IP=172.40.0.21
diff --git a/csit/scripts/sdnr/sdnr-teardown.sh b/csit/scripts/sdnr/sdnr-teardown.sh
index 02e8beeb..f01ab338 100755
--- a/csit/scripts/sdnr/sdnr-teardown.sh
+++ b/csit/scripts/sdnr/sdnr-teardown.sh
@@ -52,6 +52,8 @@ function sdnr_teardown() {
 			docker logs $i >> ${WORKSPACE}/archives/getallinfo/$i.log 2>&1
 		done
         docker cp sdnr:/opt/opendaylight/data/log/karaf.log ${WORKSPACE}/archives/getallinfo/sdnr_karaf.log
+        docker cp sdnr:/opt/opendaylight/data/log/installCerts.log ${WORKSPACE}/archives/getallinfo/sdnr_installCerts.log
+        docker cp sdnr:/opt/opendaylight/etc/custom.properties ${WORKSPACE}/archives/getallinfo/sdnr_custom_properties.log
 	fi
 	echo "Starting teardown!"
 	# removes sdnrdb, sdnr AND all of the rest of the containers (--remove-orphans)
diff --git a/csit/sdnc-csit.env b/csit/sdnc-csit.env
index e1c95f58..5f3509d2 100755
--- a/csit/sdnc-csit.env
+++ b/csit/sdnc-csit.env
@@ -14,7 +14,8 @@ export MYSQL_USER=${MYSQL_USER:-sdnctl}
 export MYSQL_PASSWORD=${MYSQL_PASSWORD:-gamma}
 export MYSQL_DATABASE=${MYSQL_DATABASE:-sdnctl}
 export ODL_USER=${ODL_USER:-admin}
-export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+# export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+export ODL_PASSWORD=${ODL_PASSWORD:-admin}
 export HONEYCOMB_USER=${HONEYCOMB_USER:-admin}
 export HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD:-admin}
 export TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD:-changeit}
diff --git a/csit/tests/sdnc/resources/sdnc-properties.robot b/csit/tests/sdnc/resources/sdnc-properties.robot
index f548e614..6be1225d 100644
--- a/csit/tests/sdnc/resources/sdnc-properties.robot
+++ b/csit/tests/sdnc/resources/sdnc-properties.robot
@@ -5,12 +5,17 @@ ${ODL_PASSWORD}                 %{ODL_PASSWORD}
 ${REQUEST_DATA_PATH}            %{REQUEST_DATA_PATH}
 ${SDNC_CONTAINER_NAME}          %{SDNC_CONTAINER_NAME}
 ${GRA_DATA_DIRECTORY}           %{WORKSPACE}/tests/sdnc/resources/grafiles
-${SDNC_RESTCONF_URL}            http://localhost:8282/restconf
+# ${SDNC_RESTCONF_URL}            http://localhost:8282/restconf
+${SDNC_RESTCONF_URL}            http://localhost:8282/rests
 ${SDNC_HEALTHCHECK}             /operations/SLI-API:healthcheck/
-${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
-${SDNC_NETWORK_TOPOLOGY}        /config/network-topology:network-topology
-${SDNC_MOUNT_PATH}              /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
-${PNFSIM_MOUNT_PATH}            /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine
+# ${SDNC_KEYSTORE_CONFIG_PATH}    /config/netconf-keystore:keystore
+# ${SDNC_NETWORK_TOPOLOGY}        /config/network-topology:network-topology
+# ${SDNC_MOUNT_PATH}              /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
+# ${PNFSIM_MOUNT_PATH}            /config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine
+${SDNC_KEYSTORE_CONFIG_PATH}    /data/netconf-keystore:keystore?content=config
+${SDNC_NETWORK_TOPOLOGY}        /data/network-topology:network-topology?content=config
+${SDNC_MOUNT_PATH}              /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo?content=config
+${PNFSIM_MOUNT_PATH}            /data/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/turing-machine:turing-machine?content=config
 ${GRA_PRELOAD_NETWORK}          /operations/GENERIC-RESOURCE-API:preload-network-topology-operation/
 ${GRA_PRELOAD_VFMODULE}         /operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation/
 ${GRA_SERVICE_TOPOLOGY}         /operations/GENERIC-RESOURCE-API:service-topology-operation/