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 47721A04DD; Sun, 19 Jan 2020 06:41:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 117AC1DBA; Sun, 19 Jan 2020 06:41:36 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id B37A2F72 for ; Sun, 19 Jan 2020 06:41:33 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2020 21:41:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,336,1574150400"; d="scan'208";a="269750776" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 18 Jan 2020 21:41:32 -0800 From: "Chen,Bo" To: dts@dpdk.org Cc: "Chen,Bo" Date: Sun, 19 Jan 2020 13:43:02 +0800 Message-Id: <1579412582-114658-1-git-send-email-box.c.chen@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid 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" Change scapy/PPPoE session_id to sessionid Signed-off-by: Chen,Bo --- tests/TestSuite_ddp_ppp_l2tp.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py index dc011e4..e5a1977 100644 --- a/tests/TestSuite_ddp_ppp_l2tp.py +++ b/tests/TestSuite_ddp_ppp_l2tp.py @@ -105,13 +105,13 @@ class TestDdpPppL2tp(TestCase): pkts = {'IPV4/L2TP': 'Ether(src="%s", dst="%s")/IP()/UDP(dport=1701, sport=1701)/L2TP(session_id=%s)/Raw("X"*20)' % (src_mac, dst_mac, session_id)} if flowtype == 28: - pkts = {'PPPOE/IPV4/UDP': 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)' + pkts = {'PPPOE/IPV4/UDP': 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x21)/IP(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)' % (session_id, src_ip, dst_ip, sport, dport)} if flowtype == 29: - pkts = {'PPPOE/IPV6/UDP': 'Ether()/PPPoE(session_id=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)' + pkts = {'PPPOE/IPV6/UDP': 'Ether()/PPPoE(sessionid=%s)/PPP(proto=0x57)/IPv6(src="%s",dst="%s")/UDP(sport=%d,dport=%d)/Raw("X"*20)' % (session_id, src_ipv6, dst_ipv6, sport, dport)} if flowtype == 30: - pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(session_id=%s)' + pkts = {'PPPOE': 'Ether(src="%s", dst="%s")/PPPoE(sessionid=%s)' % (src_mac, dst_mac, session_id)} return pkts @@ -128,11 +128,11 @@ class TestDdpPppL2tp(TestCase): if flowtype == 26: a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/IP()/UDP(dport=1701, sport=1701)/L2TP(session_id=0x7)/Raw("X"*20) if flowtype == 28: - a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20) + a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x21)/IP(dst="1.1.1.1", src="2.2.2.2")/UDP(dport=4000, sport=8000)/Raw("X"*20) if flowtype == 29: - a = Ether()/PPPoE(session_id=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20) + a = Ether()/PPPoE(sessionid=0x7)/PPP(proto=0x57)/IPv6(dst="1001:0db8:85a3:0000:0000:8a2e:0370:0001", src="2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=4000, sport=8000)/Raw("X"*20) if flowtype == 30: - a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/PPPoE(session_id=0x7) + a = Ether(dst="3C:FD:FE:A3:A0:01", src="4C:FD:FE:A3:A0:01")/PPPoE(sessionid=0x7) ba = bytearray(bytes(a)) rawfile_src = '/tmp/test.raw' File = open("%s" % rawfile_src, "wb") @@ -159,10 +159,8 @@ class TestDdpPppL2tp(TestCase): qnum = self.element_strip(out, pattern) ptypes = packet_type.split('/') if flowtype in [23, 24, 26]: - layerparams = ['L3_', 'TUNNEL_', - 'INNER_L3_', 'INNER_L4_'] - endparams = ['_EXT_UNKNOWN', '', - '_EXT_UNKNOWN', ''] + layerparams = ['L3_', 'TUNNEL_'] + endparams = ['_EXT_UNKNOWN', ''] if flowtype in [28, 29, 30]: layerparams = ['L2_ETHER_', 'L3_', 'L4_'] endparams = ['', '_EXT_UNKNOWN', ''] -- 2.17.2