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 411A8A2E1B for ; Wed, 4 Sep 2019 07:25:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2BB7B1EBAC; Wed, 4 Sep 2019 07:25:54 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id A69FA1EBAC for ; Wed, 4 Sep 2019 07:25:52 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Sep 2019 22:25:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,465,1559545200"; d="scan'208";a="382376091" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga005.fm.intel.com with ESMTP; 03 Sep 2019 22:25:51 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Sep 2019 22:25:51 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 3 Sep 2019 22:25:51 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.92]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.23]) with mapi id 14.03.0439.000; Wed, 4 Sep 2019 13:25:49 +0800 From: "Tu, Lijuan" To: "He, Zhiwei" , "dts@dpdk.org" CC: "He, Zhiwei" Thread-Topic: [dts] [PATCH] tests/TestSuite_vxlan: Enable CVL25Gand100g NIC to support VXLAN case Thread-Index: AQHVXi0jSTqlt2SrOUS3t1pjgR5fSacbBgtg Date: Wed, 4 Sep 2019 05:25:48 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BB1C046@SHSMSX101.ccr.corp.intel.com> References: <1567057588-38070-1-git-send-email-zhiwei.he@intel.com> In-Reply-To: <1567057588-38070-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: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjc4YzU3MmUtYmQ2MS00NzZjLWE1ZGEtYWVmYzMwNGM5NmY1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYlR1enVBMUFQSFVCa2MxQTkweU1Eck94OW9mcDVaWmFPZ0p3YTRBRDlRWXRSclBjZlVwUjRuODRKQzlhVEQ5MyJ9 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] tests/TestSuite_vxlan: Enable CVL25Gand100g NIC to support VXLAN 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of zhiwei.he > Sent: Thursday, August 29, 2019 1:46 PM > To: dts@dpdk.org > Cc: He, Zhiwei > Subject: [dts] [PATCH] tests/TestSuite_vxlan: Enable CVL25Gand100g NIC to > support VXLAN case >=20 > From: "zhiwei.he" >=20 > Signed-off-by: zhiwei.he > --- > tests/TestSuite_vxlan.py | 76 +++++++++++++++++++++++++++++-------------= ---- > -- > 1 file changed, 46 insertions(+), 30 deletions(-) >=20 > diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index > ecc3f3a..3bc8071 100644 > --- a/tests/TestSuite_vxlan.py > +++ b/tests/TestSuite_vxlan.py > @@ -266,6 +266,8 @@ class TestVxlan(TestCase, IxiaPacketGenerator): > 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 this vxlan" % self.nic) > # Based on h/w type, choose how many ports to use @@ -533,13 > +535,17 @@ class TestVxlan(TestCase, IxiaPacketGenerator): > """ > verify vxlan packet detection > """ > - 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 > - + "%s=3Dn/' config/common_base" % self.c= ompile_switch, > "# ", 30) > - self.dut.skip_setup =3D False > - self.dut.build_install_dpdk(self.target) > + 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= .compile_switch, > "# ", 30) > + self.dut.skip_setup =3D False > + self.dut.build_install_dpdk(self.target) >=20 >=20 > pmd_temp =3D "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ > @@ -571,26 +577,33 @@ class TestVxlan(TestCase, IxiaPacketGenerator): >=20 > out =3D self.dut.send_expect("stop", "testpmd>", 10) > self.dut.send_expect("quit", "#", 10) > - > - 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 > - + "%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) > + 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) >=20 > def test_vxlan_ipv6_detect(self): > """ > verify vxlan packet detection with ipv6 header > """ > - 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 > - + "%s=3Dn/' config/common_base" % self.c= ompile_switch, > "# ", 30) > - self.dut.skip_setup =3D False > - self.dut.build_install_dpdk(self.target) > + 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= .compile_switch, > "# ", 30) > + self.dut.skip_setup =3D False > + self.dut.build_install_dpdk(self.target) >=20 > pmd_temp =3D "./%(TARGET)s/app/testpmd -c %(COREMASK)s -n " + \ > "%(CHANNEL)d -- -i --disable-rss --rxq=3D4 --txq=3D4" + \ @@= -625,14 > +638,17 @@ class TestVxlan(TestCase, IxiaPacketGenerator): >=20 > out =3D self.dut.send_expect("stop", "testpmd>", 10) > self.dut.send_expect("quit", "#", 10) > - > - 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 > - + "%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) > + 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) >=20 > def test_vxlan_ipv4_checksum_offload(self): > """ > -- > 1.8.3.1