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 B0520A04DD; Sun, 19 Jan 2020 09:34:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9A41929C6; Sun, 19 Jan 2020 09:34:49 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 38C0E28F3 for ; Sun, 19 Jan 2020 09:34:47 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jan 2020 00:34:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,337,1574150400"; d="scan'208";a="227921666" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 19 Jan 2020 00:34:46 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 19 Jan 2020 00:34:42 -0800 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 19 Jan 2020 00:34:41 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.30]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.28]) with mapi id 14.03.0439.000; Sun, 19 Jan 2020 16:34:40 +0800 From: "Tu, Lijuan" To: "Chen, BoX C" , "dts@dpdk.org" CC: "Chen, BoX C" Thread-Topic: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessionid Thread-Index: AQHVzosnDMykE/7TvkeoR6dMjpfdCqfxqXfg Date: Sun, 19 Jan 2020 08:34:39 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BBAD528@SHSMSX101.ccr.corp.intel.com> References: <1579412582-114658-1-git-send-email-box.c.chen@intel.com> In-Reply-To: <1579412582-114658-1-git-send-email-box.c.chen@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action 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] 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" applied > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Chen,Bo > Sent: Sunday, January 19, 2020 1:43 PM > To: dts@dpdk.org > Cc: Chen, BoX C > Subject: [dts] [PATCH V1] tests/ddp_ppp_l2tp: change scapy/PPPoE sessioni= d >=20 > Change scapy/PPPoE session_id to sessionid >=20 > Signed-off-by: Chen,Bo > --- > tests/TestSuite_ddp_ppp_l2tp.py | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) >=20 > 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 =3D {'IPV4/L2TP': 'Ether(src=3D"%s", dst=3D"%s")/IP()/U= DP(dport=3D1701, > sport=3D1701)/L2TP(session_id=3D%s)/Raw("X"*20)' > % (src_mac, dst_mac, session_id)} > if flowtype =3D=3D 28: > - pkts =3D {'PPPOE/IPV4/UDP': > 'Ether()/PPPoE(session_id=3D%s)/PPP(proto=3D0x21)/IP(src=3D"%s",dst=3D"%s= ")/UDP( > sport=3D%d,dport=3D%d)/Raw("X"*20)' > + pkts =3D {'PPPOE/IPV4/UDP': > 'Ether()/PPPoE(sessionid=3D%s)/PPP(proto=3D0x21)/IP(src=3D"%s",dst=3D"%s"= )/UDP(s > port=3D%d,dport=3D%d)/Raw("X"*20)' > % (session_id, src_ip, dst_ip, sport, dport)} > if flowtype =3D=3D 29: > - pkts =3D {'PPPOE/IPV6/UDP': > 'Ether()/PPPoE(session_id=3D%s)/PPP(proto=3D0x57)/IPv6(src=3D"%s",dst=3D"= %s")/UD > P(sport=3D%d,dport=3D%d)/Raw("X"*20)' > + pkts =3D {'PPPOE/IPV6/UDP': > 'Ether()/PPPoE(sessionid=3D%s)/PPP(proto=3D0x57)/IPv6(src=3D"%s",dst=3D"%= s")/UDP > (sport=3D%d,dport=3D%d)/Raw("X"*20)' > % (session_id, src_ipv6, dst_ipv6, sport, dport)} > if flowtype =3D=3D 30: > - pkts =3D {'PPPOE': 'Ether(src=3D"%s", dst=3D"%s")/PPPoE(sess= ion_id=3D%s)' > + pkts =3D {'PPPOE': 'Ether(src=3D"%s", dst=3D"%s")/PPPoE(sess= ionid=3D%s)' > % (src_mac, dst_mac, session_id)} > return pkts >=20 > @@ -128,11 +128,11 @@ class TestDdpPppL2tp(TestCase): > if flowtype =3D=3D 26: > a =3D Ether(dst=3D"3C:FD:FE:A3:A0:01", > src=3D"4C:FD:FE:A3:A0:01")/IP()/UDP(dport=3D1701, > sport=3D1701)/L2TP(session_id=3D0x7)/Raw("X"*20) > if flowtype =3D=3D 28: > - a =3D Ether()/PPPoE(session_id=3D0x7)/PPP(proto=3D0x21)/IP(d= st=3D"1.1.1.1", > src=3D"2.2.2.2")/UDP(dport=3D4000, sport=3D8000)/Raw("X"*20) > + a =3D > + Ether()/PPPoE(sessionid=3D0x7)/PPP(proto=3D0x21)/IP(dst=3D"1.1.1.1", > + src=3D"2.2.2.2")/UDP(dport=3D4000, sport=3D8000)/Raw("X"*20) > if flowtype =3D=3D 29: > - a =3D > Ether()/PPPoE(session_id=3D0x7)/PPP(proto=3D0x57)/IPv6(dst=3D"1001:0db8:8= 5a3: > 0000:0000:8a2e:0370:0001", > src=3D"2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=3D4000, > sport=3D8000)/Raw("X"*20) > + a =3D > + Ether()/PPPoE(sessionid=3D0x7)/PPP(proto=3D0x57)/IPv6(dst=3D"1001:0db8:= 85a3: > + 0000:0000:8a2e:0370:0001", > + src=3D"2001:0db8:85a3:0000:0000:8a2e:0370:0001")/UDP(dport=3D4000, > + sport=3D8000)/Raw("X"*20) > if flowtype =3D=3D 30: > - a =3D Ether(dst=3D"3C:FD:FE:A3:A0:01", > src=3D"4C:FD:FE:A3:A0:01")/PPPoE(session_id=3D0x7) > + a =3D Ether(dst=3D"3C:FD:FE:A3:A0:01", > + src=3D"4C:FD:FE:A3:A0:01")/PPPoE(sessionid=3D0x7) > ba =3D bytearray(bytes(a)) > rawfile_src =3D '/tmp/test.raw' > File =3D open("%s" % rawfile_src, "wb") @@ -159,10 +159,8 @@ cla= ss > TestDdpPppL2tp(TestCase): > qnum =3D self.element_strip(out, pattern) > ptypes =3D packet_type.split('/') > if flowtype in [23, 24, 26]: > - layerparams =3D ['L3_', 'TUNNEL_', > - 'INNER_L3_', 'INNER_L4_'] > - endparams =3D ['_EXT_UNKNOWN', '', > - '_EXT_UNKNOWN', ''] > + layerparams =3D ['L3_', 'TUNNEL_'] > + endparams =3D ['_EXT_UNKNOWN', ''] > if flowtype in [28, 29, 30]: > layerparams =3D ['L2_ETHER_', 'L3_', 'L4_'] > endparams =3D ['', '_EXT_UNKNOWN', ''] > -- > 2.17.2