self.specs.set_openstack_spec(openstack_spec)
self.vni_ports = []
sys.stdout.flush()
+ self.check_options()
+
+ def check_options(self):
+ if self.base_config.vxlan:
+ if self.base_config.vlan_tagging:
+ raise Exception(
+ 'Inner VLAN tagging is not currently supported for VXLAN')
+ vtep_vlan = self.base_config.traffic_generator.get('vtep_vlan')
+ if vtep_vlan is None:
+ LOG.warning('Warning: VXLAN mode enabled, but VTEP vlan is not defined')
def set_notifier(self, notifier):
self.notifier = notifier
self.factory,
self.notifier)
new_frame_sizes = []
- min_packet_size = "68" if self.config.vlan_tagging else "64"
+ # make sure that the min frame size is 64
+ min_packet_size = 64
for frame_size in self.config.frame_sizes:
try:
- if int(frame_size) < int(min_packet_size):
- new_frame_sizes.append(min_packet_size)
- LOG.info("Adjusting frame size %s Bytes to minimum size %s Bytes due to " +
- "traffic generator restriction", frame_size, min_packet_size)
- else:
+ if int(frame_size) < min_packet_size:
+ frame_size = str(min_packet_size)
+ LOG.info("Adjusting frame size %s bytes to minimum size %s bytes",
+ frame_size, min_packet_size)
+ if frame_size not in new_frame_sizes:
new_frame_sizes.append(frame_size)
except ValueError:
- new_frame_sizes.append(frame_size)
- self.config.actual_frame_sizes = tuple(new_frame_sizes)
+ new_frame_sizes.append(frame_size.upper())
+ self.config.frame_sizes = new_frame_sizes
result = {
"date": datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
"nfvbench_version": __version__,
self.config_plugin.validate_config(config, self.specs.openstack)
-def parse_opts_from_cli():
+def _parse_opts_from_cli():
parser = argparse.ArgumentParser()
parser.add_argument('--status', dest='status',
parser.add_argument('--inter-node', dest='inter_node',
default=None,
action='store_true',
- help='run VMs in different compute nodes (PVVP only)')
+ help='(deprecated)')
parser.add_argument('--sriov', dest='sriov',
default=None,
action='store_true',
help='Skip vswitch configuration and retrieving of stats')
+ parser.add_argument('--vxlan', dest='vxlan',
+ default=None,
+ action='store_true',
+ help='Enable VxLan encapsulation')
+
parser.add_argument('--no-cleanup', dest='no_cleanup',
default=None,
action='store_true',
config_plugin = factory.get_config_plugin_class()(config)
config = config_plugin.get_config()
- opts, unknown_opts = parse_opts_from_cli()
+ opts, unknown_opts = _parse_opts_from_cli()
log.set_level(debug=opts.debug)
if opts.version: