From 8faf4cc8f09ebea48b74e6142a14dcca4633778b Mon Sep 17 00:00:00 2001
From: Pierrick Louin <pierrick.louin@orange.com>
Date: Tue, 13 Oct 2020 17:21:42 +0200
Subject: NFVBENCH-180: Add a 'no_e2e_check' option to skip "end to end"
 connectivity check

Change-Id: Ic4ed852752a542f958f9ccb74369825bc85ddadb
Signed-off-by: Pierrick Louin <pierrick.louin@orange.com>
---
 nfvbench/cfg.default.yaml |  8 +++++++-
 nfvbench/chain_runner.py  |  4 ++++
 nfvbench/nfvbench.py      | 11 +++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/nfvbench/cfg.default.yaml b/nfvbench/cfg.default.yaml
index ac31d05..80d5b68 100644
--- a/nfvbench/cfg.default.yaml
+++ b/nfvbench/cfg.default.yaml
@@ -868,10 +868,16 @@ no_flow_stats: false
 no_latency_stats: false
 
 # Disable latency measurements (no streams)
-# Can be overriden by --no-latency-stream
+# Can be overriden by --no-latency-streams
 # Should be left to the default value (false)
 no_latency_streams: false
 
+# Skip "end to end" connectivity check on traffic setup
+# Can be overriden by --no-e2e-check
+# Should be left to the default value (false)
+# This flag is usable for traffic generation only
+no_e2e_check: false
+
 # General purpose register (debugging flags)
 # Can be overriden by --debug-mask
 # Designed for development needs
diff --git a/nfvbench/chain_runner.py b/nfvbench/chain_runner.py
index 62a3751..ae9ccff 100644
--- a/nfvbench/chain_runner.py
+++ b/nfvbench/chain_runner.py
@@ -117,6 +117,10 @@ class ChainRunner(object):
         LOG.info('ChainRunner initialized')
 
     def __setup_traffic(self):
+        # possibly skip connectivity check
+        if self.config.no_e2e_check:
+            LOG.info('Skipping end to end connectivity check')
+            return
         self.traffic_client.setup()
         if not self.config.no_traffic:
             # ARP is needed for EXT chain or VxLAN overlay or MPLS unless disabled explicitly
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py
index f7fe5a1..314b828 100644
--- a/nfvbench/nfvbench.py
+++ b/nfvbench/nfvbench.py
@@ -529,6 +529,8 @@ def _parse_opts_from_cli():
                         help='Override the T-Rex \'cores\' parameter')
 
     parser.add_argument('--cache-size', dest='cache_size',
+                        type=int_arg,
+                        metavar='<size>',
                         action='store',
                         default='0',
                         help='Specify the FE cache size (default: 0, flow-count if < 0)')
@@ -536,12 +538,17 @@ def _parse_opts_from_cli():
     parser.add_argument('--service-mode', dest='service_mode',
                         action='store_true',
                         default=False,
-                        help='Enable T-Rex service mode for debugging only')
+                        help='Enable T-Rex service mode (for debugging purpose)')
+
+    parser.add_argument('--no-e2e-check', dest='no_e2e_check',
+                        action='store_true',
+                        default=False,
+                        help='Skip "end to end" connectivity check (on test purpose)')
 
     parser.add_argument('--no-flow-stats', dest='no_flow_stats',
                         action='store_true',
                         default=False,
-                        help='Disable extra flow stats (on high load traffic)')
+                        help='Disable additional flow stats (on high load traffic)')
 
     parser.add_argument('--no-latency-stats', dest='no_latency_stats',
                         action='store_true',
-- 
cgit 1.2.3-korg