summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-10-02 16:46:36 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-02 16:46:36 +0000
commited9df29ed6ea2ac0310cfb37318cdd5d126b85dd (patch)
treec03cbc198e78324c5f8e60b82c499790896fc65e
parentd33a9efbc12d3128b8d7b7427079beb74c4f84b4 (diff)
parentfd98e3c936c4d3a0695dfee1af25e741bd892178 (diff)
Merge "Change to AAF-compatible default credentials"
-rw-r--r--plans/policy/apex-pdp/setup.sh3
-rwxr-xr-xscripts/policy/script1.sh2
-rw-r--r--tests/policy/suite1/global_properties.robot4
3 files changed, 5 insertions, 4 deletions
diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index 7ab5b9e2..c97072d4 100644
--- a/plans/policy/apex-pdp/setup.sh
+++ b/plans/policy/apex-pdp/setup.sh
@@ -21,11 +21,12 @@ docker run -d --name apex -p 12561:12561 -p 23324:23324 -it nexus3.onap.org:1000
APEX_IP=`get-instance-ip.sh apex`
echo APEX IP IS ${APEX_IP}
-Wait for initialization
+# Wait for initialization
for i in {1..10}; do
curl -sS ${APEX_IP}:23324 && break
echo sleep $i
sleep $i
done
+sleep 10
ROBOT_VARIABLES="-v APEX_IP:${APEX_IP}"
diff --git a/scripts/policy/script1.sh b/scripts/policy/script1.sh
index b38401e3..70706921 100755
--- a/scripts/policy/script1.sh
+++ b/scripts/policy/script1.sh
@@ -147,7 +147,7 @@ TIME_OUT=600
INTERVAL=20
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
- curl -k -i --user healthcheck:zb!XztG34 -H "ContentType: application/json" -H "Accept: application/json" https://${POLICY_IP}:6969/healthcheck && break
+ curl -k -i --user "demo@people.osaaf.org:demo123456!" -H "ContentType: application/json" -H "Accept: application/json" https://${POLICY_IP}:6969/healthcheck && break
echo Sleep: $INTERVAL seconds before testing if Policy is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
sleep $INTERVAL
diff --git a/tests/policy/suite1/global_properties.robot b/tests/policy/suite1/global_properties.robot
index 60826bbc..e0c816ea 100644
--- a/tests/policy/suite1/global_properties.robot
+++ b/tests/policy/suite1/global_properties.robot
@@ -26,5 +26,5 @@ ${GLOBAL_POLICY_SERVER_URL} https://%{PDP_IP}:8081
${GLOBAL_POLICY_AUTH} dGVzdHBkcDphbHBoYTEyMw==
${GLOBAL_POLICY_CLIENTAUTH} cHl0aG9uOnRlc3Q=
${GLOBAL_POLICY_HEALTHCHECK_URL} https://%{POLICY_IP}:6969
-${GLOBAL_POLICY_USERNAME} healthcheck
-${GLOBAL_POLICY_PASSWORD} zb!XztG34
+${GLOBAL_POLICY_USERNAME} demo@people.osaaf.org
+${GLOBAL_POLICY_PASSWORD} demo123456!