From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 3E8311B203 for ; Fri, 6 Oct 2017 03:16:44 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 05 Oct 2017 18:16:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,482,1500966000"; d="scan'208";a="143331938" Received: from pengsong-mobl.ccr.corp.intel.com (HELO yuweizh1-MOBL2.ccr.corp.intel.com) ([10.255.26.47]) by orsmga002.jf.intel.com with ESMTP; 05 Oct 2017 18:16:42 -0700 From: Yuwei Zhang To: dts@dpdk.org Cc: Yuwei Zhang Date: Fri, 6 Oct 2017 09:16:38 +0800 Message-Id: <20171006011638.16100-1-yuwei1.zhang@intel.com> X-Mailer: git-send-email 2.14.1.windows.1 Subject: [dts] [PATCH v1] add vfio-pci driver cases to vf_packet_rxtx test suite 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: Fri, 06 Oct 2017 01:16:45 -0000 Signed-off-by: Yuwei Zhang --- tests/TestSuite_vf_packet_rxtx.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_vf_packet_rxtx.py b/tests/TestSuite_vf_packet_rxtx.py index 50451f6..56d618c 100644 --- a/tests/TestSuite_vf_packet_rxtx.py +++ b/tests/TestSuite_vf_packet_rxtx.py @@ -12,6 +12,8 @@ VM_CORES_MASK = 'all' class TestVfPacketRxtx(TestCase): + supported_vf_driver = ['pci-stub', 'vfio-pci'] + def set_up_all(self): self.dut_ports = self.dut.get_ports(self.nic) @@ -19,6 +21,18 @@ class TestVfPacketRxtx(TestCase): self.vm0 = None self.vm1 = None + # set vf assign method and vf driver + self.vf_driver = self.get_suite_cfg()['vf_driver'] + if self.vf_driver is None: + self.vf_driver = 'pci-stub' + self.verify(self.vf_driver in self.supported_vf_driver, "Unspported vf driver") + if self.vf_driver == 'pci-stub': + self.vf_assign_method = 'pci-assign' + else: + self.vf_assign_method = 'vfio-pci' + + + def set_up(self): self.setup_2pf_2vf_1vm_env_flag = 0 @@ -37,10 +51,10 @@ class TestVfPacketRxtx(TestCase): try: for port in self.sriov_vfs_port_0: - port.bind_driver('pci-stub') + port.bind_driver(self.vf_driver) for port in self.sriov_vfs_port_1: - port.bind_driver('pci-stub') + port.bind_driver(self.vf_driver) time.sleep(1) vf0_prop = {'opt_host': self.sriov_vfs_port_0[0].pci} @@ -59,8 +73,8 @@ class TestVfPacketRxtx(TestCase): # set up VM0 ENV self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_packet_rxtx') - self.vm0.set_vm_device(driver='pci-assign', **vf0_prop) - self.vm0.set_vm_device(driver='pci-assign', **vf1_prop) + self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prop) + self.vm0.set_vm_device(driver=self.vf_assign_method, **vf1_prop) self.vm_dut_0 = self.vm0.start() if self.vm_dut_0 is None: raise Exception("Set up VM0 ENV failed!") @@ -159,7 +173,7 @@ class TestVfPacketRxtx(TestCase): for port in self.sriov_vfs_port: print port.pci - port.bind_driver('pci-stub') + port.bind_driver(self.vf_driver) time.sleep(1) vf0_prop = {'opt_host': self.sriov_vfs_port[0].pci} @@ -181,14 +195,14 @@ class TestVfPacketRxtx(TestCase): # set up VM0 ENV self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_packet_rxtx') - self.vm0.set_vm_device(driver='pci-assign', **vf0_prop) - self.vm0.set_vm_device(driver='pci-assign', **vf1_prop) + self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prop) + self.vm0.set_vm_device(driver=self.vf_assign_method, **vf1_prop) self.vm_dut_0 = self.vm0.start() if self.vm_dut_0 is None: raise Exception("Set up VM0 ENV failed!") # set up VM1 ENV self.vm1 = QEMUKvm(self.dut, 'vm1', 'vf_packet_rxtx') - self.vm1.set_vm_device(driver='pci-assign', **vf2_prop) + self.vm1.set_vm_device(driver=self.vf_assign_method, **vf2_prop) self.vm_dut_1 = self.vm1.start() if self.vm_dut_1 is None: raise Exception("Set up VM1 ENV failed!") -- 2.14.1.windows.1