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 DD8BAA0613 for ; Thu, 29 Aug 2019 08:40:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 88EC01D161; Thu, 29 Aug 2019 08:40:05 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id CE7641D15C for ; Thu, 29 Aug 2019 08:40:03 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 23:40:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,442,1559545200"; d="scan'208";a="356359474" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga005.jf.intel.com with ESMTP; 28 Aug 2019 23:40:02 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 23:40:00 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 23:40:00 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.19]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.249]) with mapi id 14.03.0439.000; Thu, 29 Aug 2019 14:39:58 +0800 From: "Mo, YufengX" To: "He, Zhiwei" , "dts@dpdk.org" , "Fu, Qi" Thread-Topic: [dts] [PATCH V3] tests/TestSuite_nvgre:Change to no vec modele to cover IPV4detectandoffloadcase Thread-Index: AQHVXisNa3IIYOwoTU61U2em+8jmwKcRq9Ng Date: Thu, 29 Aug 2019 06:39:57 +0000 Message-ID: References: <1567056691-37038-1-git-send-email-zhiwei.he@intel.com> In-Reply-To: <1567056691-37038-1-git-send-email-zhiwei.he@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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 V3] tests/TestSuite_nvgre:Change to no vec modele to cover IPV4detectandoffloadcase 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" Hi, zhiwei In L361, your patch remove ` carlsville` nic support, which was added/merge= d by fu,qi yesterday. Could you use `self.logger.info` to take the place of `print` method usage= ? `print` message can't be saved in log. > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhiwei.he > Sent: Thursday, August 29, 2019 1:32 PM > To: dts@dpdk.org > Cc: He, Zhiwei > Subject: [dts] [PATCH V3] tests/TestSuite_nvgre:Change to no vec modele t= o cover IPV4detectandoffloadcase >=20 > From: "zhiwei.he" >=20 > diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py > index b0500cc..41fad85 100644 > --- a/tests/TestSuite_nvgre.py > +++ b/tests/TestSuite_nvgre.py > @@ -93,8 +93,8 @@ class NvgreTestConfig(object): > self.outer_ip_dst =3D '192.168.1.2' > self.outer_ip_invalid =3D 0 >=20 > - self.outer_ip6_src =3D 'N/A' > - self.outer_ip6_dst =3D 'N/A' > + self.outer_ip6_src =3D 'FE80:0:0:0:0:0:0:0' > + self.outer_ip6_dst =3D 'FE80:0:0:0:0:0:0:1' > self.outer_ip6_invalid =3D 0 > """ > gre info > @@ -150,8 +150,8 @@ class NvgreTestConfig(object): > self.inner_ip_dst =3D '192.168.2.2' > self.inner_ip_invalid =3D 0 >=20 > - self.inner_ip6_src =3D 'N/A' > - self.inner_ip6_dst =3D 'N/A' > + self.inner_ip6_src =3D 'FE80:0:0:0:0:0:0:0' > + self.inner_ip6_dst =3D 'FE80:0:0:0:0:0:0:1' > self.inner_ip6_invalid =3D 0 >=20 > self.inner_l4_type =3D 'UDP' > @@ -361,10 +361,12 @@ class TestNvgre(TestCase): > nvgre Prerequisites > """ > # this feature only enable in FVL now > - if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063", > "cavium_a064", "carlsville"]: > + if self.nic in ["fortville_eagle", "fortville_spirit", "fortvill= e_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063", > "cavium_a064"]: > self.compile_switch =3D 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR' > elif self.nic in ["sageville", "sagepond"]: > self.compile_switch =3D 'CONFIG_RTE_IXGBE_INC_VECTOR' > + elif self.nic in ["columbiaville_25g","columbiaville_100g"]: > + print "CVL support default none VECTOR" > else: > self.verify(False, "%s not support NVGRE case" % self.nic) > # Based on h/w type, choose how many ports to use > @@ -616,19 +618,73 @@ class TestNvgre(TestCase): > # verify saved pcap checksum same to expected checksum > for key in chksums_default: > self.verify(chksums[key] =3D=3D chksums_default[key], "%s no= t matched to %s" % (key, chksums_default[key])) > - > + def test_nvgre_ipv6(self): > + """ > + verify nvgre packet with ipv6 > + """ > + # check no nvgre packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", outer_ip_proto=3D0xF= F) > + # check nvgre + IPv6 inner packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", inner_l4_type=3D'None') > + # check nvgre + TCP inner packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", inner_l4_type=3D'TCP') > + # check nvgre + SCTP inner packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", inner_l4_type=3D'SCTP') > + # check nvgre + UDP inner packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", inner_l4_type=3D'UDP') > + # check nvgre + vlan outer packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", outer_vlan=3D1) > + # check vlan nvgre + vlan inner and outer packet > + self.nvgre_detect(outer_l3_type =3D "IPv6", inner_l3_type=3D"IPv= 6", outer_vlan=3D1, inner_vlan=3D1) > + > + def test_nvgre_ipv6_checksum_offload(self): > + # check nvgre packet + inner IPv6 + inner L4 invalid > + self.nvgre_checksum(inner_l3_type =3D "IPv6", inner_l4_invalid= =3D1) > + # check nvgre packet + outer IPv6 + inner L4 invalid > + self.nvgre_checksum(outer_l3_type =3D "IPv6", inner_l4_invalid= =3D1) > + # check nvgre packet + inner + outer ipv6 + inner L4 invalid > + self.nvgre_checksum(outer_l3_type =3D "IPv6", inner_l3_type=3D "= IPv6", inner_l4_invalid=3D1) > + # check nvgre packet + inner IPv6 + tcp checksum invalid > + self.nvgre_checksum(inner_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'TCP') > + #check nvgre packet + inner IPv6 + sctp checksum invalid > + self.nvgre_checksum(inner_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'SCTP') > + #check nvgre packet + inner IPv6 + UDP checksum invalid > + self.nvgre_checksum(inner_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'UDP') > + # check nvgre packet + outer IPv6 + inner tcp checksum invalid > + self.nvgre_checksum(outer_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'TCP') > + #check nvgre packet + outer IPv6 + inner sctp checksum invalid > + self.nvgre_checksum(outer_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'SCTP') > + #check nvgre packet + outer IPv6 + inner UDP checksum invalid > + self.nvgre_checksum(outer_l3_type =3D "IPv6", inner_l4_invalid= =3D1, inner_l4_type=3D'UDP') > + # check vlan nvgre packet + inner vlan + inner udp checksum inva= lid > + self.nvgre_checksum(inner_l3_type=3D"IPv6", inner_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'UDP') > + # check vlan nvgre packet + outer vlan + inner udp checksum inva= lid > + self.nvgre_checksum(outer_l3_type=3D"IPv6", outer_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'UDP') > + # check vlan nvgre packet + outer vlan + inner tcp checksum inva= lid > + self.nvgre_checksum(outer_l3_type=3D"IPv6", outer_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'TCP') > + # check vlan nvgre packet + inner vlan + inner tcp checksum inva= lid > + self.nvgre_checksum(inner_l3_type=3D"IPv6", inner_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'TCP') > + # check vlan nvgre packet + inner vlan + inner sctp checksum inv= alid > + self.nvgre_checksum(inner_l3_type=3D"IPv6", inner_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'SCTP') > + # check vlan nvgre packet + outer vlan + inner sctp checksum inv= alid > + self.nvgre_checksum(outer_l3_type=3D"IPv6", outer_vlan=3D1, inne= r_l4_invalid=3D1, inner_l4_type=3D'SCTP') > + > def test_nvgre_ipv4(self): > """ > verify nvgre packet with ipv4 > """ > # packet type detect must used without VECTOR pmd > - out =3D self.dut.send_expect("cat config/common_base", "]# ", 10= ) > - src_vec_model =3D re.findall("%s=3D." % self.compile_switch, out= )[0][-1] > - if src_vec_model =3D=3D 'y': > - self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compile= _switch > + if self.nic in ["columbiaville_25g","columbiaville_100g"]: > + print "CVL support default none VECTOR" > + src_vec_model =3D 'n' > + else: > + out =3D self.dut.send_expect("cat config/common_base", "]# ",= 10) > + src_vec_model =3D re.findall("%s=3D." % self.compile_switch, = out)[0][-1] > + if src_vec_model =3D=3D 'y': > + self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compi= le_switch > + "%s=3Dn/' config/common_base" % self.c= ompile_switch, "# ", 30) > - self.dut.skip_setup =3D False > - self.dut.build_install_dpdk(self.target) > + self.dut.skip_setup =3D False > + self.dut.build_install_dpdk(self.target) >=20 > # check no nvgre packet > self.nvgre_detect(outer_ip_proto=3D0xFF) > @@ -642,13 +698,17 @@ class TestNvgre(TestCase): > self.nvgre_detect(outer_vlan=3D1) > # check vlan nvgre + vlan inner packet > self.nvgre_detect(outer_vlan=3D1, inner_vlan=3D1) > - out =3D self.dut.send_expect("cat config/common_base", "]# ", 10= ) > - dst_vec_model =3D re.findall("%s=3D." % self.compile_switch, out= )[0][-1] > - if src_vec_model !=3D dst_vec_model: > - self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compile= _switch > + if self.nic in ["columbiaville_25g","columbiaville_100g"]: > + print "CVL support default none VECTOR" > + src_vec_model =3D 'n' > + else: > + out =3D self.dut.send_expect("cat config/common_base", "]# ",= 10) > + dst_vec_model =3D re.findall("%s=3D." % self.compile_switch, = out)[0][-1] > + if src_vec_model !=3D dst_vec_model: > + self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compi= le_switch > + "%s=3D%s/' config/common_base" % (self= .compile_switch, src_vec_model), "# ", 30) > - self.dut.skip_setup =3D False > - self.dut.build_install_dpdk(self.target) > + self.dut.skip_setup =3D False > + self.dut.build_install_dpdk(self.target) > def test_tunnel_filter(self): >=20 > # verify tunnel filter feature > -- > 1.8.3.1