From patchwork Mon Jul 11 07:22:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 113892 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 028C2A00C4; Mon, 11 Jul 2022 09:22:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFEEC4021F; Mon, 11 Jul 2022 09:22:53 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 24FC34021E for ; Mon, 11 Jul 2022 09:22:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657524172; x=1689060172; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ouZWIJYik99oDmBY8MUEpZ9dtlk1cNc9GVYG05L1GAE=; b=dP/xKrMcDejqyfPI5Ug5SDa6zcMrn+Kaze4brmJhZODdkKgri00Dd4pO Xz6WdxygSE605Pfk8TuAEeWWGy0fTxLOsCe5NdyKovs94sq2aHojeFX22 TGafIb24YiNGIJZn//s15Mc7z9OpNOCFL3tvAzaHCZoH78V2XOWuUqI/x W41zZ4dKx9Gg+xVD2zjVtqvnDnHp3uo+YtRIeDfS/EvBqnlrYPVXwyHER g28Oh3VAZRlsHJczNe1AKbD8gV7WDQFGUsRlPdeRObXevRYbkxCRRTd8Z rDgBKBnJz/oZlGBRwKnri/akm2KpU2B/iGRrdWTPCI9+AX4u5k7mTr38p A==; X-IronPort-AV: E=McAfee;i="6400,9594,10404"; a="285723944" X-IronPort-AV: E=Sophos;i="5.92,262,1650956400"; d="scan'208";a="285723944" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 00:22:43 -0700 X-IronPort-AV: E=Sophos;i="5.92,262,1650956400"; d="scan'208";a="652346729" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 00:22:42 -0700 From: Weiyuan Li To: dts@dpdk.org, yuan.peng@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V3 2/4] tests/vf_vlan: update dts code for driver change Date: Mon, 11 Jul 2022 15:22:32 +0800 Message-Id: <20220711072234.852-2-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220711072234.852-1-weiyuanx.li@intel.com> References: <20220711072234.852-1-weiyuanx.li@intel.com> MIME-Version: 1.0 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 The out-tree driver has vf-vlan-pruning option,but in-tree driver has not. So we need different action to enable vlan filter when we validate the vlan filter function with in-tree and out-tree kernel drvier. Signed-off-by: Weiyuan Li --- v2: -fix format issue v3: -modify the code to check whether vf-vlan-pruning option exists. -modify the description of the test plan about vf-vlan-pruning. tests/TestSuite_vf_vlan.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index e73ad479..c4904c55 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.py @@ -6,6 +6,7 @@ import random import re import time +import framework.utils as utils from framework.packet import Packet from framework.pmd_output import PmdOutput from framework.settings import get_nic_name @@ -62,7 +63,17 @@ 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) - if self.is_eth_series_nic(800) and self.default_stats: + # check driver whether there is flag vf-vlan-pruning. + if not self.default_stats: + self.logger.warning( + utils.RED( + f"{self.kdriver + '_' + self.driver_version} driver does not have vf-vlan-pruning flag." + ) + ) + if ( + any([self.is_eth_series_nic(800), self.kdriver == "i40e"]) + and self.default_stats + ): self.dut.send_expect( "ethtool --set-priv-flags %s %s on" % (self.host_intf0, self.flag), "# " ) @@ -233,7 +244,11 @@ class TestVfVlan(TestCase): self.vm0_testpmd.execute_cmd("start") out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.kdriver == "i40e" and self.driver_version < "2.13.10": + if ( + (self.kdriver == "i40e" and self.driver_version < "2.13.10") + or (self.kdriver == "i40e" and not self.default_stats) + or (self.kdriver == "ice" and not self.default_stats) + ): self.verify("received" in out, "Failed to received vlan packet!!!") else: self.verify("received" not in out, "Received vlan packet without pvid!!!") @@ -354,7 +369,11 @@ class TestVfVlan(TestCase): # send packet with vlan out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") - if self.kdriver == "i40e" and self.driver_version < "2.13.10": + if ( + (self.kdriver == "i40e" and self.driver_version < "2.13.10") + or (self.kdriver == "i40e" and not self.default_stats) + or (self.kdriver == "ice" and not self.default_stats) + ): self.verify( "received 1 packets" in out, "Received mismatched vlan packet while vlan filter on", @@ -415,7 +434,10 @@ class TestVfVlan(TestCase): def tear_down_all(self): self.destroy_vm_env() - if self.is_eth_series_nic(800) and self.default_stats: + if ( + any([self.is_eth_series_nic(800), self.kdriver == "i40e"]) + and self.default_stats + ): self.dut.send_expect( "ethtool --set-priv-flags %s %s %s" % (self.host_intf0, self.flag, self.default_stats),