Merge "Update the release version for OOF csit"
diff --git a/run-csit.sh b/run-csit.sh
index 2c45812..634b0c7 100755
--- a/run-csit.sh
+++ b/run-csit.sh
@@ -22,6 +22,29 @@
# functions
#
+function on_exit(){
+ rc=$?
+ rsync -av "$WORKDIR/" "$WORKSPACE/archives"
+
+ # Record list of active docker containers
+ docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log"
+
+ # show memory consumption after all docker instances initialized
+ docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt"
+
+ # Run teardown script plan if it exists
+ cd "${TESTPLANDIR}"
+ TEARDOWN="${TESTPLANDIR}/teardown.sh"
+ if [ -f "${TEARDOWN}" ]; then
+ echo "Running teardown script ${TEARDOWN}"
+ source_safely "${TEARDOWN}"
+ fi
+ # TODO: do something with the output
+ exit $rc
+}
+# ensure that teardown and other finalizing steps are always executed
+trap on_exit EXIT
+
function docker_stats(){
#General memory details
echo "> top -bn1 | head -3"
@@ -166,22 +189,5 @@
RESULT=$?
load_set
echo "RESULT: $RESULT"
-rsync -av "$WORKDIR/" "$WORKSPACE/archives"
-
-# Record list of active docker containers
-docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log"
-
-# show memory consumption after all docker instances initialized
-docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt"
-
-# Run teardown script plan if it exists
-cd "${TESTPLANDIR}"
-TEARDOWN="${TESTPLANDIR}/teardown.sh"
-if [ -f "${TEARDOWN}" ]; then
- echo "Running teardown script ${TEARDOWN}"
- source_safely "${TEARDOWN}"
-fi
-
-# TODO: do something with the output
-
+# Note that the final steps are done in on_exit function after this exit!
exit $RESULT
diff --git a/scripts/policy/config/drools-apps/env/base.conf b/scripts/policy/config/drools-apps/env/base.conf
index c11e7e9..f32162f 100644
--- a/scripts/policy/config/drools-apps/env/base.conf
+++ b/scripts/policy/config/drools-apps/env/base.conf
@@ -80,11 +80,13 @@
PDP_HOST=pdp
PDP_PORT=6969
+PDP_CONTEXT_URI=policy/pdpx/v1
PDP_USERNAME=testpdp
PDP_PASSWORD=alpha123
PDP_CLIENT_USERNAME=python
PDP_CLIENT_PASSWORD=test
PDP_ENVIRONMENT=TEST
+GUARD_DISABLED=false
# DCAE DMaaP
@@ -100,6 +102,7 @@
AAI_HOST=aai.api.simpledemo.onap.org
AAI_PORT=8443
+AAI_CONTEXT_URI=
AAI_URL=https://aai.api.simpledemo.onap.org:8443
AAI_USERNAME=policy@policy.onap.org
AAI_PASSWORD=demo123456!
@@ -108,6 +111,7 @@
SO_HOST=vm1.mso.simpledemo.onap.org
SO_PORT=8080
+SO_CONTEXT_URI=onap/so/infra
SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
@@ -116,6 +120,7 @@
VFC_HOST=
VFC_PORT=
+VFC_CONTEXT_URI=api/nslcm/v1
VFC_URL=
VFC_USERNAME=
VFC_PASSWORD=
@@ -124,6 +129,7 @@
SDNC_HOST=
SDNC_PORT=
+SDNC_CONTEXT_URI=restconf/operations
SDNC_URL=
SDNC_USERNAME=
SDNC_PASSWORD=
diff --git a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
index 1941e35..49e4faa 100644
--- a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
+++ b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
@@ -3,7 +3,7 @@
Resource sdc_dcaed_interface.robot
*** Test Cases ***
-# This test case implements the steps described in
+# For now, this test case implements the steps described in
# https://wiki.onap.org/display/DW/How+to+Create+a+Service+with+a+Monitoring+Configuration+using+SDC
Create Service With Monitoring Configuration Test
[Tags] sdc-dcae-d