From fc235fbbee490dd19bdadc99dfb6e39587d05bb3 Mon Sep 17 00:00:00 2001 From: mortenhillbom Date: Tue, 22 Aug 2017 17:11:22 -0700 Subject: NFVBENCH-1 Number of seconds to wait for VMs to pass traffic can be set in config Change-Id: Ia4ee4a89e3b839b287b7960c0d31dbc96e1f0331 Signed-off-by: mortenhillbom --- nfvbench/cfg.default.yaml | 3 +++ nfvbench/chain_clients.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 -- cgit 1.2.3-korg