From patchwork Sat Oct 9 17:50:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, ZhiminX" X-Patchwork-Id: 100914 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 07B6EA0C45; Sat, 9 Oct 2021 11:23:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0A154067A; Sat, 9 Oct 2021 11:23:11 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 462B44003C for ; Sat, 9 Oct 2021 11:23:10 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10131"; a="226603056" X-IronPort-AV: E=Sophos;i="5.85,360,1624345200"; d="scan'208";a="226603056" 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:09 -0700 X-IronPort-AV: E=Sophos;i="5.85,360,1624345200"; d="scan'208";a="624992652" 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:08 -0700 From: Zhimin Huang To: dts@dpdk.org Cc: Zhimin Huang Date: Sun, 10 Oct 2021 01:50:19 +0800 Message-Id: <20211009175019.30234-2-zhiminx.huang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211009175019.30234-1-zhiminx.huang@intel.com> References: <20211009175019.30234-1-zhiminx.huang@intel.com> Subject: [dts] [PATCH V3 2/2] tests/kernelpf_iavf: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_kernelpf_iavf.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index 6a858fc5..d5427b54 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -67,6 +67,8 @@ class TestKernelpfIavf(TestCase): self.vf_mac = '00:01:23:45:67:89' self.add_addr = '00:11:22:33:44:55' self.wrong_mac = '00:11:22:33:44:99' + # get driver version + self.driver_version = self.nic_obj.driver_version self.port = self.dut_ports[0] self.vm_port = 0 @@ -155,10 +157,6 @@ class TestKernelpfIavf(TestCase): self.dut.send_expect("ip link set %s vf 0 mac %s" % (self.host_intf, self.vf_mac), "# ") - # get driver version - out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf, "# ") - self.driver_version = out.replace(" ", "") - try: for port in self.sriov_vfs_port: @@ -431,7 +429,7 @@ class TestKernelpfIavf(TestCase): out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!") self.verify(self.vf_mac in out, "Failed to received vlan packet!!!") else: @@ -500,7 +498,7 @@ class TestKernelpfIavf(TestCase): # send vlan 1 packet, vf can receive packet out = self.send_and_getout(vlan=1, 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(self.vf_mac in out, "received vlan 1 packet!!!") else: self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!") @@ -585,7 +583,7 @@ class TestKernelpfIavf(TestCase): time.sleep(1) tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!') else: self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!') @@ -957,7 +955,7 @@ class TestKernelpfIavf(TestCase): self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10) out = self.vm_dut.get_session_output() packets = len(re.findall('received 1 packets', out)) - if self.driver_version < "2.13.10" or self.kdriver == 'ice': + if self.kdriver == 'i40e' and self.driver_version < "2.13.10": self.verify(packets == 10, "Not receive expected packet") else: self.verify(packets == 0, "Receive expected packet")