summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcristinapauna <cristina.pauna@enea.com>2016-11-08 15:58:41 +0200
committercristinapauna <cristina.pauna@enea.com>2016-11-16 13:21:11 +0200
commitc518c53072d82fe2e5baa1e403cadabd2e029d32 (patch)
treee9803106b005a947bebd6a916f0bac487718dd85
parent4a40c2ecb7c675fed0d8d29ca4cbb608d6eb7bc8 (diff)
Make the healthcheck sleep time configurable
The healthcheck test has a 1 min sleep that gives time to the odl flows to get programmed. This time depends on the config, and it was noticed that on bgpvpn scenarios on arm more than one minute is needed for the config to be properly set. This patch makes the waiting time configurable, so it can be overriden it when ran on arm or on varios scenarios. Change-Id: Iebef892137ca3926e5732c910a358c15a32b5bef Signed-off-by: cristinapauna <cristina.pauna@enea.com>
-rw-r--r--ci/config_functest.yaml1
-rwxr-xr-xtestcases/OpenStack/healthcheck/healthcheck.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index d6497678a..fe2a2d6fe 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -56,6 +56,7 @@ general:
healthcheck:
disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
disk_format: qcow2
+ wait_time: 60
vping:
ping_timeout: 200
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 996aadcf7..e27cf4b4b 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -223,7 +223,8 @@ info "Testing Nova API..."
# This delay should be removed after resolving Jira case APEX-149.
# The purpose is to give some time to populate openflow rules
# by SDN controller in case of odl_l2 scenario.
-sleep 60
+wait_time=$(cat ${YAML_FILE} | shyaml get-value healthcheck.wait_time 2> /dev/null || true)
+sleep ${wait_time}
# Check if flavor exists