From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id C23582BA6 for ; Fri, 14 Oct 2016 16:53:02 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP; 14 Oct 2016 07:53:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,493,1473145200"; d="scan'208";a="20047610" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga004.jf.intel.com with ESMTP; 14 Oct 2016 07:53:01 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Oct 2016 07:53:01 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 14 Oct 2016 07:53:01 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.139]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.96]) with mapi id 14.03.0248.002; Fri, 14 Oct 2016 22:51:50 +0800 From: "Liu, Yong" To: "Xu, HuilongX" , "dts@dpdk.org" CC: "Xu, HuilongX" Thread-Topic: [dts] [PATCH V1] update checksum test case Thread-Index: AQHSJfKk7mQ9tWQZIk63OR9gYrpmu6CoCQng Date: Fri, 14 Oct 2016 14:51:50 +0000 Message-ID: <86228AFD5BCD8E4EBFD2B90117B5E81E60300B26@SHSMSX103.ccr.corp.intel.com> References: <1476432790-4124-1-git-send-email-huilongx.xu@intel.com> In-Reply-To: <1476432790-4124-1-git-send-email-huilongx.xu@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTZlMTFkNWYtZTU5OC00M2JmLTllZWItMmM4MGI5OTU5MzEwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkZoVUtJMTVDXC92QUs3K1IycXR2MW9FYzhJUVpEZ3ZsWTVVTkxqMXdjZkM4PSJ9 x-ctpclassification: CTP_IC 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] update checksum test case 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: , X-List-Received-Date: Fri, 14 Oct 2016 14:53:03 -0000 Thanks, applied. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,huilong > Sent: Friday, October 14, 2016 3:13 AM > To: dts@dpdk.org > Cc: Xu, HuilongX > Subject: [dts] [PATCH V1] update checksum test case >=20 > csum function will not auto add outer ip src address already, > so update send packet src ip address >=20 > Signed-off-by: xu,huilong > --- > tests/TestSuite_checksum_offload.py | 24 ++++++++++++------------ > tests/TestSuite_nvgre.py | 12 ++++++------ > tests/TestSuite_vxlan.py | 12 ++++++------ > 3 files changed, 24 insertions(+), 24 deletions(-) >=20 > diff --git a/tests/TestSuite_checksum_offload.py > b/tests/TestSuite_checksum_offload.py > index 57069f0..18e3848 100644 > --- a/tests/TestSuite_checksum_offload.py > +++ b/tests/TestSuite_checksum_offload.py > @@ -162,11 +162,11 @@ class TestChecksumOffload(TestCase): > 'IPv6/UDP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/Dot1Q(vlan=3D1)/IPv6(src=3D"::1")/UDP(chksum= =3D0xf)/("X > "*46)' % mac, > 'IPv6/TCP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/Dot1Q(vlan=3D1)/IPv6(src=3D"::1")/TCP(chksum= =3D0xf)/("X > "*46)' % mac} >=20 > - pkts =3D {'IP/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.2")/UDP()/("X"*46)' % mac, > - 'IP/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.2")/TCP()/("X"*46)' % mac, > - 'IP/SCTP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.2")/SCTP()/("X"*48)' % mac, > - 'IPv6/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IPv6(src=3D"::2")/UDP()/("X"*46)' % mac, > - 'IPv6/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IPv6(src=3D"::2")/TCP()/("X"*46)' % mac} > + pkts =3D {'IP/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.1")/UDP()/("X"*46)' % mac, > + 'IP/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.1")/TCP()/("X"*46)' % mac, > + 'IP/SCTP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IP(src=3D"127.0.0.1")/SCTP()/("X"*48)' % mac, > + 'IPv6/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IPv6(src=3D"::1")/UDP()/("X"*46)' % mac, > + 'IPv6/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/Dot1Q(vlan=3D1)/IPv6(src=3D"::1")/TCP()/("X"*46)' % mac} >=20 > if self.kdriver =3D=3D "fm10k": > del pktsChkErr['IP/SCTP'] > @@ -193,11 +193,11 @@ class TestChecksumOffload(TestCase): > 'IPv6/UDP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/IPv6(src=3D"::1")/UDP(chksum=3D0xf)/("X"*46)' = % mac, > 'IPv6/TCP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/IPv6(src=3D"::1")/TCP(chksum=3D0xf)/("X"*46)' = % mac} >=20 > - pkts_ref =3D {'IP/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.2")/UDP()/("X"*46)' % mac, > - 'IP/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.2")/TCP()/("X"*46)' % mac, > - 'IP/SCTP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.2")/SCTP()/("X"*48)' % mac, > - 'IPv6/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IPv6(src=3D"::2")/UDP()/("X"*46)' % mac, > - 'IPv6/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IPv6(src=3D"::2")/TCP()/("X"*46)' % mac} > + pkts_ref =3D {'IP/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.1")/UDP()/("X"*46)' % mac, > + 'IP/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.1")/TCP()/("X"*46)' % mac, > + 'IP/SCTP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"127.0.0.1")/SCTP()/("X"*48)' % mac, > + 'IPv6/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IPv6(src=3D"::1")/UDP()/("X"*46)' % mac, > + 'IPv6/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IPv6(src=3D"::1")/TCP()/("X"*46)' % mac} >=20 > if self.kdriver =3D=3D "fm10k": > del pkts['IP/SCTP'] > @@ -228,8 +228,8 @@ class TestChecksumOffload(TestCase): > 'IPv6/UDP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/IPv6(src=3D"%s")/UDP(chksum=3D0xf)/("X"*46)' %= (mac, > sndIPv6), > 'IPv6/TCP': 'Ether(dst=3D"%s", > src=3D"52:00:00:00:00:00")/IPv6(src=3D"%s")/TCP(chksum=3D0xf)/("X"*46)' %= (mac, > sndIPv6)} >=20 > - expIP =3D "10.0.0.2" > - expIPv6 =3D '::2' > + expIP =3D sendIP > + expIPv6 =3D sendIPv6 > expPkts =3D {'IP/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"%s")/UDP()/("X"*46)' % (mac, expIP), > 'IP/TCP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IP(src=3D"%s")/TCP()/("X"*46)' % (mac, expIP), > 'IPv6/UDP': 'Ether(dst=3D"02:00:00:00:00:00", > src=3D"%s")/IPv6(src=3D"%s")/UDP()/("X"*46)' % (mac, expIPv6), > diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py > index 75f5263..c1df309 100644 > --- a/tests/TestSuite_nvgre.py > +++ b/tests/TestSuite_nvgre.py > @@ -525,17 +525,17 @@ class TestNvgre(TestCase): > config =3D NvgreTestConfig(self, **args) > # now cloud filter will default enable L2 mac filter, so dst mac > must be same > config.outer_mac_dst =3D self.dut_rx_port_mac > - # csum function will change outer ipv src address > + # csum function will not change outer ipv src address already > if config.outer_ip6_src !=3D "N/A": > - config.outer_ip6_src =3D IncreaseIPv6(config.outer_ip6_src) > + config.outer_ip6_src =3D config.outer_ip6_src > else: > - config.outer_ip_src =3D IncreaseIP(config.outer_ip_src) > + config.outer_ip_src =3D config.outer_ip_src >=20 > - # csum function will auto change nvgre inner ipv src address > + # csum function will not auto change nvgre inner ipv src address > already > if config.inner_ip6_src !=3D "N/A": > - config.inner_ip6_src =3D IncreaseIPv6(config.inner_ip6_src) > + config.inner_ip6_src =3D config.inner_ip6_src > else: > - config.inner_ip_src =3D IncreaseIP(config.inner_ip_src) > + config.inner_ip_src =3D config.inner_ip_src >=20 > # create abnormal package with wrong checksum > config.create_pcap() > diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py > index 03c47d8..b810c13 100644 > --- a/tests/TestSuite_vxlan.py > +++ b/tests/TestSuite_vxlan.py > @@ -409,18 +409,18 @@ class TestVxlan(TestCase, IxiaPacketGenerator): > # now cloud filter will default enable L2 mac filter, so dst mac > must > # be same > config.outer_mac_dst =3D self.dut_port_mac > - # csum function will auto add outer ipv src address > + # csum function will not auto add outer ip src address already, > so update send packet src ip address > if config.outer_ip6_src !=3D "N/A": > - config.outer_ip6_src =3D IncreaseIPv6(config.outer_ip6_src) > + config.outer_ip6_src =3D config.outer_ip6_src > else: > - config.outer_ip_src =3D IncreaseIP(config.outer_ip_src) > + config.outer_ip_src =3D config.outer_ip_src >=20 > - # csum function will auto add vxlan inner ipv src address > + # csum function will not auto add outer ip src address already, > so update send packet src ip address > if config.outer_udp_dst =3D=3D VXLAN_PORT: > if config.inner_ip6_src !=3D "N/A": > - config.inner_ip6_src =3D IncreaseIPv6(config.inner_ip6_s= rc) > + config.inner_ip6_src =3D config.inner_ip6_src > else: > - config.inner_ip_src =3D IncreaseIP(config.inner_ip_src) > + config.inner_ip_src =3D config.inner_ip_src >=20 > # extract the checksum value of vxlan packet > config.create_pcap() > -- > 1.9.3