summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormortenhillbom <mortenhillbom@gmail.com>2017-08-22 17:11:22 -0700
committermortenhillbom <mortenhillbom@gmail.com>2017-08-22 18:08:57 -0700
commitfc235fbbee490dd19bdadc99dfb6e39587d05bb3 (patch)
tree9ce376b0337a64410dbbbd2926de5c5e8b58400d
parent2d55474511a5057015e77547c326120c1649c0b7 (diff)
NFVBENCH-1 Number of seconds to wait for VMs to pass traffic can be
set in config Change-Id: Ia4ee4a89e3b839b287b7960c0d31dbc96e1f0331 Signed-off-by: mortenhillbom <mortenhillbom@gmail.com>
-rw-r--r--nfvbench/cfg.default.yaml3
-rw-r--r--nfvbench/chain_clients.py4
2 files changed, 6 insertions, 1 deletions
diff --git a/nfvbench/cfg.default.yaml b/nfvbench/cfg.default.yaml
index a082a8f..196e40a 100644
--- a/nfvbench/cfg.default.yaml
+++ b/nfvbench/cfg.default.yaml
@@ -198,6 +198,9 @@ traffic_generator:
# The openrc file
openrc_file:
+# Number of seconds to wait for VMs to pass traffic in both directions
+check_traffic_time_sec: 200
+
# General retry count
generic_retry_count: 100
diff --git a/nfvbench/chain_clients.py b/nfvbench/chain_clients.py
index affccc8..bf51552 100644
--- a/nfvbench/chain_clients.py
+++ b/nfvbench/chain_clients.py
@@ -48,7 +48,9 @@ class BasicStageClient(object):
self.host_ips = None
def _ensure_vms_active(self):
- for _ in range(self.config.generic_retry_count):
+ retry_count = (self.config.check_traffic_time_sec +
+ self.config.generic_poll_sec - 1) / self.config.generic_poll_sec
+ for _ in range(retry_count):
for i, instance in enumerate(self.vms):
if instance.status == 'ACTIVE':
continue