enable https for csit policy healthchecks

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

diff --git a/test/csit/scripts/policy/script1.sh b/test/csit/scripts/policy/script1.sh
index 7bb9731..12509ed 100755 (executable)
--- a/test/csit/scripts/policy/script1.sh
+++ b/test/csit/scripts/policy/script1.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright 2017-2018 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -147,7 +147,7 @@ TIME_OUT=600
 INTERVAL=20 
 TIME=0 
 while [ "$TIME" -lt "$TIME_OUT" ]; do 
-    curl -i --user healthcheck:zb!XztG34 -H "ContentType: application/json" -H "Accept: application/json" ${POLICY_IP}:6969/healthcheck && break
+    curl -k -i --user healthcheck:zb!XztG34 -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/test/csit/tests/policy/suite1/global_properties.robot b/test/csit/tests/policy/suite1/global_properties.robot
index 911fdaf..60826bb 100644 (file)
--- a/test/csit/tests/policy/suite1/global_properties.robot
+++ b/test/csit/tests/policy/suite1/global_properties.robot
@@ -25,6 +25,6 @@ ${GLOBAL_VM_PRIVATE_KEY}   ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pv
 ${GLOBAL_POLICY_SERVER_URL}    https://%{PDP_IP}:8081
 ${GLOBAL_POLICY_AUTH}  dGVzdHBkcDphbHBoYTEyMw==
 ${GLOBAL_POLICY_CLIENTAUTH}     cHl0aG9uOnRlc3Q=
-${GLOBAL_POLICY_HEALTHCHECK_URL}       http://%{POLICY_IP}:6969
+${GLOBAL_POLICY_HEALTHCHECK_URL}       https://%{POLICY_IP}:6969
 ${GLOBAL_POLICY_USERNAME}      healthcheck
 ${GLOBAL_POLICY_PASSWORD}      zb!XztG34