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 77473A32A1 for ; Thu, 24 Oct 2019 10:16:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 550721D450; Thu, 24 Oct 2019 10:16:16 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 2D5861D44A for ; Thu, 24 Oct 2019 10:16:14 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 01:16:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,224,1569308400"; d="scan'208";a="399683650" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2019 01:16:12 -0700 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 01:16:12 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 01:16:12 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.166]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.119]) with mapi id 14.03.0439.000; Thu, 24 Oct 2019 16:16:10 +0800 From: "He, Zhiwei" To: "Peng, ZhihongX" , "dts@dpdk.org" CC: "Peng, ZhihongX" , "He, Zhiwei" Thread-Topic: [dts] [PATCH V1] add cvl support for VECTOR configuration Thread-Index: AQHVikL92O5m1ig8NUC2wxKQUAjtKqdpcdcg Date: Thu, 24 Oct 2019 08:16:09 +0000 Message-ID: <09777F12A863964D9F4AE780D4FEA3E83E6E4FC0@SHSMSX104.ccr.corp.intel.com> References: <20191024160201.32520-1-zhihongx.peng@intel.com> In-Reply-To: <20191024160201.32520-1-zhihongx.peng@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 V1] add cvl support for VECTOR configuration 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" Acked-by zhiwei Thanks! zhiwei -----Original Message----- From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Peng Zhihong Sent: Friday, October 25, 2019 12:02 AM To: dts@dpdk.org Cc: Peng, ZhihongX Subject: [dts] [PATCH V1] add cvl support for VECTOR configuration add cvl support for VECTOR configuration Signed-off-by: Peng Zhihong --- tests/TestSuite_vxlan.py | 76 +++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index 3651= bac..6570364 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -261,6 +261,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 @@ -521,13 +523,= 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.search("%s=3D." % self.compile_switch, out).g= roup()[-1] - if src_vec_model =3D=3D 'y': - self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compile_s= witch - + "%s=3Dn/' config/common_base" % self.com= pile_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.search("%s=3D." % self.compile_switch, ou= t).group()[-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" + \ @@ -= 558,26 +564,34 @@ 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_s= witch - + "%s=3D%s/' config/common_base" % (self.c= ompile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup =3D False - self.dut.build_install_dpdk(self.target) + =20 + 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, o= ut)[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" % (se= lf.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.search("%s=3D." % self.compile_switch, out).g= roup()[-1] - if src_vec_model =3D=3D 'y': - self.dut.send_expect("sed -i -e 's/%s=3D.*$/" % self.compile_s= witch - + "%s=3Dn/' config/common_base" % self.com= pile_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.search("%s=3D." % self.compile_switch, ou= t).group()[-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" + \ @@ -= 613,13 +627,17 @@ class TestVxlan(TestCase, IxiaPacketGenerator): out =3D self.dut.send_expect("stop", "testpmd>", 10) self.dut.send_expect("quit", "#", 10) =20 - 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_s= witch - + "%s=3D%s/' config/common_base" % (self.c= ompile_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, o= ut)[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" % (se= lf.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): """ -- 2.17.1