From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC2CFA04FD; Thu, 10 Nov 2022 06:29:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7A1940A7D; Thu, 10 Nov 2022 06:29:39 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 9150F40A7D for ; Thu, 10 Nov 2022 06:29:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668058177; x=1699594177; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0ML7i3D2Y13lqtxpYj1XYZrNUOnbUPNhMc1cbWm/NUs=; b=m+Rx9xZz4I+IjR+LkyMrUk9ndOV2pCluzt8ARNtZpcakD/m8EHDv57sj 2q6zDkUyF6GeCJasNzs4NPRq+2qR0uKD8MOAgJI2msYHSd2R2NsEW7PJc BKi8D95vQEz5V9J4Rz+emYqDlVYH9Me0XtxZhz2Jpy3U+3H5hxgwdsEUb n+DGTtfHBrnwXmlIpHza0P2JTrewfdTm1636oCjoobwJ8jPry1gn/yZue cXzy9ekhIP52lOo4YiKKwS6jzFbLEBEjq+9vUY/UvO6mDj8leHZei8iR2 6NMGAiUltkQVRdOuKPtkbsLtVUeAAD8AMfKHWXUNi9ISscj05w7UceiAx g==; X-IronPort-AV: E=McAfee;i="6500,9779,10526"; a="373332607" X-IronPort-AV: E=Sophos;i="5.96,152,1665471600"; d="scan'208";a="373332607" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2022 21:29:37 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10526"; a="637037005" X-IronPort-AV: E=Sophos;i="5.96,152,1665471600"; d="scan'208";a="637037005" Received: from unknown (HELO dpdk-VF-dut247..) ([10.239.252.247]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2022 21:29:35 -0800 From: Weiyuan Li To: dts@dpdk.org, lijuan.tu@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V2 4/8] tests/vlan: modify script and test plan to support i40e fimware > 8.3 Date: Thu, 10 Nov 2022 13:33:54 +0800 Message-Id: <20221110053358.437591-4-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110053358.437591-1-weiyuanx.li@intel.com> References: <20221110053358.437591-1-weiyuanx.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Modify script and test plan to i40e support fimware > 8.3. When the fimrware > 8.3, if the filter is to take effect need to enable extend. Signed-off-by: Weiyuan Li --- v2: -use the firmware version to judge whether to add command `extend on`. tests/TestSuite_vlan.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index 3d8811f9..c2240c30 100644 --- a/tests/TestSuite_vlan.py +++ b/tests/TestSuite_vlan.py @@ -48,7 +48,14 @@ class TestVlan(TestCase): self.pmdout.start_testpmd( "Default", "--portmask=%s --port-topology=loop" % portMask ) - + # Get the firmware version information + try: + self.fwversion, _, _ = self.pmdout.get_firmware_version( + self.dut_ports[0] + ).split() + except ValueError: + # nic IXGBE, IGC + self.fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split() self.dut.send_expect("set verbose 1", "testpmd> ") self.dut.send_expect("set fwd mac", "testpmd> ") self.dut.send_expect("set promisc all off", "testpmd> ") @@ -105,6 +112,10 @@ class TestVlan(TestCase): self.dut.send_expect( "rx_vlan add %d %s" % (self.vlan, dutRxPortId), "testpmd> " ) + # Because the kernel forces enable Qinq and cannot be closed, + # the dpdk can only add 'extend on' to make the single VLAN filter work normally. + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("start", "testpmd> ", 120) out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ", 20) @@ -127,6 +138,10 @@ class TestVlan(TestCase): Disable receipt of VLAN packets """ self.dut.send_expect("rx_vlan rm %d %s" % (self.vlan, dutRxPortId), "testpmd> ") + # Because the kernel forces enable Qinq and cannot be closed, + # the dpdk can only add 'extend on' to make the single VLAN filter work normally. + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("start", "testpmd> ", 120) self.vlan_send_packet(self.vlan) @@ -187,7 +202,8 @@ class TestVlan(TestCase): """ Run after each test case. """ - pass + if self.kdriver == "i40e" and self.fwversion >= "8.40": + self.dut.send_expect("vlan set extend off %s" % dutRxPortId, "testpmd> ") def tear_down_all(self): """ -- 2.27.0