nfvbenchvm: refactor wait for VPP service

[nfvbench.git] / nfvbench / chain_runner.py

diff --git a/nfvbench/chain_runner.py b/nfvbench/chain_runner.py
index 7b1153f..f045528 100644 (file)
--- a/nfvbench/chain_runner.py
+++ b/nfvbench/chain_runner.py
@@ -155,7 +155,10 @@ class ChainRunner(object):
             if self.config.single_run:
                 result['run_config'] = self.traffic_client.get_run_config(result)
                 required = result['run_config']['direction-total']['orig']['rate_pps']
-                actual = result['stats']['total_tx_rate']
+                if self.config.periodic_gratuitous_arp:
+                    actual = result['stats']['total_tx_rate'] + self.config.gratuitous_arp_pps
+                else:
+                    actual = result['stats']['total_tx_rate']
                 warning = self.traffic_client.compare_tx_rates(required, actual)
                 if warning is not None:
                     result['run_config']['warning'] = warning
@@ -210,8 +213,8 @@ class ChainRunner(object):
                 LOG.info('Clean up skipped.')
             try:
                 self.traffic_client.close()
-            except Exception:
-                LOG.exception()
+            except Exception as exc:
+                LOG.exception(exc)
             if self.stats_manager:
                 self.stats_manager.close()
         except Exception: