From patchwork Sat Oct 9 17:50:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, ZhiminX" X-Patchwork-Id: 100913 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 DCCDBA0C41; Sat, 9 Oct 2021 11:23:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFAF340142; Sat, 9 Oct 2021 11:23:10 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id A175B4003C for ; Sat, 9 Oct 2021 11:23:09 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10131"; a="226603055" X-IronPort-AV: E=Sophos;i="5.85,360,1624345200"; d="scan'208";a="226603055" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2021 02:23:08 -0700 X-IronPort-AV: E=Sophos;i="5.85,360,1624345200"; d="scan'208";a="624992644" Received: from unknown (HELO localhost.localdomain) ([10.240.183.103]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2021 02:23:07 -0700 From: Zhimin Huang To: dts@dpdk.org Cc: Zhimin Huang Date: Sun, 10 Oct 2021 01:50:18 +0800 Message-Id: <20211009175019.30234-1-zhiminx.huang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V3 1/2] tests/vf_vlan:fix vlan issue 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" 1.use dts framework interface to get kernel driver version. 2.according to 1c301e8c3cff02501b5bd35feae30193fd3e65e1, fix dts code to adapt test point. v3: - add dpdk commit id in comment Signed-off-by: Zhimin Huang --- tests/TestSuite_vf_vlan.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index 28650143..34ba75e7 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.py @@ -65,6 +65,9 @@ class TestVfVlan(TestCase): self.vf_assign_method = 'vfio-pci' self.dut.send_expect('modprobe vfio-pci', '#') + # get driver version + self.driver_version = self.nic_obj.driver_version + def set_up(self): self.setup_vm_env() @@ -107,9 +110,6 @@ class TestVfVlan(TestCase): self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]['intf'] tester_port = self.tester.get_local_port(self.used_dut_port_0) self.tester_intf0 = self.tester.get_interface(tester_port) - # get driver version - out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf0, "# ") - self.driver_version = out.replace(" ", "") self.dut.generate_sriov_vfs_by_port( self.used_dut_port_0, 1, driver=driver) @@ -276,7 +276,7 @@ class TestVfVlan(TestCase): self.vm0_testpmd.execute_cmd("start") out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify("received" in out, "Failed to received vlan packet!!!") else: self.verify( @@ -398,7 +398,7 @@ class TestVfVlan(TestCase): # send packet with vlan out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify( "received 1 packets" in out, "Received mismatched vlan packet while vlan filter on") else: