From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A229A09EA; Wed, 9 Dec 2020 03:47:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 92C7DC956; Wed, 9 Dec 2020 03:47:28 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 85277C8F8 for ; Wed, 9 Dec 2020 03:47:25 +0100 (CET) IronPort-SDR: bZDrnJfYK8uwMjAT/sAsQ9UdqLURH90mT/sDrby69ym5rJACpiANp+SUaZvjOhG13TrUon1Ke8 Fcpic9iQzrxA== X-IronPort-AV: E=McAfee;i="6000,8403,9829"; a="153818759" X-IronPort-AV: E=Sophos;i="5.78,404,1599548400"; d="scan'208";a="153818759" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 18:47:23 -0800 IronPort-SDR: W0seOXRxfKKzyws39g+OOG6E20ir3bQguD4xmLudnj7RAIJ8PhlYfhEFeKaUPsZYsFsdNvp4GY 0PVLgcpGsD3g== X-IronPort-AV: E=Sophos;i="5.78,404,1599548400"; d="scan'208";a="363942581" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2020 18:47:22 -0800 From: Zhou Jun To: dts@dpdk.org Cc: Zhou Jun Date: Wed, 9 Dec 2020 10:50:11 +0800 Message-Id: <20201209025012.13017-3-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201209025012.13017-1-junx.w.zhou@intel.com> References: <20201209025012.13017-1-junx.w.zhou@intel.com> Subject: [dts] [PATCH V3 2/3] tests/TestSuite_ddp_gtp_qregion:change send pkt mode and use new interface to write raw pkt 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" tests/TestSuite_ddp_gtp_qregion:change send pkt mode and use new interface to write raw pkt Signed-off-by: Zhou Jun --- tests/TestSuite_ddp_gtp_qregion.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py index 443e1927..e7e40cfc 100644 --- a/tests/TestSuite_ddp_gtp_qregion.py +++ b/tests/TestSuite_ddp_gtp_qregion.py @@ -37,6 +37,7 @@ from scapy.all import * from test_case import TestCase from pmd_output import PmdOutput from settings import get_nic_name +import packet class TestDdpGtpQregion(TestCase): @@ -160,14 +161,11 @@ class TestDdpGtpQregion(TestCase): template file and packets sent to NIC. """ if flowtype == 23: - a = Ether()/IPv6()/UDP(dport=2152)/GTP_U_Header(teid=0xfe)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=100, sport=200)/Raw("X"*20) + a = 'Ether()/IPv6()/UDP(dport=2152)/GTP_U_Header(teid=0xfe)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=100, sport=200)/Raw("X"*20)' if flowtype == 26: - a = Ether()/IPv6()/UDP(dport=2152)/GTP_U_Header(teid=0xfe)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=100, sport=200)/Raw("X"*20) - ba = bytearray(bytes(a)) + a = 'Ether()/IPv6()/UDP(dport=2152)/GTP_U_Header(teid=0xfe)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=100, sport=200)/Raw("X"*20)' rawfile_src = '/tmp/test_gtp.raw' - File = open("%s" % rawfile_src, "wb") - File.write(ba) - File.close() + packet.write_raw_pkt(a, rawfile_src) rawfile_dst = "/tmp/" self.dut.session.copy_file_to(rawfile_src, rawfile_dst) @@ -177,10 +175,8 @@ class TestDdpGtpQregion(TestCase): """ pkts = self.gtp_pkts(flowtype, keyword, opt) for packet_type in list(pkts.keys()): - self.tester.scapy_append( - 'sendp([%s], iface="%s")' - % (pkts[packet_type], self.tester_intf)) - self.tester.scapy_execute() + pkt = packet.Packet(pkts[packet_type]) + pkt.send_pkt(crb=self.tester, tx_port=self.tester_intf) out = self.dut.get_session_output(timeout=2) pattern = "port (\d)/queue (\d{1,2}): received (\d) packets" qnum = self.element_strip(out, pattern) @@ -239,10 +235,8 @@ class TestDdpGtpQregion(TestCase): keyword = 'src_ipv6' pkts = self.gtp_pkts(flowtype, keyword, opt) for packet_type in list(pkts.keys()): - self.tester.scapy_append( - 'sendp([%s], iface="%s")' - % (pkts[packet_type], self.tester_intf)) - self.tester.scapy_execute() + pkt = packet.Packet(pkts[packet_type]) + pkt.send_pkt(crb=self.tester, tx_port=self.tester_intf) out = self.dut.get_session_output(timeout=2) self.verify("PKT_RX_RSS_HASH" in out, "Failed to test RSS!!!") pattern = "port (\d)/queue (\d{1,2}): received (\d) packets" -- 2.17.1