Change to AAF-compatible default credentials

Change-Id: I4a5f5bb716a5acd0d823ca29d85defeebbcb55ef
Issue-ID: POLICY-1156
Signed-off-by: Jorge Hernandez <jh1730@att.com>

diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index 7ab5b9e..c97072d 100644 (file)
--- 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 b38401e..7070692 100755 (executable)
--- 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 60826bb..e0c816e 100644 (file)
--- 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!