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 3131BA0096 for ; Mon, 3 Jun 2019 11:33:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 257E71B947; Mon, 3 Jun 2019 11:33:39 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 79D365424 for ; Mon, 3 Jun 2019 11:33:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jun 2019 02:33:36 -0700 X-ExtLoop1: 1 Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 03 Jun 2019 02:33:36 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 3 Jun 2019 02:33:35 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 3 Jun 2019 02:33:35 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.134]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.137]) with mapi id 14.03.0415.000; Mon, 3 Jun 2019 17:33:33 +0800 From: "Zhu, WenhuiX" To: "dts@dpdk.org" CC: "Zhang, YanX A" Thread-Topic: [dts] [PATCH V1] update TestSuite_fdir reduce runtime Thread-Index: AQHVGetab9OtLbF+a0y678Yf5BeqS6aJqsdQ Date: Mon, 3 Jun 2019 09:33:33 +0000 Message-ID: References: <1559552901-129712-1-git-send-email-jianweix.mei@intel.com> In-Reply-To: <1559552901-129712-1-git-send-email-jianweix.mei@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V1] update TestSuite_fdir reduce runtime 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" Tested-by: Zhu, WenhuiX -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Jianwei Mei Sent: Monday, June 3, 2019 5:08 PM To: dts@dpdk.org Cc: Zhang, YanX A Subject: [dts] [PATCH V1] update TestSuite_fdir reduce runtime From: "zhang,yan" Optimize scapy open and close mode Signed-off-by: zhang,yan --- tests/TestSuite_fdir.py | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/tests/TestSuite_fdir.py b/tests/TestSuite_fdir.py index dac145= b..14cc5c9 100644 --- a/tests/TestSuite_fdir.py +++ b/tests/TestSuite_fdir.py @@ -63,17 +63,31 @@ class TestFdir(TestCase, IxiaPacketGenerator): # Utility methods and other non-test code. # ######################################################################= ##### + scapyCmds =3D [] + + def start_scapy(self): + self.tester.scapy_foreground() + self.scapyCmds.append('sys.path.append("./")') + self.scapyCmds.append('from sctp import *') + self.tester.send_expect('scapy', '>>> ', 10) + sleep(2) + + def end_scapy(self): + self.tester.send_expect("exit()", "#") + + def scapy_execute(self, timeout=3D60): + for cmd in self.scapyCmds: + self.tester.send_expect(cmd, ">>> ", timeout) + + self.scapyCmds =3D [] =20 def send_and_verify(self, condition, packet, queueid =3D -2): """ Send packages and verify behavior. """ - self.tester.scapy_foreground() - self.tester.scapy_append('sys.path.append("./")') - self.tester.scapy_append('from sctp import *') - self.tester.scapy_append(packet) + self.scapyCmds.append(packet) self.dut.send_expect("start", "testpmd>") - self.tester.scapy_execute() + self.scapy_execute() time.sleep(.5) out =3D self.dut.get_session_output() self.dut.send_expect("stop", "testpmd>") @@ -200,7 +214,7 @@ class= TestFdir(TestCase, IxiaPacketGenerator): """ Run before each test case. """ - pass + self.start_scapy() =20 def fdir_set_rule(self): """ @@ -1165,7 +1179,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): dst_ip_temp =3D self.dst_ip print "*src_ip_temp =3D " + src_ip_temp + "dst_ip_temp =3D " + dst= _ip_temp flows.append('Ether(src=3D"52:00:00:00:00:00", dst=3D"00:1B:21:8E:= B2:30")/IP(src=3D"%s",dst=3D"%s")/UDP(sport=3D%d,dport=3D%d)/Raw(load=3D"%s= " + "X"*(%d - 42 - %d))' % (src_ip_temp, dst_ip_temp, 1021, 1021, self.payl= oad, frame_size, self.flexlength)) - self.tester.scapy_append('wrpcap("test.pcap", [%s])' % string.join= (flows, ',')) + self.scapyCmds.append('wrpcap("/root/test.pcap", [%s])' %=20 + string.join(flows, ',')) =20 def perf_fdir_performance_2ports(self, test_type, num_rules, num_flows= ): """ @@ -1176,10 +1190,10 @@ class TestFdir(TestCase, IxiaPacketGenerator): =20 tgen_input.append((self.tester.get_local_port(self.dut_ports[0]), self.tester.get_local_port(self.dut_ports[1]), - "test.pcap")) + "/root/test.pcap")) tgen_input.append((self.tester.get_local_port(self.dut_ports[1]), self.tester.get_local_port(self.dut_ports[0]), - "test.pcap")) + "/root/test.pcap")) =20 print "self.ports_socket=3D%s" % (self.ports_socket) # run testpmd for each core config @@ -1229,7 +1243,7 @@ class Tes= tFdir(TestCase, IxiaPacketGenerator): self.logger.info("Running with frame size %d " % frame_siz= e) self.fdir_perf_set_flows(num_flows, frame_size) =20 - self.tester.scapy_execute() + self.scapy_execute() =20 """ tgen_input.append([self.tester.get_local_port(self.dut_por= ts[0]), @@ -1326,7 +1340,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): """ Run after each test case. """ - pass + self.end_scapy() =20 def tear_down_all(self): """ -- 2.17.2