From patchwork Mon Nov 2 06:22:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhou, JunX W" X-Patchwork-Id: 83357 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 97566A04E7; Mon, 2 Nov 2020 07:20:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 719735AB9; Mon, 2 Nov 2020 07:20:14 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 8727A5AB2 for ; Mon, 2 Nov 2020 07:20:11 +0100 (CET) IronPort-SDR: 33S9iVbFUKniF4Ctb8NAE2ixFQZAiBerMmLTIZAbVKfFehUYM5rxcUDzFKXUvCN8Eqel6TxI8x HvcnWW8xhHag== X-IronPort-AV: E=McAfee;i="6000,8403,9792"; a="166249794" X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="166249794" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2020 22:20:10 -0800 IronPort-SDR: E7OhwjB+wP71W8zcMUrsrKDP2GwShbp+frKcuSs3pvZm+RpdY/k121b5Guc2uTjpC0YMEVQqIE x1N6BbUFp6ig== X-IronPort-AV: E=Sophos;i="5.77,444,1596524400"; d="scan'208";a="537894136" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2020 22:20:09 -0800 From: "Zhou, Jun" To: dts@dpdk.org Cc: "Zhou, Junx" , Zhou@dpdk.org Date: Mon, 2 Nov 2020 14:22:25 +0800 Message-Id: <20201102062225.13030-1-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] delete modify switch RTE_LIBRTE_I40E_INC_VECTOR in dts 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" From: "Zhou, Junx" delete modify switch RTE_LIBRTE_I40E_INC_VECTOR in dts Signed-off-by: Zhou, Junx Tested-by: Zhou, Jun --- tests/TestSuite_nvgre.py | 39 +------------------------------------ tests/TestSuite_vxlan.py | 42 +--------------------------------------- 2 files changed, 2 insertions(+), 79 deletions(-) diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index ce02a857..7021f4c8 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -656,14 +656,6 @@ class TestNvgre(TestCase): if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) # check no nvgre packet self.nvgre_detect(outer_l3_type = "IPv6", outer_ip_proto=0xFF) @@ -679,17 +671,6 @@ class TestNvgre(TestCase): self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", outer_vlan=1) # check vlan nvgre + vlan inner and outer packet self.nvgre_detect(outer_l3_type = "IPv6", inner_l3_type="IPv6", outer_vlan=1, inner_vlan=1) - if self.nic in ["columbiaville_25g","columbiaville_100g"]: - print("CVL support default none VECTOR") - src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) def test_nvgre_ipv6_checksum_offload(self): # check nvgre packet + inner IPv6 + inner L4 invalid @@ -731,14 +712,6 @@ class TestNvgre(TestCase): if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) # check no nvgre packet self.nvgre_detect(outer_ip_proto=0xFF) @@ -752,17 +725,7 @@ class TestNvgre(TestCase): self.nvgre_detect(outer_vlan=1) # check vlan nvgre + vlan inner packet self.nvgre_detect(outer_vlan=1, inner_vlan=1) - if self.nic in ["columbiaville_25g","columbiaville_100g"]: - print("CVL support default none VECTOR") - src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + def test_tunnel_filter(self): # verify tunnel filter feature diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index eb324fbd..0bfc708b 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -558,14 +558,6 @@ class TestVxlan(TestCase, IxiaPacketGenerator): if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ @@ -596,19 +588,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): out = self.dut.send_expect("stop", "testpmd>", 10) self.dut.send_expect("quit", "#", 10) - - if self.nic in ["columbiaville_25g","columbiaville_100g"]: - print("CVL support default none VECTOR") - src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) - + def test_vxlan_ipv6_detect(self): """ verify vxlan packet detection with ipv6 header @@ -616,14 +596,6 @@ class TestVxlan(TestCase, IxiaPacketGenerator): if self.nic in ["columbiaville_25g","columbiaville_100g"]: print("CVL support default none VECTOR") src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1] - if src_vec_model == 'y': - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=n/' config/common_base" % self.compile_switch, "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \ "%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \ @@ -659,18 +631,6 @@ class TestVxlan(TestCase, IxiaPacketGenerator): out = self.dut.send_expect("stop", "testpmd>", 10) self.dut.send_expect("quit", "#", 10) - if self.nic in ["columbiaville_25g","columbiaville_100g"]: - print("CVL support default none VECTOR") - src_vec_model = 'n' - else: - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1] - if src_vec_model != dst_vec_model: - self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch - + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30) - self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) - def test_vxlan_ipv4_checksum_offload(self): """ verify vxlan packet checksum offload