From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 97BA0A045E for ; Fri, 31 May 2019 11:19:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D1232C55; Fri, 31 May 2019 11:19:02 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 529274F91 for ; Fri, 31 May 2019 11:19:00 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 May 2019 02:18:59 -0700 X-ExtLoop1: 1 Received: from meijuan2.sh.intel.com ([10.67.119.112]) by fmsmga001.fm.intel.com with ESMTP; 31 May 2019 02:18:59 -0700 From: zhaomeijuan To: dts@dpdk.org Cc: zhaomeijuan Date: Fri, 31 May 2019 17:19:46 +0000 Message-Id: <20190531171948.6944-5-meijuanx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190531171948.6944-1-meijuanx.zhao@intel.com> References: <20190531171948.6944-1-meijuanx.zhao@intel.com> Subject: [dts] [next][PATCH V2 5/7] tests/ipfrag use pktgen API replace old module and fix some issue X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" *.remove old or unused module and code which replace it with pktgen API *.change max framesize as 1518 *.quit task before start another *.fix pep8 issue Signed-off-by: zhaomeijuan --- tests/TestSuite_ipfrag.py | 67 +++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/tests/TestSuite_ipfrag.py b/tests/TestSuite_ipfrag.py index 9f47a2c..a77049c 100644 --- a/tests/TestSuite_ipfrag.py +++ b/tests/TestSuite_ipfrag.py @@ -38,8 +38,12 @@ import utils import string import re import time +import os from settings import HEADER_SIZE from packet import Packet +from pktgen import PacketGeneratorHelper +from test_case import TestCase + lpm_table_ipv4 = [ "{IPv4(100,10,0,0), 16, P1}", @@ -63,8 +67,6 @@ lpm_table_ipv6 = [ "{{8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}, 48, P0}", ] -from test_case import TestCase - class TestIpfrag(TestCase): @@ -84,7 +86,6 @@ class TestIpfrag(TestCase): # Based on h/w type, choose how many ports to use ports = self.dut.get_ports() - print ports # Verify that enough ports are available self.verify(len(ports) >= 2, "Insufficient ports for testing") @@ -109,14 +110,12 @@ l3fwd_ipv4_route_array[] = {\\\n" rtLpmTbl[idx] = pat.sub(self.portRepl, rtLpmTbl[idx]) lpmStr_ipv4 = lpmStr_ipv4 + ' ' * 4 + rtLpmTbl[idx] + ",\\\n" lpmStr_ipv4 = lpmStr_ipv4 + "};" - print lpmStr_ipv4 lpmStr_ipv6 = "static struct l3fwd_ipv6_route l3fwd_ipv6_route_array[] = {\\\n" rtLpmTbl = list(lpm_table_ipv6) for idx in range(len(rtLpmTbl)): rtLpmTbl[idx] = pat.sub(self.portRepl, rtLpmTbl[idx]) lpmStr_ipv6 = lpmStr_ipv6 + ' ' * 4 + rtLpmTbl[idx] + ",\\\n" lpmStr_ipv6 = lpmStr_ipv6 + "};" - print lpmStr_ipv6 self.dut.send_expect(r"sed -i '/l3fwd_ipv4_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv4, "# ") self.dut.send_expect(r"sed -i '/l3fwd_ipv6_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv6, "# ") # make application @@ -140,6 +139,16 @@ l3fwd_ipv4_route_array[] = {\\\n" self.rxItf = self.tester.get_interface(self.tester.get_local_port(P1)) self.dmac = self.dut.get_mac_address(P0) + # get dts output path + if self.logger.log_path.startswith(os.sep): + self.output_path = self.logger.log_path + else: + cur_path = os.path.dirname( + os.path.dirname(os.path.realpath(__file__))) + self.output_path = os.sep.join([cur_path, self.logger.log_path]) + # create an instance to set stream field setting + self.pktgen_helper = PacketGeneratorHelper() + def functional_check_ipv4(self, pkt_sizes, burst=1, flag=None): """ Perform functional fragmentation checks. @@ -200,9 +209,9 @@ l3fwd_ipv4_route_array[] = {\\\n" for size in pkt_sizes[::burst]: # simulate to set TG properties if flag == 'frag': - # each packet max len: 1522 - 18 (eth) - 40 (ipv6) - 8 (ipv6 ext hdr) = 1456 - expPkts = (size - HEADER_SIZE['eth'] - HEADER_SIZE['ipv6']) / 1456 - if (size - HEADER_SIZE['eth'] - HEADER_SIZE['ipv6']) % 1456: + # each packet max len: 1518 - 18 (eth) - 40 (ipv6) - 8 (ipv6 ext hdr) = 1452 + expPkts = (size - HEADER_SIZE['eth'] - HEADER_SIZE['ipv6']) / 1452 + if (size - HEADER_SIZE['eth'] - HEADER_SIZE['ipv6']) % 1452: expPkts += 1 val = 0 else: @@ -296,35 +305,47 @@ l3fwd_ipv4_route_array[] = {\\\n" portmask = utils.create_mask([P0, P1]) + self.dut.send_expect("^c", "# ", 120) self.dut.send_expect("examples/ip_fragmentation/build/ip_fragmentation -c %s -n %d -- -p %s -q %s" % ( core_mask, self.dut.get_memory_channels(), portmask, num_pthreads), "IP_FRAG:", 120) result = [2, lcore, num_pthreads] for size in size_list: dmac = self.dut.get_mac_address(P0) - flows = ['Ether(dst="%s")/IP(src="1.2.3.4", dst="100.10.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), - 'Ether(dst="%s")/IP(src="1.2.3.4", dst="100.20.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), - 'Ether(dst="%s")/IPv6(dst="101:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58), - 'Ether(dst="%s")/IPv6(dst="201:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58)] - self.tester.scapy_append('wrpcap("test1.pcap", [%s])' % string.join(flows, ',')) + flows_p0 = ['Ether(dst="%s")/IP(src="1.2.3.4", dst="100.10.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), + 'Ether(dst="%s")/IP(src="1.2.3.4", dst="100.20.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), + 'Ether(dst="%s")/IPv6(dst="101:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58), + 'Ether(dst="%s")/IPv6(dst="201:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58)] # reserved for rx/tx bidirection test dmac = self.dut.get_mac_address(P1) - flows = ['Ether(dst="%s")/IP(src="1.2.3.4", dst="100.30.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), - 'Ether(dst="%s")/IP(src="1.2.3.4", dst="100.40.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), - 'Ether(dst="%s")/IPv6(dst="301:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58), - 'Ether(dst="%s")/IPv6(dst="401:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58)] - self.tester.scapy_append('wrpcap("test2.pcap", [%s])' % string.join(flows, ',')) + flows_p1 = ['Ether(dst="%s")/IP(src="1.2.3.4", dst="100.30.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), + 'Ether(dst="%s")/IP(src="1.2.3.4", dst="100.40.0.1", flags=0)/("X"*%d)' % (dmac, size - 38), + 'Ether(dst="%s")/IPv6(dst="301:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58), + 'Ether(dst="%s")/IPv6(dst="401:101:101:101:101:101:101:101",src="ee80:ee80:ee80:ee80:ee80:ee80:ee80:ee80")/Raw(load="X"*%d)' % (dmac, size - 58)] + flow_len = len(flows_p0) + tgenInput = [] + for i in range(flow_len): - self.tester.scapy_execute() + pcap0 = os.sep.join([self.output_path, "p0_{}.pcap".format(i)]) + self.tester.scapy_append('wrpcap("%s", [%s])' % (pcap0, flows_p0[i])) + pcap1 = os.sep.join([self.output_path, "p1_{}.pcap".format(i)]) + self.tester.scapy_append('wrpcap("%s", [%s])' % (pcap1, flows_p1[i])) + self.tester.scapy_execute() - tgenInput = [] - tgenInput.append((self.tester.get_local_port(P0), self.tester.get_local_port(P1), "test1.pcap")) - tgenInput.append((self.tester.get_local_port(P1), self.tester.get_local_port(P0), "test2.pcap")) + tgenInput.append((self.tester.get_local_port(P0), self.tester.get_local_port(P1), pcap0)) + tgenInput.append((self.tester.get_local_port(P1), self.tester.get_local_port(P0), pcap1)) factor = (size + 1517) / 1518 # wireSpd = 2 * 10000.0 / ((20 + size) * 8) - Bps[str(size)], Pps[str(size)] = self.tester.traffic_generator_throughput(tgenInput) + + # clear streams before add new streams + self.tester.pktgen.clear_streams() + # run packet generator + streams = self.pktgen_helper.prepare_stream_from_tginput(tgenInput, 100, + None, self.tester.pktgen) + Bps[str(size)], Pps[str(size)] = self.tester.pktgen.measure_throughput(stream_ids=streams) + self.verify(Pps[str(size)] > 0, "No traffic detected") Pps[str(size)] *= 1.0 / factor / 1000000 Pct[str(size)] = (1.0 * Bps[str(size)] * 100) / (2 * 10000000000) -- 2.17.1