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 261BAA00E6 for ; Thu, 16 May 2019 09:59:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 316375A6A; Thu, 16 May 2019 09:59:36 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 722A45A6A for ; Thu, 16 May 2019 09:59:34 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 May 2019 00:59:33 -0700 X-ExtLoop1: 1 Received: from meijuan2.sh.intel.com ([10.67.119.112]) by orsmga001.jf.intel.com with ESMTP; 16 May 2019 00:59:31 -0700 From: zhaomeijuan To: dts@dpdk.org Cc: zhaomeijuan Date: Thu, 16 May 2019 16:00:31 +0000 Message-Id: <20190516160031.51716-1-meijuanx.zhao@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/ddp_gtp optimize code to cut running time 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" Signed-off-by: zhaomeijuan --- tests/TestSuite_ddp_gtp.py | 59 +++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py index 0e86c8d..b8f6817 100644 --- a/tests/TestSuite_ddp_gtp.py +++ b/tests/TestSuite_ddp_gtp.py @@ -285,6 +285,7 @@ class TestDdpGtp(TestCase): 'flow create 0 ingress pattern eth / ipv4 / udp / \ %s teid is %s / end actions %s / queue index %d / end' % (tunnel_pkt, correct_teid, port, queue)) + count = 0 for match_opt in ['matched', 'not matched']: teid = correct_teid pkts = [] @@ -294,33 +295,45 @@ class TestDdpGtp(TestCase): pkts = self.gtp_packets( type, tunnel_pkt, inner_L3, match_opt, chk, teid) for packet_type in pkts.keys(): + count = count + 1 self.tester.scapy_append( 'sendp([%s], iface="%s")' % (pkts[packet_type], self.tester_intf)) - self.tester.scapy_execute() - if port is 'pf': - out = self.dut.get_session_output(timeout=2) + self.tester.scapy_execute() + if port is 'pf': + out = self.dut.get_session_output(timeout=5) + else: + out = self.vm0_dut.get_session_output(timeout=5) + self.verify( + count == out.count('port 0/queue %d' % queue), + "Failed to receive packet in this queue!!!") + if port is 'pf': + layerparams = ['L3_', 'TUNNEL_', + 'INNER_L3_', 'INNER_L4_'] + ptypes = packet_type.split('/') + other_ptypes = ptypes[1:] + if 'IPV6' in ptypes: + other_ptypes.insert(0,'IPV4') else: - out = self.vm0_dut.get_session_output(timeout=2) - self.verify( - "port 0/queue %d" % queue in out, - "Failed to receive packet in this queue!!!") - - if port is 'pf': - layerparams = ['L3_', 'TUNNEL_', - 'INNER_L3_', 'INNER_L4_'] - ptypes = packet_type.split('/') - endparams = ['_EXT_UNKNOWN', '', - '_EXT_UNKNOWN', ''] - for layerparam, ptype, endparam in zip( - layerparams, ptypes, endparams): - layer_type = layerparam + ptype + endparam - self.verify( - layer_type in out, - "Failed to output ptype information!!!") - if queue != 0 and type is 'fdir': - self.verify("PKT_RX_FDIR" in out, - "Failed to test flow director!!!") + other_ptypes.insert(0,'IPV6') + endparams = ['_EXT_UNKNOWN', '', + '_EXT_UNKNOWN', ''] + for layerparam, ptype, endparam in zip( + layerparams, ptypes, endparams): + layer_type = layerparam + ptype + endparam + self.verify( + layer_type in out, + "Failed to output ptype information!") + for layerparam, ptype, endparam in zip( + layerparams, other_ptypes, endparams): + layer_type = layerparam + ptype + endparam + self.verify( + layer_type in out, + "Failed to output ptype information!!!") + if queue != 0 and type is 'fdir': + self.verify(count == out.count("PKT_RX_FDIR"), + "Failed to test flow director!!!") + count = 0 if teid == wrong_teid or match_opt == 'not matched': break chk = 'chksum=0x1234,' -- 2.17.1