summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-12 18:59:57 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-12 18:59:57 +0000
commitd6534489b43de196db8326445fef10d8b5338a06 (patch)
treeaa9ff431ace2b40070b177ac870ddec04b07616a
parent112ee2f0b0f2ec2d3dbf7f23c964c6ffb2c1564a (diff)
parentfb151268c93a00844ac6a1f534fa0e1b944e1bff (diff)
Merge "enable https for csit policy healthchecks"
-rwxr-xr-xtest/csit/scripts/policy/script1.sh4
-rw-r--r--test/csit/tests/policy/suite1/global_properties.robot2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/csit/scripts/policy/script1.sh b/test/csit/scripts/policy/script1.sh
index 7bb9731c8..12509eda7 100755
--- 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 911fdaff9..60826bbc3 100644
--- 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