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 F27CBA0485 for ; Mon, 3 Jun 2019 10:31:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 823E81B957; Mon, 3 Jun 2019 10:31:30 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id BD1921B945 for ; Mon, 3 Jun 2019 10:31:28 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jun 2019 01:31:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,546,1549958400"; d="scan'208";a="181081908" Received: from zhaohy_tester.sh.intel.com ([10.240.179.16]) by fmsmga002.fm.intel.com with ESMTP; 03 Jun 2019 01:31:26 -0700 From: Haiyang Zhao To: dts@dpdk.org Cc: Haiyang Zhao Date: Mon, 3 Jun 2019 16:31:07 +0000 Message-Id: <20190603163109.19706-5-haiyangx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190603163109.19706-1-haiyangx.zhao@intel.com> References: <20190603163109.19706-1-haiyangx.zhao@intel.com> Subject: [dts] [next][PATCH V2 5/7] tests/pmd:replace etgen with pktgen 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" *.replace etgen to pktgen API which support both trex and ixia. *.delete old etgen override method ip. *.add function set_fields. Signed-off-by: Haiyang Zhao --- tests/TestSuite_pmd.py | 82 ++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py index f5df8d5..5ff4d29 100644 --- a/tests/TestSuite_pmd.py +++ b/tests/TestSuite_pmd.py @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2019 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,15 +43,14 @@ from test_case import TestCase from time import sleep from settings import HEADER_SIZE from pmd_output import PmdOutput -from etgen import IxiaPacketGenerator from settings import FOLDERS from system_info import SystemInfo import perf_report from datetime import datetime +from pktgen import PacketGeneratorHelper - -class TestPmd(TestCase,IxiaPacketGenerator): +class TestPmd(TestCase): def set_up_all(self): """ @@ -104,6 +103,16 @@ class TestPmd(TestCase,IxiaPacketGenerator): self.pmdout = PmdOutput(self.dut) + # 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 set_up(self): """ Run before each test case. @@ -151,22 +160,21 @@ class TestPmd(TestCase,IxiaPacketGenerator): PMD Performance Benchmarking with 4 ports. """ all_cores_mask = utils.create_mask(self.dut.get_core_list("all")) - # prepare traffic generator input tgen_input = [] - + pcap = os.sep.join([self.output_path, "test.pcap"]) tgen_input.append((self.tester.get_local_port(self.dut_ports[0]), self.tester.get_local_port(self.dut_ports[1]), - "test.pcap")) + pcap)) tgen_input.append((self.tester.get_local_port(self.dut_ports[2]), self.tester.get_local_port(self.dut_ports[3]), - "test.pcap")) + pcap)) tgen_input.append((self.tester.get_local_port(self.dut_ports[1]), self.tester.get_local_port(self.dut_ports[0]), - "test.pcap")) + pcap)) tgen_input.append((self.tester.get_local_port(self.dut_ports[3]), self.tester.get_local_port(self.dut_ports[2]), - "test.pcap")) + pcap)) # run testpmd for each core config for test_cycle in self.test_cycles: @@ -184,7 +192,7 @@ class TestPmd(TestCase,IxiaPacketGenerator): port_mask = utils.create_mask(self.dut.get_ports()) self.pmdout.start_testpmd(core_config, " --rxq=%d --txq=%d --portmask=%s --rss-ip --txrst=32 --txfreet=32 --txd=128 --tx-offloads=0" % (queues, queues, port_mask), socket=self.ports_socket) - command_line = self.pmdout.get_pmd_cmd() + command_line = self.pmdout.get_pmd_cmd() info = "Executing PMD using %s\n" % test_cycle['cores'] self.rst_report(info, annex=True) @@ -200,11 +208,17 @@ class TestPmd(TestCase,IxiaPacketGenerator): self.logger.info("Running with frame size %d " % frame_size) payload_size = frame_size - self.headers_size self.tester.scapy_append( - 'wrpcap("test.pcap", [Ether(src="52:00:00:00:00:00")/IP(src="1.2.3.4",dst="1.1.1.1")/TCP()/("X"*%d)])' % payload_size) + 'wrpcap("%s", [Ether(src="52:00:00:00:00:00")/IP(src="1.2.3.4",dst="1.1.1.1")/TCP()/("X"*%d)])' % (pcap, payload_size)) self.tester.scapy_execute() - # run traffic generator - _, pps = self.tester.traffic_generator_throughput(tgen_input, rate_percent=100, delay=60) + vm_config = self.set_fields() + # clear streams before add new streams + self.tester.pktgen.clear_streams() + # run packet generator + streams = self.pktgen_helper.prepare_stream_from_tginput(tgen_input, 100, + vm_config, self.tester.pktgen) + traffic_opt = {'duration': 60, } + _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams, options=traffic_opt) pps /= 1000000.0 pct = pps * 100 / wirespeed @@ -244,12 +258,13 @@ class TestPmd(TestCase,IxiaPacketGenerator): # prepare traffic generator input tgen_input = [] + pcap = os.sep.join([self.output_path, "test.pcap"]) tgen_input.append((self.tester.get_local_port(self.dut_ports[0]), self.tester.get_local_port(self.dut_ports[1]), - "test.pcap")) + pcap)) tgen_input.append((self.tester.get_local_port(self.dut_ports[1]), self.tester.get_local_port(self.dut_ports[0]), - "test.pcap")) + pcap)) # run testpmd for each core config for test_cycle in self.test_cycles: @@ -284,11 +299,19 @@ class TestPmd(TestCase,IxiaPacketGenerator): self.logger.info("Running with frame size %d " % frame_size) payload_size = frame_size - self.headers_size self.tester.scapy_append( - 'wrpcap("test.pcap", [Ether(src="52:00:00:00:00:00")/IP(src="1.2.3.4",dst="1.1.1.1")/TCP()/("X"*%d)])' % payload_size) + 'wrpcap("%s", [Ether(src="52:00:00:00:00:00")/IP(src="1.2.3.4",dst="1.1.1.1")/TCP()/("X"*%d)])' % (pcap, payload_size)) self.tester.scapy_execute() # run traffic generator - _, pps = self.tester.traffic_generator_throughput(tgen_input, rate_percent=100, delay=60) + + vm_config = self.set_fields() + # clear streams before add new streams + self.tester.pktgen.clear_streams() + # run packet generator + streams = self.pktgen_helper.prepare_stream_from_tginput(tgen_input, 100, + vm_config, self.tester.pktgen) + traffic_opt = {'duration': 60, } + _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams, options=traffic_opt) pps /= 1000000.0 pct = pps * 100 / wirespeed @@ -436,22 +459,13 @@ class TestPmd(TestCase,IxiaPacketGenerator): "packet pass assert error, expected %d TX bytes, actual %d" % (frame_size - 4, p0tx_bytes)) return out - - def ip(self, port, frag, src, proto, tos, dst, chksum, len, options, version, flags, ihl, ttl, id): - self.add_tcl_cmd("protocol config -name ip") - self.add_tcl_cmd('ip config -sourceIpAddr "%s"' % src) - self.add_tcl_cmd("ip config -sourceIpAddrMode ipRandom") - self.add_tcl_cmd('ip config -destIpAddr "%s"' % dst) - self.add_tcl_cmd("ip config -destIpAddrMode ipIdle") - self.add_tcl_cmd("ip config -ttl %d" % ttl) - self.add_tcl_cmd("ip config -totalLength %d" % len) - self.add_tcl_cmd("ip config -fragment %d" % frag) - self.add_tcl_cmd("ip config -ipProtocol ipV4ProtocolReserved255") - self.add_tcl_cmd("ip config -identifier %d" % id) - self.add_tcl_cmd("stream config -framesize %d" % (len + 18)) - self.add_tcl_cmd("ip set %d %d %d" % (self.chasId, port['card'], port['port'])) - - + + def set_fields(self): + ''' set ip protocol field behavior ''' + fields_config = { + 'ip': {'src': {'action': 'random'},},} + return fields_config + def tear_down(self): """ Run after each test case. -- 2.17.1