Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MPLS support + loop_vm_arp test fix
[nfvbench.git]
/
nfvbench
/
nfvbench.py
diff --git
a/nfvbench/nfvbench.py
b/nfvbench/nfvbench.py
index
eb86dea
..
50b96b6
100644
(file)
--- 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)
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
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)
'(inner VLAN tagging must be disabled)')
self.config_plugin.validate_config(config, self.specs.openstack)
@@
-343,6
+346,12
@@
def _parse_opts_from_cli():
help='Do not use ARP to find MAC addresses, '
'instead use values in config file')
help='Do not use ARP to find MAC addresses, '
'instead use values in config file')
+ parser.add_argument('--loop-vm-arp', dest='loop_vm_arp',
+ default=None,
+ action='store_true',
+ help='Use ARP to find MAC addresses '
+ 'instead of using values from TRex ports (VPP forwarder only)')
+
parser.add_argument('--no-vswitch-access', dest='no_vswitch_access',
default=None,
action='store_true',
parser.add_argument('--no-vswitch-access', dest='no_vswitch_access',
default=None,
action='store_true',
@@
-353,6
+362,11
@@
def _parse_opts_from_cli():
action='store_true',
help='Enable VxLan encapsulation')
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',
parser.add_argument('--no-cleanup', dest='no_cleanup',
default=None,
action='store_true',
@@
-596,6
+610,8
@@
def main():
config.compute_nodes = opts.hypervisor
if opts.vxlan:
config.vxlan = True
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:
if opts.restart:
config.restart = True
if opts.service_mode: