@@ -765,7 +765,14 @@ class TestVfOffload(TestCase):
self.tester.get_local_port(self.dut_ports[1])
)
- self.loading_sizes = [128, 800, 801, 1700, 2500]
+ self.size_and_count = [
+ (128, 10),
+ (800, 10),
+ (801, 10),
+ (1700, 10),
+ (2500, 10),
+ (8500, 1000)
+ ]
self.tester.send_expect(
"ethtool -K %s rx off tx off tso off gso off gro off lro off"
@@ -839,13 +846,13 @@ class TestVfOffload(TestCase):
self.tester.scapy_foreground()
time.sleep(5)
- for loading_size in self.loading_sizes:
+ for loading_size, packet_count in self.size_and_count:
# IPv4 tcp test
out = self.vm0_testpmd.execute_cmd("clear port info all", "testpmd> ", 120)
self.tcpdump_start_sniffing([tx_interface, rx_interface])
self.tester.scapy_append(
- 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/("X"*%s)], iface="%s")'
- % (mac, loading_size, tx_interface)
+ 'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
+ % (mac, loading_size, tx_interface, packet_count)
)
out = self.tester.scapy_execute()
out = self.vm0_testpmd.execute_cmd("show port stats all")
@@ -858,29 +865,29 @@ class TestVfOffload(TestCase):
self.logger.info(tx_outlist)
if loading_size <= 800:
self.verify(
- rx_stats == tx_stats and int(tx_outlist[0]) == loading_size,
+ rx_stats == tx_stats and all([int(tx_outlist[j]) == loading_size for j in range(packet_count)]),
"IPV4 RX or TX packet number not correct",
)
else:
num = loading_size // 800
for i in range(num):
self.verify(
- int(tx_outlist[i]) == 800,
+ all([int(tx_outlist[i * packet_count + j]) == 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % tx_outlist,
)
if loading_size % 800 != 0:
self.verify(
- int(tx_outlist[num]) == loading_size % 800,
+ all([int(tx_outlist[num * packet_count + j]) == loading_size % 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % tx_outlist,
)
- for loading_size in self.loading_sizes:
+ for loading_size, packet_count in self.size_and_count:
# IPv6 tcp test
out = self.vm0_testpmd.execute_cmd("clear port info all", "testpmd> ", 120)
self.tcpdump_start_sniffing([tx_interface, rx_interface])
self.tester.scapy_append(
- 'sendp([Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888")/TCP(sport=1021,dport=1021)/("X"*%s)], iface="%s")'
- % (mac, loading_size, tx_interface)
+ 'sendp([Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count=%s)'
+ % (mac, loading_size, tx_interface, packet_count)
)
out = self.tester.scapy_execute()
out = self.vm0_testpmd.execute_cmd("show port stats all")
@@ -893,19 +900,19 @@ class TestVfOffload(TestCase):
self.logger.info(tx_outlist)
if loading_size <= 800:
self.verify(
- rx_stats == tx_stats and int(tx_outlist[0]) == loading_size,
+ rx_stats == tx_stats and all([int(tx_outlist[j]) == loading_size for j in range(packet_count)]),
"IPV6 RX or TX packet number not correct",
)
else:
num = loading_size // 800
for i in range(num):
self.verify(
- int(tx_outlist[i]) == 800,
+ all([int(tx_outlist[i * packet_count + j]) == 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % tx_outlist,
)
if loading_size % 800 != 0:
self.verify(
- int(tx_outlist[num]) == loading_size % 800,
+ all([int(tx_outlist[num * packet_count + j]) == loading_size % 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % tx_outlist,
)
@@ -924,7 +931,14 @@ class TestVfOffload(TestCase):
self.tester.get_local_port(self.vm0_dut_ports[1])
)
- self.loading_sizes = [128, 800, 801, 1700, 2500]
+ self.size_and_count = [
+ (128, 10),
+ (800, 10),
+ (801, 10),
+ (1700, 10),
+ (2500, 10),
+ (8500, 1000)
+ ]
self.tester.send_expect(
"ethtool -K %s rx off tx off tso off gso off gro off lro off"
@@ -981,7 +995,7 @@ class TestVfOffload(TestCase):
time.sleep(5)
for key_outer in pkts_outer:
- for loading_size in self.loading_sizes:
+ for loading_size, packet_count in self.size_and_count:
# IPv4 tcp test
out = self.vm0_testpmd.execute_cmd(
"clear port info all", "testpmd> ", 120
@@ -995,9 +1009,9 @@ class TestVfOffload(TestCase):
(
'sendp([Ether(dst="%s",src="52:00:00:00:00:00")/'
+ pkts_outer[key_outer]
- + '/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/("X"*%s)], iface="%s")'
+ + '/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/Raw(RandString(size=%s))], iface="%s", count = %s)'
)
- % (mac, loading_size, tx_interface)
+ % (mac, loading_size, tx_interface, packet_count)
)
out = self.tester.scapy_execute()
out = self.vm0_testpmd.execute_cmd("show port stats all")
@@ -1005,26 +1019,27 @@ class TestVfOffload(TestCase):
self.tcpdump_stop_sniff()
rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
+ payload_size_list.sort(reverse=True)
self.logger.info(payload_size_list)
if loading_size <= 800:
self.verify(
- rx_stats == tx_stats and payload_size_list[0] == loading_size,
+ rx_stats == tx_stats and all([payload_size_list == loading_size for j in range(packet_count)]),
f"{key_outer} tunnel IPV4 RX or TX packet number not correct",
)
else:
num = loading_size // 800
for i in range(num):
self.verify(
- payload_size_list[i] == 800,
+ all([payload_size_list[i * packet_count + j] == 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % payload_size_list,
)
if loading_size % 800 != 0:
self.verify(
- payload_size_list[num] == loading_size % 800,
+ all([payload_size_list[num * packet_count + j] == loading_size % 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % payload_size_list,
)
- for loading_size in self.loading_sizes:
+ for loading_size, packet_count in self.size_and_count:
# IPv6 tcp test
out = self.vm0_testpmd.execute_cmd(
"clear port info all", "testpmd> ", 120
@@ -1040,7 +1055,7 @@ class TestVfOffload(TestCase):
+ pkts_outer[key_outer]
+ '/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888")/TCP(sport=1021,dport=1021)/("X"*%s)], iface="%s")'
)
- % (mac, loading_size, tx_interface)
+ % (mac, loading_size, tx_interface, packet_count)
)
out = self.tester.scapy_execute()
out = self.vm0_testpmd.execute_cmd("show port stats all")
@@ -1048,22 +1063,23 @@ class TestVfOffload(TestCase):
self.tcpdump_stop_sniff()
rx_stats, payload_size_list = self.tcpdump_analyse_sniff(rx_interface)
tx_stats, _ = self.tcpdump_analyse_sniff(tx_interface)
+ payload_size_list.sort(reverse=True)
self.logger.info(payload_size_list)
if loading_size <= 800:
self.verify(
- rx_stats == tx_stats and payload_size_list[0] == loading_size,
+ rx_stats == tx_stats and all([payload_size_list[j] == loading_size for j in range(packet_count)]),
f"{key_outer} tunnel IPV6 RX or TX packet number not correct",
)
else:
num = loading_size // 800
for i in range(num):
self.verify(
- payload_size_list[i] == 800,
+ all([payload_size_list[i * packet_count + j] == 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % payload_size_list,
)
if loading_size % 800 != 0:
self.verify(
- payload_size_list[num] == loading_size % 800,
+ all([payload_size_list[num * packet_count + j] == loading_size % 800 for j in range(packet_count)]),
"the packet segmentation incorrect, %s" % payload_size_list,
)