NFVBENCH-108 Adjust exact frame size to take into account FCS field

[nfvbench.git] / nfvbench / nfvbench.py

diff --git a/nfvbench/nfvbench.py b/nfvbench/nfvbench.py
index 933d6fa..0d6da7f 100644 (file)
--- 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__,