diff options
| author |   mklyus <mklyus@cisco.com> | 2019-10-11 08:35:51 +0300 |
|---|---|---|
| committer | mklyus <mklyus@cisco.com> | 2020-01-31 11:20:59 +0300 |
| commit | 423f360415e2834dd8de065434023b822e2ca3f8 (patch) | |
| tree | d7a85ebdc6c4b4be982288f5c6ba2f925919f334 /nfvbench/nfvbench.py | |
| parent | ae838f98fa020d0ad0aa37ab58e02456889c3375 (diff) | |
MPLS support + loop_vm_arp test fix4.1.0
Change-Id: I17b1b2a97f0bc185d3906250d5f91b4c8fcb9686
Signed-off-by: Max Klyus <mklyus@cisco.com>
Diffstat (limited to 'nfvbench/nfvbench.py')
| -rw-r--r-- | nfvbench/nfvbench.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py index 168c545..50b96b6 100644 --- a/nfvbench/nfvbench.py +++ b/nfvbench/nfvbench.py @@ -233,11 +233,14 @@ class NFVBench(object): raise Exception('vif_multiqueue_size (%d) must be in [1..8]' % config.vif_multiqueue_size) - # VxLAN sanity checks - if config.vxlan: + # VxLAN and MPLS sanity checks + if config.vxlan or config.mpls: if config.vlan_tagging: config.vlan_tagging = False - LOG.info('VxLAN: vlan_tagging forced to False ' + config.no_latency_streams = True + config.no_latency_stats = True + config.no_flow_stats = True + LOG.info('VxLAN or MPLS: vlan_tagging forced to False ' '(inner VLAN tagging must be disabled)') self.config_plugin.validate_config(config, self.specs.openstack) @@ -359,6 +362,11 @@ def _parse_opts_from_cli(): action='store_true', help='Enable VxLan encapsulation') + parser.add_argument('--mpls', dest='mpls', + default=None, + action='store_true', + help='Enable MPLS encapsulation') + parser.add_argument('--no-cleanup', dest='no_cleanup', default=None, action='store_true', @@ -602,6 +610,8 @@ def main(): config.compute_nodes = opts.hypervisor if opts.vxlan: config.vxlan = True + if opts.mpls: + config.mpls = True if opts.restart: config.restart = True if opts.service_mode: |