diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-03-04 12:02:29 +0200 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-03-04 12:02:29 +0200 |
| commit | f1942bcdbcdba191e5232efb848bb5de6500e081 (patch) | |
| tree | 80463954d58de456ce21cbea79b032a25b3f53d4 | |
| parent | 6d6447035fae83955e97e7c13804bf55a728e6a9 (diff) | |
Improve sdnc_netconf_tls_post_deploy timeouts
- reduce or remove waiting times
- fail on SDNC startup timeout
- this commit covers the corrections in obsoleted and abandoned commit
https://gerrit.onap.org/r/c/integration/csit/+/115477 for the
issues that still remain in master
Issue-ID: CCSDK-2915
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I8183b8171bc47318395deb92badcbbc5beb8ca90
| -rw-r--r-- | plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh index 1cb65071..e712ee1c 100644 --- a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh +++ b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh @@ -2,6 +2,7 @@ # # ============LICENSE_START======================================================= # Copyright (C) 2020 Nordix Foundation. +# Modification copyright (C) 2021 Samsung Electronics, Co., Ltd. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -119,11 +120,12 @@ for i in {1..10}; do break fi echo "Waiting for SDNC Service to Start Up..." - sleep 2m + sleep 30s done if [[ "${SDNC_IP}" == 'none' || "${SDNC_IP}" == '' || "${RESP_CODE}" != '200' ]]; then - echo "SDNC Service not started Could cause problems for testing activities...!" + echo "SDNC Service not started, setup failed" + exit 1 fi # Check if SDNC-ODL Karaf Session started @@ -149,17 +151,11 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then exit 1; fi - - - # Update default Networking bridge IP in mount.json file sed -i "s/pnfaddr/${LOCAL_IP}/g" "${REQUEST_DATA_PATH}"/mount.xml ######################################################################### -echo "Sleeping additional for 3 minutes to give application time to finish" -sleep 3m - # Export SDNC, AAF-Certservice-Cient, Netconf-Pnp-Simulator Continer Names export REQUEST_DATA_PATH="${REQUEST_DATA_PATH}" export SDNC_CONTAINER_NAME="${SDNC_CONTAINER_NAME}" |