summaryrefslogtreecommitdiffstats
path: root/nfvbench/nfvbench.py
diff options
context:
space:
mode:
authorahothan <ahothan@cisco.com>2018-11-13 15:34:29 -0800
committerahothan <ahothan@cisco.com>2018-11-13 15:34:29 -0800
commit9527113c350f92b2293f596b6153f9c9d626f2af (patch)
tree192c3687ff689fc961b5874298b3d940675e781d /nfvbench/nfvbench.py
parent7a90e74a1390794b72fc5c3629e141f2def908d7 (diff)
NFVBENCH-108 Adjust exact frame size to take into account FCS field2.0.5
Minimum L2 frame size is now set to 64 bytes. If VLAN tagging, min frame size for the latency stream is 68 bytes. Also fix issue with interface baseline. Change-Id: If6ff7515c0112ab419070c86f7094ff88930d33b Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench/nfvbench.py')
-rw-r--r--nfvbench/nfvbench.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py
index 933d6fa..0d6da7f 100644
--- a/nfvbench/nfvbench.py
+++ b/nfvbench/nfvbench.py
@@ -90,18 +90,19 @@ class NFVBench(object):
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__,