From e17b4b5b35936c5032cbeb3ccf8efbbc4c59c686 Mon Sep 17 00:00:00 2001 From: ahothan Date: Wed, 16 May 2018 10:56:01 -0700 Subject: NFVBENCH-94 End to end traffic test triggers too early on chatty network Change-Id: I995cf3209ec4ac8c324e2bc4bee202e0639bf0b3 Signed-off-by: ahothan --- nfvbench/traffic_client.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'nfvbench/traffic_client.py') diff --git a/nfvbench/traffic_client.py b/nfvbench/traffic_client.py index 5305da9..188e076 100755 --- a/nfvbench/traffic_client.py +++ b/nfvbench/traffic_client.py @@ -486,6 +486,10 @@ class TrafficClient(object): self.config.generic_poll_sec - 1) / self.config.generic_poll_sec mac_addresses = set() ln = 0 + # in case of l2-loopback, we will only have 2 unique src MAC regardless of the + # number of chains configured because there are no VM involved + # otherwise, we expect to see packets coming from 2 unique MAC per chain + unique_src_mac_count = 2 if self.config.l2_loopback else self.config.service_chain_count * 2 for it in xrange(retry_count): self.gen.clear_stats() self.gen.start_traffic() @@ -501,9 +505,8 @@ class TrafficClient(object): mac_addresses.add(packet['binary'][6:12]) if ln != len(mac_addresses): ln = len(mac_addresses) - LOG.info('Flows passing traffic %d / %d', ln, - self.config.service_chain_count * 2) - if len(mac_addresses) == self.config.service_chain_count * 2: + LOG.info('Received unique source MAC %d / %d', ln, unique_src_mac_count) + if len(mac_addresses) == unique_src_mac_count: LOG.info('End-to-end connectivity ensured') return -- cgit 1.2.3-korg