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 62B4AA09E7; Tue, 8 Dec 2020 07:38:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20F8372D9; Tue, 8 Dec 2020 07:38:15 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C30C9A3 for ; Tue, 8 Dec 2020 07:38:12 +0100 (CET) IronPort-SDR: R7Efju7pK/OJWzUZiY5D8LJm129rInsXn/+sqaH+rRJdtEh3FSw87AeRn3dl3H3uJwRslyhO++ 4bhWr0fECyHA== X-IronPort-AV: E=McAfee;i="6000,8403,9828"; a="192122620" X-IronPort-AV: E=Sophos;i="5.78,401,1599548400"; d="scan'208";a="192122620" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2020 22:38:11 -0800 IronPort-SDR: 0K0TaJx/OgmToSlTF5QzFyttNsR2v2SB0iT+i/Ke4Wb3NBibCgaMdzsIVePvQ4qEIbbuva8epB oGB5uFb5a2Ww== X-IronPort-AV: E=Sophos;i="5.78,401,1599548400"; d="scan'208";a="541907524" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2020 22:38:10 -0800 From: Zhou Jun To: dts@dpdk.org Cc: Zhou Jun Date: Tue, 8 Dec 2020 14:40:59 +0800 Message-Id: <20201208064059.8297-1-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] change send pkt mode and add the interface of generating package verification file 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: Zhou Jun --- framework/packet.py | 6 ++++++ tests/TestSuite_ddp_gtp_qregion.py | 22 ++++++++-------------- tests/TestSuite_dynamic_flowtype.py | 7 +++---- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/framework/packet.py b/framework/packet.py index 7d974db0..eb5e7d4c 100644 --- a/framework/packet.py +++ b/framework/packet.py @@ -119,6 +119,12 @@ PKTGEN_PIDS = {} # default filter for LLDP packet LLDP_FILTER = {'layer': 'ether', 'config': {'type': 'not lldp'}} +def write_test(pkt_str, file_name): + tmp = eval(pkt_str) + tmp = bytearray(bytes(tmp)) + with open(file_name, 'wb') as w: + w.write(tmp) + w.close() class scapy(object): SCAPY_LAYERS = { diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py index 443e1927..2c22756e 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_test(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" diff --git a/tests/TestSuite_dynamic_flowtype.py b/tests/TestSuite_dynamic_flowtype.py index 99f28d8a..3f47d590 100644 --- a/tests/TestSuite_dynamic_flowtype.py +++ b/tests/TestSuite_dynamic_flowtype.py @@ -34,6 +34,7 @@ import re import utils from test_case import TestCase from pmd_output import PmdOutput +import packet VM_CORES_MASK = 'all' @@ -202,10 +203,8 @@ class TestDynamicFlowtype(TestCase): """ pkts = self.gtp_packets(flowtype, match_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) if match_opt == 'matched': self.verify("PKT_RX_RSS_HASH" in out, -- 2.17.1