From: louie.long Date: Fri, 16 Mar 2018 07:11:22 +0000 (+0800) Subject: [NFVBENCH-74] packet payload length without vlan X-Git-Tag: 1.3.0~7 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F53943%2F1;p=nfvbench.git [NFVBENCH-74] packet payload length without vlan fix packet playload length without vlan tag, ensure that the minimum packet size is 64 bytes with or without the vlan tag Change-Id: Iabea46756905e3b16791436642cdca58ec8fed6f Signed-off-by: louie.long --- diff --git a/nfvbench/traffic_gen/trex.py b/nfvbench/traffic_gen/trex.py index e42afce..1e7c133 100644 --- a/nfvbench/traffic_gen/trex.py +++ b/nfvbench/traffic_gen/trex.py @@ -136,13 +136,16 @@ class TRex(AbstractTrafficGenerator): return result def create_pkt(self, stream_cfg, l2frame_size): - # 46 = 14 (Ethernet II) + 4 (CRC Checksum) + 20 (IPv4) + 8 (UDP) - payload = 'x' * (max(64, int(l2frame_size)) - 46) pkt_base = Ether(src=stream_cfg['mac_src'], dst=stream_cfg['mac_dst']) if stream_cfg['vlan_tag'] is not None: + # 50 = 14 (Ethernet II) + 4 (Vlan tag) + 4 (CRC Checksum) + 20 (IPv4) + 8 (UDP) pkt_base /= Dot1Q(vlan=stream_cfg['vlan_tag']) + payload = 'x' * (max(64, int(l2frame_size)) - 50) + else: + # 46 = 14 (Ethernet II) + 4 (CRC Checksum) + 20 (IPv4) + 8 (UDP) + payload = 'x' * (max(64, int(l2frame_size)) - 46) udp_args = {} if stream_cfg['udp_src_port']: