From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C248658DB for ; Tue, 1 Dec 2015 08:56:52 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 30 Nov 2015 23:56:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,368,1444719600"; d="scan'208";a="863963561" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.238.55.12]) by fmsmga002.fm.intel.com with ESMTP; 30 Nov 2015 23:56:42 -0800 From: Lijuan Tu To: dts@dpdk.org Date: Tue, 1 Dec 2015 15:52:13 +0800 Message-Id: <1448956333-2525-1-git-send-email-lijuanx.a.tu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH v2]tests uni_pkt: disable vector ixgbe driver and rename i350 to powerville 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: Tue, 01 Dec 2015 07:56:53 -0000 Signed-off-by: Lijuan Tu --- tests/TestSuite_uni_pkt.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py index ca72e75..60756c9 100644 --- a/tests/TestSuite_uni_pkt.py +++ b/tests/TestSuite_uni_pkt.py @@ -63,6 +63,17 @@ class TestUniPacket(TestCase): self.dut_port = valports[0] tester_port = self.tester.get_local_port(self.dut_port) self.tester_iface = self.tester.get_interface(tester_port) + """ + Change config file to disable vector pmd and recompile the package. + """ + [arch, machine, env, toolchain] = self.target.split('-') + if "fortville" in self.nic.lower(): + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/" + + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) + elif "niantic" in self.nic.lower(): + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=.*$/" + + "CONFIG_RTE_IXGBE_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) + self.dut.build_install_dpdk(self.target) self.dut.send_expect( "./%s/app/testpmd -c f -n 4 -- -i --txqflags=0x0" % self.target, "testpmd>", 20) self.dut.send_expect("set fwd rxonly", "testpmd>") @@ -117,7 +128,7 @@ class TestUniPacket(TestCase): """ if "fortville" in self.nic.lower(): outerL4Type = "(outer) L4 type: L4_NONFRAG" - elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): + elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower(): outerL4Type = "(outer) L4 type: Unknown" pktType = { @@ -135,7 +146,7 @@ class TestUniPacket(TestCase): if "fortville" in self.nic.lower(): pktType.pop("MAC_IPihl_PKT") pktType.pop("MAC_IPihl_SCTP_PKT") - elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): + elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower(): pktType.pop("MAC_IP_ICMP_PKT") pktType.pop("MAC_IPFRAG_TCP_PKT") @@ -148,7 +159,7 @@ class TestUniPacket(TestCase): if "fortville" in self.nic.lower(): outerL4Type = "(outer) L4 type: L4_NONFRAG" outerL3Type = "(outer) L3 type: IPV6_EXT_UNKNOWN" - elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): + elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower(): outerL4Type = "(outer) L4 type: Unknown" outerL3Type = "(outer) L3 type: IPV6" @@ -163,7 +174,7 @@ class TestUniPacket(TestCase): # delete the unsupported packet based on nic type if "fortville" in self.nic.lower(): pktType.pop("MAC_IPv6FRAG_PKT_N") - elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): + elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower(): pktType.pop("MAC_IPv6FRAG_PKT_F") self.run_test(pktType) @@ -198,7 +209,7 @@ class TestUniPacket(TestCase): checked that whether IPv4 in IPv6 tunnel packet can be normally detected by Niantic and i350. """ - if "niantic" not in self.nic.lower() and "i350" not in self.nic.lower(): + if "niantic" not in self.nic.lower() and "powerville" not in self.nic.lower(): return pktType = { @@ -361,4 +372,15 @@ class TestUniPacket(TestCase): Nothing to do. """ self.dut.kill_all() + """ + Restore the config file and recompile the package. + """ + [arch, machine, env, toolchain] = self.target.split('-') + if "fortville" in self.nic.lower(): + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/" + + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) + elif "niantic" in self.nic.lower(): + self.dut.send_expect("sed -i -e 's/CONFIG_RTE_IXGBE_INC_VECTOR=.*$/" + + "CONFIG_RTE_IXGBE_INC_VECTOR=n/' config/common_%s" % env, "# ", 30) + self.dut.build_install_dpdk(self.target) pass -- 1.9.1