From patchwork Fri Jun 18 09:26:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Dong X-Patchwork-Id: 94404 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1CA28A0C47; Fri, 18 Jun 2021 11:27:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 054A0410EC; Fri, 18 Jun 2021 11:27:01 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 9A42340142 for ; Fri, 18 Jun 2021 11:26:59 +0200 (CEST) IronPort-SDR: FFcTe1AGutPqmjKpea/EOE2np9r1VrV29T+swEX9giHxEVIVMMfmNmq2k/5676HTFXhQG44fVO bOAEujvY9YOw== X-IronPort-AV: E=McAfee;i="6200,9189,10018"; a="267670288" X-IronPort-AV: E=Sophos;i="5.83,283,1616482800"; d="scan'208";a="267670288" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2021 02:26:56 -0700 IronPort-SDR: QAwUJ2QG9MkSDtS5FSUhX6zZagzmc5EBvkZm0WNQUxgl7tR6LsNc45buhU57IcIKLNknSAcKIW rxyVIj6MnVOw== X-IronPort-AV: E=Sophos;i="5.83,283,1616482800"; d="scan'208";a="485620793" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.240.182.57]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2021 02:26:55 -0700 From: Jun Dong To: junx.dong@intel.com Cc: dts@dpdk.org Date: Fri, 18 Jun 2021 17:26:15 +0800 Message-Id: <20210618092615.202107-4-junx.dong@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618092615.202107-1-junx.dong@intel.com> References: <20210618092615.202107-1-junx.dong@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V1 3/3] tests/*: update test plan about enable IAVF X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 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" * update iavf test suite * update vf_l3fwd test suite Signed-off-by: Jun Dong --- tests/TestSuite_iavf.py | 12 ------------ tests/TestSuite_vf_l3fwd.py | 13 ------------- 2 files changed, 25 deletions(-) diff --git a/tests/TestSuite_iavf.py b/tests/TestSuite_iavf.py index 248bd8d1..9656b4fc 100644 --- a/tests/TestSuite_iavf.py +++ b/tests/TestSuite_iavf.py @@ -84,9 +84,6 @@ class TestIavf(TestCase): else: self.vf_assign_method = 'vfio-pci' self.dut.send_expect('modprobe vfio-pci', '#') - self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") - self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.dut.build_install_dpdk(self.target) self.setup_vm_env() def set_up(self): @@ -153,9 +150,6 @@ class TestIavf(TestCase): self.vm0_dut_ports = self.vm_dut_0.get_ports('any') self.vm0_testpmd = PmdOutput(self.vm_dut_0) - self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") - self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.vm_dut_0.build_install_dpdk(self.target) self.env_done = True def bind_nic_driver(self, ports, driver=""): @@ -183,9 +177,6 @@ class TestIavf(TestCase): netdev.bind_driver(driver=driver) def destroy_vm_env(self): - self.vm_dut_0.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ") - self.vm_dut_0.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.vm_dut_0.build_install_dpdk(self.target) if getattr(self, 'vm0', None): if getattr(self, 'vm_dut_0', None): self.vm_dut_0.kill_all() @@ -771,9 +762,6 @@ class TestIavf(TestCase): self.dut.send_expect("quit", "# ") if self.env_done is True: self.destroy_vm_env() - self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },/d' drivers/net/iavf/iavf_ethdev.c", "# ") - self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.dut.build_install_dpdk(self.target) self.env_done = False else: pass diff --git a/tests/TestSuite_vf_l3fwd.py b/tests/TestSuite_vf_l3fwd.py index 60a2bea4..a9bc7fa4 100644 --- a/tests/TestSuite_vf_l3fwd.py +++ b/tests/TestSuite_vf_l3fwd.py @@ -307,21 +307,9 @@ class TestVfL3fwd(TestCase): for idx in self.dut_ports: self.verify(self.dut.ports_info[idx]['port'].default_driver == 'i40e', 'The case is only designed for Fortville') - self.build_iavf() self.set_rxtx_descriptor_2048_and_rebuild_l3fwd() self.measure_vf_performance(host_driver='default', vf_driver=self.get_kernel_pf_vf_driver()) - def build_iavf(self): - self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) },/a { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) },' drivers/net/iavf/iavf_ethdev.c", "# ") - self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x154C/0x164C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.dut.build_install_dpdk(self.target) - - def restore_dpdk(self): - if self.running_case == "test_perf_kernel_pf_dpdk_iavf_perf_host_only": - self.dut.send_expect("sed -i '/{ RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF) }/d' drivers/net/iavf/iavf_ethdev.c", "# ") - self.dut.send_expect("sed -i -e '/I40E_DEV_ID_VF/s/0x164C/0x154C/g' drivers/net/i40e/base/i40e_devids.h", "# ") - self.dut.build_install_dpdk(self.target) - def set_rxtx_descriptor_2048_and_rebuild_l3fwd(self): """ Set RX/TX descriptor to 2048 and rebuild l3fwd @@ -344,7 +332,6 @@ class TestVfL3fwd(TestCase): def tear_down(self): self.destroy_vf_env() - self.restore_dpdk() def tear_down_all(self): self.dut.bind_interfaces_linux(self.drivername)