- 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
#
# ============LICENSE_START=======================================================
# Copyright (C) 2020 Nordix Foundation.
#
# ============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.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
break
fi
echo "Waiting for SDNC Service to Start Up..."
break
fi
echo "Waiting for SDNC Service to Start Up..."
done
if [[ "${SDNC_IP}" == 'none' || "${SDNC_IP}" == '' || "${RESP_CODE}" != '200' ]]; then
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
fi
# Check if SDNC-ODL Karaf Session started
# Update default Networking bridge IP in mount.json file
sed -i "s/pnfaddr/${LOCAL_IP}/g" "${REQUEST_DATA_PATH}"/mount.xml
#########################################################################
# 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}"
# Export SDNC, AAF-Certservice-Cient, Netconf-Pnp-Simulator Continer Names
export REQUEST_DATA_PATH="${REQUEST_DATA_PATH}"
export SDNC_CONTAINER_NAME="${SDNC_CONTAINER_NAME}"