Add additional health delay
- update test_vnf to wait for ns to delete
Signed-off-by: Michael Marchetti <mmarchetti@sandvine.com>
diff --git a/installers/osm_health.sh b/installers/osm_health.sh
index b8e24ad..2684af7 100755
--- a/installers/osm_health.sh
+++ b/installers/osm_health.sh
@@ -3,6 +3,7 @@
WAIT_TIME=180 # LCM healthcheck needs 140 senconds
SERVICES_WITH_HEALTH="nbi ro zookeeper lcm"
NUM_SERVICES_WITH_HEALTH=$(echo $SERVICES_WITH_HEALTH | wc -w)
+WAIT_FINAL=30
while getopts "w:s:n:c:" o; do
case "${o}" in
@@ -26,6 +27,9 @@
step=2
while [ $time -le "$WAIT_TIME" ]; do
if [ "$(docker ps | grep " ${STACK_NAME}_" | grep -i healthy | wc -l)" -ge "$NUM_SERVICES_WITH_HEALTH" ]; then
+ # all dockers are healthy now.
+ # final sleep is needed until more health checks are added to validate system is ready to handle requests
+ sleep $WAIT_FINAL
exit 0
fi
diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index 53f39ac..b84da44 100644
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -117,6 +117,12 @@
assert not osm.get_api().ns.delete(ns_name)
+ #wait for the ns to delete
+ try:
+ utils.wait_for_value( lambda: osm.get_api().ns.get(nsd_desc['name']), result=False, wait_time=60)
+ except:
+ pass
+
assert not osm.get_api().nsd.delete(nsd_desc['name'])
for file in vnfd_file_list: