Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120044/?format=api
{ "id": 120044, "url": "https://patches.dpdk.org/api/patches/120044/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20221122070927.7634-2-weiyuanx.li@intel.com/", "project": { "id": 3, "url": "https://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20221122070927.7634-2-weiyuanx.li@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20221122070927.7634-2-weiyuanx.li@intel.com", "date": "2022-11-22T07:09:21", "name": "[V4,2/8] tests/dual_vlan: modify script and test plan to support i40e fimware >= 8.4", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7bf21520799ba7f3f708d8b4ed9de5c50a6fd512", "submitter": { "id": 2477, "url": "https://patches.dpdk.org/api/people/2477/?format=api", "name": "Weiyuan Li", "email": "weiyuanx.li@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dts/patch/20221122070927.7634-2-weiyuanx.li@intel.com/mbox/", "series": [ { "id": 25851, "url": "https://patches.dpdk.org/api/series/25851/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=25851", "date": "2022-11-22T07:09:20", "name": "[V4,1/8] test_plans/dual_vlan: modify script and test plan to support i40e fimware >= 8.4", "version": 4, "mbox": "https://patches.dpdk.org/series/25851/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/120044/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/120044/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D4C87A057F;\n\tTue, 22 Nov 2022 08:09:41 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CF64842D4C;\n\tTue, 22 Nov 2022 08:09:41 +0100 (CET)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n by mails.dpdk.org (Postfix) with ESMTP id A71C9427EB\n for <dts@dpdk.org>; Tue, 22 Nov 2022 08:09:39 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Nov 2022 23:09:39 -0800", "from unknown (HELO localhost.localdomain) ([10.239.252.248])\n by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Nov 2022 23:09:36 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1669100979; x=1700636979;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=Fyiyi9euDpabqAj4yE2ALXiuYyXnDSUUMm1peRpteF0=;\n b=eZZ1viaWG6aGD+hzbeDQ298dOiGkY1q5lehr8B+8TmXVBKgy5dqRwyov\n 5w11VX/AyWf+ZutwYN/PyVpLEzcsVKcfKwWONKCp8kHWXfdCX+LELS4Nq\n hg4iYUWdgryDsl/07VTtnCEZyuJvxKV5Nbe9IwTa//FaqV1UcvbZW8udA\n ORdw8xCjD660Fe00nTYAhNi/XMF8e/cMM8BoXn+4C8n+3kXozUz0/b0Dy\n P58CBYeDQ1eZAf/wfkm0496wO+HGiSAS6Y4XPJ6x6l0+pa0gAJ1/OG1RK\n U22tRAZNuDfuvYESODxCeP0shJP6nejxM9VSHYsMFuiTxVv/1hX1eu5dc g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10538\"; a=\"314899808\"", "E=Sophos;i=\"5.96,183,1665471600\"; d=\"scan'208\";a=\"314899808\"", "E=McAfee;i=\"6500,9779,10538\"; a=\"730296305\"", "E=Sophos;i=\"5.96,183,1665471600\"; d=\"scan'208\";a=\"730296305\"" ], "From": "Weiyuan Li <weiyuanx.li@intel.com>", "To": "dts@dpdk.org", "Cc": "Weiyuan Li <weiyuanx.li@intel.com>,\n\tSong Jiale <songx.jiale@intel.com>", "Subject": "[dts][PATCH V4 2/8] tests/dual_vlan: modify script and test plan to\n support i40e fimware >= 8.4", "Date": "Tue, 22 Nov 2022 15:09:21 +0800", "Message-Id": "<20221122070927.7634-2-weiyuanx.li@intel.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20221122070927.7634-1-weiyuanx.li@intel.com>", "References": "<20221122070927.7634-1-weiyuanx.li@intel.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=a\b\u001b[", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org" }, "content": "Modify script and test plan to i40e support fimware >= 8.4.\nWhen the fimrware >= 8.4, if the filter is to take effect need to enable\nextend.\n\nSigned-off-by: Weiyuan Li <weiyuanx.li@intel.com>\n---\nTested-by: Song Jiale <songx.jiale@intel.com>\n\nv2:\n-use the firmware version to judge whether to add command `extend on`.\nv3:\n-modify description.\nv4:\n-modify comments.\n-dual_vlan test plan modify table and add header.\n\n tests/TestSuite_dual_vlan.py | 393 ++++++++++++++++++++++-------------\n 1 file changed, 252 insertions(+), 141 deletions(-)", "diff": "diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py\nindex 614e70eb..b5cf7a62 100644\n--- a/tests/TestSuite_dual_vlan.py\n+++ b/tests/TestSuite_dual_vlan.py\n@@ -14,65 +14,6 @@ import re\n import time\n \n import framework.utils as utils\n-\n-txvlan = 3\n-outvlan = 1\n-invlan = 2\n-\n-allResult = {\n- \"TX+OUTER+INNER\": (txvlan, outvlan, invlan),\n- \"TX+INNER\": (txvlan, invlan),\n- \"TX+OUTER\": (txvlan, outvlan),\n- \"OUTER+INNER\": (outvlan, invlan),\n- \"INNER\": (invlan,),\n- \"OUTER\": (outvlan,),\n- \"NONE\": (\"No\",),\n-}\n-\n-stripCase = 0x1\n-filterCase = 0x2\n-qinqCase = 0x4\n-txCase = 0x8\n-\n-vlanCaseDef = [\n- 0,\n- stripCase,\n- filterCase,\n- filterCase | stripCase,\n- qinqCase,\n- qinqCase | stripCase,\n- qinqCase | filterCase,\n- qinqCase | filterCase | stripCase,\n- txCase,\n- txCase | stripCase,\n- txCase | filterCase,\n- txCase | filterCase | stripCase,\n- txCase | qinqCase,\n- txCase | qinqCase | stripCase,\n- txCase | qinqCase | filterCase,\n- txCase | qinqCase | filterCase | stripCase,\n-]\n-\n-vlanCase = [\n- \"OUTER+INNER\",\n- \"INNER\",\n- (\"OUTER+INNER\", \"NONE\"),\n- (\"INNER\", \"NONE\"),\n- \"OUTER+INNER\",\n- \"OUTER\",\n- (\"NONE\", \"OUTER+INNER\"),\n- (\"NONE\", \"OUTER\"),\n- \"TX+OUTER+INNER\",\n- \"TX+INNER\",\n- (\"TX+OUTER+INNER\", \"NONE\"),\n- (\"TX+INNER\", \"NONE\"),\n- \"TX+OUTER+INNER\",\n- \"TX+OUTER\",\n- (\"NONE\", \"TX+OUTER+INNER\"),\n- (\"NONE\", \"TX+OUTER\"),\n-]\n-\n-\n from framework.pmd_output import PmdOutput\n from framework.test_case import TestCase\n \n@@ -104,6 +45,15 @@ class TestDualVlan(TestCase):\n \"Default\", \"--portmask=%s\" % portMask, socket=self.ports_socket\n )\n \n+ # Get the firmware version information\n+ try:\n+ self.fwversion, _, _ = self.pmdout.get_firmware_version(\n+ self.dut_ports[0]\n+ ).split()\n+ except ValueError:\n+ # nic IXGBE, IGC\n+ self.fwversion = self.pmdout.get_firmware_version(self.dut_ports[0]).split()\n+\n if self.nic in [\n \"I40E_10G-SFP_XL710\",\n \"I40E_40G-QSFP_A\",\n@@ -120,6 +70,124 @@ class TestDualVlan(TestCase):\n self.verify(\"Set mac packet forwarding mode\" in out, \"set fwd mac error\")\n out = self.dut.send_expect(\"start\", \"testpmd> \", 120)\n \n+ # Vlan id\n+ self.txvlanId = 3\n+ self.outvlanId = 1\n+ self.invlanId = 2\n+\n+ if self.kdriver == \"i40e\" and self.fwversion >= \"8.40\":\n+ self.config_i40e_firmware_vlan()\n+ else:\n+ self.config_original()\n+\n+ def config_original(self):\n+ self.allResult = {\n+ \"TX+OUTER+INNER\": (self.txvlanId, self.outvlanId, self.invlanId),\n+ \"TX+INNER\": (self.txvlanId, self.invlanId),\n+ \"TX+OUTER\": (self.txvlanId, self.outvlanId),\n+ \"OUTER+INNER\": (self.outvlanId, self.invlanId),\n+ \"INNER\": (self.invlanId,),\n+ \"OUTER\": (self.outvlanId,),\n+ \"NONE\": (\"No\",),\n+ }\n+\n+ self.stripCase = 0x1\n+ self.filterCase = 0x2\n+ self.qinqCase = 0x4\n+ self.txCase = 0x8\n+\n+ self.vlanCaseDef = [\n+ 0,\n+ self.stripCase,\n+ self.filterCase,\n+ self.filterCase | self.stripCase,\n+ self.qinqCase,\n+ self.qinqCase | self.stripCase,\n+ self.qinqCase | self.filterCase,\n+ self.qinqCase | self.filterCase | self.stripCase,\n+ self.txCase,\n+ self.txCase | self.stripCase,\n+ self.txCase | self.filterCase,\n+ self.txCase | self.filterCase | self.stripCase,\n+ self.txCase | self.qinqCase,\n+ self.txCase | self.qinqCase | self.stripCase,\n+ self.txCase | self.qinqCase | self.filterCase,\n+ self.txCase | self.qinqCase | self.filterCase | self.stripCase,\n+ ]\n+\n+ self.vlanCase = [\n+ \"OUTER+INNER\",\n+ \"INNER\",\n+ (\"OUTER+INNER\", \"NONE\"),\n+ (\"INNER\", \"NONE\"),\n+ \"OUTER+INNER\",\n+ \"OUTER\",\n+ (\"NONE\", \"OUTER+INNER\"),\n+ (\"NONE\", \"OUTER\"),\n+ \"TX+OUTER+INNER\",\n+ \"TX+INNER\",\n+ (\"TX+OUTER+INNER\", \"NONE\"),\n+ (\"TX+INNER\", \"NONE\"),\n+ \"TX+OUTER+INNER\",\n+ \"TX+OUTER\",\n+ (\"NONE\", \"TX+OUTER+INNER\"),\n+ (\"NONE\", \"TX+OUTER\"),\n+ ]\n+\n+ def config_i40e_firmware_vlan(self):\n+ self.allResult = {\n+ \"TX+OUTER+INNER\": (self.txvlanId, self.outvlanId, self.invlanId),\n+ \"TX+INNER\": (self.txvlanId, self.invlanId),\n+ \"TX+OUTER\": (self.txvlanId, self.outvlanId),\n+ \"OUTER+INNER\": (self.outvlanId, self.invlanId),\n+ \"INNER\": (self.invlanId,),\n+ \"OUTER\": (self.outvlanId,),\n+ \"NONE\": (\"No\",),\n+ }\n+\n+ self.stripCase = 0x1\n+ self.filterCase = 0x2\n+ self.qinqCase = 0x4\n+ self.txCase = 0x8\n+\n+ self.vlanCaseDef = [\n+ 0,\n+ self.stripCase,\n+ self.filterCase | self.qinqCase,\n+ self.filterCase | self.qinqCase | self.stripCase,\n+ self.qinqCase,\n+ self.qinqCase | self.stripCase,\n+ self.qinqCase | self.filterCase,\n+ self.qinqCase | self.filterCase | self.stripCase,\n+ self.txCase,\n+ self.txCase | self.stripCase,\n+ self.txCase | self.filterCase | self.qinqCase,\n+ self.txCase | self.filterCase | self.qinqCase | self.stripCase,\n+ self.txCase | self.qinqCase,\n+ self.txCase | self.qinqCase | self.stripCase,\n+ self.txCase | self.qinqCase | self.filterCase,\n+ self.txCase | self.qinqCase | self.filterCase | self.stripCase,\n+ ]\n+\n+ self.vlanCase = [\n+ \"OUTER+INNER\",\n+ \"INNER\",\n+ (\"OUTER+INNER\", \"NONE\"),\n+ (\"OUTER\", \"NONE\"),\n+ \"OUTER+INNER\",\n+ \"OUTER\",\n+ (\"OUTER+INNER\", \"NONE\"),\n+ (\"OUTER\", \"NONE\"),\n+ \"TX+OUTER+INNER\",\n+ \"TX+INNER\",\n+ (\"TX+OUTER+INNER\", \"NONE\"),\n+ (\"TX+OUTER\", \"NONE\"),\n+ \"TX+OUTER+INNER\",\n+ \"TX+OUTER\",\n+ (\"TX+OUTER+INNER\", \"NONE\"),\n+ (\"TX+OUTER\", \"NONE\"),\n+ ]\n+\n def start_tcpdump(self, rxItf):\n \n self.tester.send_expect(\"rm -rf ./getPackageByTcpdump.cap\", \"#\")\n@@ -174,14 +242,10 @@ class TestDualVlan(TestCase):\n # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan\n if mode == \"filter\":\n if modeName[mode] == \"off\":\n- self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n- )\n+ self.dut.send_expect(\"vlan set filter off all\", \"testpmd> \")\n continue\n else:\n- self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n- )\n+ self.dut.send_expect(\"vlan set filter on all\", \"testpmd> \")\n continue\n \n if mode == \"stripq\":\n@@ -209,14 +273,10 @@ class TestDualVlan(TestCase):\n # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan\n if mode == \"filter\":\n if modeName[mode] == \"off\":\n- self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n- )\n+ self.dut.send_expect(\"vlan set filter off all\", \"testpmd> \")\n continue\n else:\n- self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n- )\n+ self.dut.send_expect(\"vlan set filter on all\", \"testpmd> \")\n continue\n \n if mode == \"extend\":\n@@ -235,22 +295,22 @@ class TestDualVlan(TestCase):\n \"\"\"\n Setup Strip/Filter/Extend/Insert enable/disable for synthetic test.\n \"\"\"\n- caseDef = vlanCaseDef[caseIndex]\n+ caseDef = self.vlanCaseDef[caseIndex]\n temp = []\n \n- temp.append(\"on\") if (caseDef & stripCase) != 0 else temp.append(\"off\")\n- temp.append(\"on\") if (caseDef & filterCase) != 0 else temp.append(\"off\")\n- temp.append(\"on\") if (caseDef & qinqCase) != 0 else temp.append(\"off\")\n+ temp.append(\"on\") if (caseDef & self.stripCase) != 0 else temp.append(\"off\")\n+ temp.append(\"on\") if (caseDef & self.filterCase) != 0 else temp.append(\"off\")\n+ temp.append(\"on\") if (caseDef & self.qinqCase) != 0 else temp.append(\"off\")\n if (self.nic in [\"cavium_a063\", \"cavium_a064\"]) and temp[2] == \"on\":\n ## Skip QinQ for cavium devices as it is not supported.\n return\n self.mode_config(strip=temp[0], filter=temp[1], extend=temp[2])\n \n- if (caseDef & txCase) != 0:\n+ if (caseDef & self.txCase) != 0:\n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n self.dut.send_expect(\n- \"tx_vlan set %s %s\" % (dutTxPortId, txvlan), \"testpmd> \"\n+ \"tx_vlan set %s %s\" % (dutTxPortId, self.txvlanId), \"testpmd> \"\n )\n self.dut.send_expect(\"port start all\", \"testpmd> \")\n self.dut.send_expect(\"start\", \"testpmd> \")\n@@ -259,27 +319,27 @@ class TestDualVlan(TestCase):\n temp[0],\n temp[1],\n temp[2],\n- \"on\" if (caseDef & txCase) != 0 else \"off\",\n+ \"on\" if (caseDef & self.txCase) != 0 else \"off\",\n )\n \n- if (caseDef & filterCase) != 0:\n+ if (caseDef & self.filterCase) != 0:\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n- self.vlan_send_packet(outvlan, invlan)\n- self.check_result(vlanCase[caseIndex][0], configMode + \" result Error\")\n+ self.vlan_send_packet(self.outvlanId, self.invlanId)\n+ self.check_result(self.vlanCase[caseIndex][0], configMode + \" result Error\")\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (invlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.invlanId, dutRxPortId), \"testpmd> \"\n )\n- self.vlan_send_packet(outvlan, invlan)\n- self.check_result(vlanCase[caseIndex][1], configMode + \" result Error\")\n+ self.vlan_send_packet(self.outvlanId, self.invlanId)\n+ self.check_result(self.vlanCase[caseIndex][1], configMode + \" result Error\")\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (invlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.invlanId, dutRxPortId), \"testpmd> \"\n )\n- if (caseDef & txCase) != 0:\n+ if (caseDef & self.txCase) != 0:\n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n self.dut.send_expect(\"tx_vlan reset %s\" % dutTxPortId, \"testpmd> \")\n@@ -288,24 +348,24 @@ class TestDualVlan(TestCase):\n \n else:\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (invlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.invlanId, dutRxPortId), \"testpmd> \"\n )\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n- self.vlan_send_packet(outvlan, invlan)\n- self.check_result(vlanCase[caseIndex], configMode + \" result Error\")\n- if (caseDef & txCase) != 0:\n+ self.vlan_send_packet(self.outvlanId, self.invlanId)\n+ self.check_result(self.vlanCase[caseIndex], configMode + \" result Error\")\n+ if (caseDef & self.txCase) != 0:\n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n self.dut.send_expect(\"tx_vlan reset %s\" % dutTxPortId, \"testpmd> \")\n self.dut.send_expect(\"port start all\", \"testpmd> \")\n self.dut.send_expect(\"start\", \"testpmd> \")\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (invlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.invlanId, dutRxPortId), \"testpmd> \"\n )\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n \n def check_result(self, resultKey, errorString):\n@@ -314,14 +374,15 @@ class TestDualVlan(TestCase):\n \"\"\"\n print((\"vlan flage config:%s\" % errorString))\n out = self.get_tcpdump_package()\n- if allResult[resultKey][0] == \"No\":\n+ if self.allResult[resultKey][0] == \"No\":\n self.verify(\"vlan\" not in out, errorString)\n else:\n resultList = []\n- for i in range(len(allResult[resultKey]) - 1):\n- resultList.append(\"vlan %s\" % allResult[resultKey][i])\n+ for i in range(len(self.allResult[resultKey]) - 1):\n+ resultList.append(\"vlan %s\" % self.allResult[resultKey][i])\n resultList.append(\n- \"vlan %s\" % allResult[resultKey][len(allResult[resultKey]) - 1]\n+ \"vlan %s\"\n+ % self.allResult[resultKey][len(self.allResult[resultKey]) - 1]\n )\n for line in resultList:\n self.verify(line in out, \"receive packet is wrong:%s\" % out)\n@@ -338,15 +399,24 @@ class TestDualVlan(TestCase):\n \"\"\"\n self.mode_config(filter=\"on\")\n self.mode_config(strip=\"off\")\n- self.mode_config(extend=\"off\")\n- self.vlan_send_packet(outvlan)\n+ # Because the kernel forces enable Qinq and cannot be closed,\n+ # the dpdk can only add 'extend on' to make the VLAN filter work normally.\n+ if self.kdriver == \"i40e\" and self.fwversion >= \"8.40\":\n+ self.mode_config(extend=\"on\")\n+ self.dut.send_expect(\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n+ )\n+ else:\n+ self.mode_config(extend=\"off\")\n+\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n print(out)\n self.verify(\n- out is not None and \"vlan %s\" % outvlan not in out,\n+ out is not None and \"vlan %s\" % self.outvlanId not in out,\n \"Vlan filter enable error: \" + out,\n )\n-\n+ self.logger.debug(self.nic)\n if self.nic not in [\n \"ICE_25G-E810C_SFP\",\n \"ICE_100G-E810C_QSFP\",\n@@ -359,18 +429,22 @@ class TestDualVlan(TestCase):\n \"I40E_10G-10G_BASE_T_X722\",\n ]:\n self.mode_config(filter=\"off\")\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % outvlan in out, \"Vlan filter disable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId in out, \"Vlan filter disable error: \" + out\n+ )\n else:\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % outvlan in out, \"Vlan filter disable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId in out, \"Vlan filter disable error: \" + out\n+ )\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n \n def test_vlan_filter_table(self):\n@@ -380,20 +454,28 @@ class TestDualVlan(TestCase):\n \n self.mode_config(filter=\"on\")\n self.mode_config(strip=\"off\")\n- self.mode_config(extend=\"off\")\n-\n- self.dut.send_expect(\"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \")\n- self.vlan_send_packet(outvlan)\n+ # Because the kernel forces enable Qinq and cannot be closed,\n+ # the dpdk can only add 'extend on' to make the VLAN filter work normally.\n+ if self.kdriver == \"i40e\" and self.fwversion >= \"8.40\":\n+ self.mode_config(extend=\"on\")\n+ else:\n+ self.mode_config(extend=\"off\")\n+ self.dut.send_expect(\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n+ )\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n self.verify(\n- \"vlan %s\" % outvlan in out, \"vlan filter table enable error: \" + out\n+ \"vlan %s\" % self.outvlanId in out, \"vlan filter table enable error: \" + out\n )\n \n- self.dut.send_expect(\"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \")\n- self.vlan_send_packet(outvlan)\n+ self.dut.send_expect(\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n+ )\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n self.verify(\n- out is not None and \"vlan %s\" % outvlan not in out,\n+ out is not None and \"vlan %s\" % self.outvlanId not in out,\n \"vlan filter table disable error: \" + out,\n )\n \n@@ -417,16 +499,20 @@ class TestDualVlan(TestCase):\n \"I40E_10G-10G_BASE_T_X722\",\n ]:\n self.dut.send_expect(\n- \"rx_vlan add %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % outvlan not in out, \"Vlan strip enable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId not in out, \"Vlan strip enable error: \" + out\n+ )\n \n self.mode_config(strip=\"off\")\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % outvlan in out, \"Vlan strip disable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId in out, \"Vlan strip disable error: \" + out\n+ )\n if self.nic in [\n \"ICE_25G-E810C_SFP\",\n \"ICE_100G-E810C_QSFP\",\n@@ -439,7 +525,7 @@ class TestDualVlan(TestCase):\n \"I40E_10G-10G_BASE_T_X722\",\n ]:\n self.dut.send_expect(\n- \"rx_vlan rm %s %s\" % (outvlan, dutRxPortId), \"testpmd> \"\n+ \"rx_vlan rm %s %s\" % (self.outvlanId, dutRxPortId), \"testpmd> \"\n )\n \n def test_vlan_stripq_config(self):\n@@ -450,23 +536,25 @@ class TestDualVlan(TestCase):\n self.mode_config(extend=\"off\")\n self.mode_config(strip=\"off\")\n self.mode_config(stripq=\"off\")\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n self.verify(\n- \"vlan %s\" % outvlan in out, \"vlan strip queue disable error : \" + out\n+ \"vlan %s\" % self.outvlanId in out, \"vlan strip queue disable error : \" + out\n )\n # if self.nic in [\"I40E_10G-SFP_XL710\", \"I40E_40G-QSFP_A\", \"I40E_40G-QSFP_B\"]:\n self.mode_config(strip=\"on\")\n self.mode_config(stripq=\"on\")\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % outvlan not in out, \"vlan strip enable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId not in out, \"vlan strip enable error: \" + out\n+ )\n \n self.mode_config(stripq=\"off\")\n- self.vlan_send_packet(outvlan)\n+ self.vlan_send_packet(self.outvlanId)\n out = self.get_tcpdump_package()\n self.verify(\n- \"vlan %s\" % outvlan in out, \"vlan strip queue disable error: \" + out\n+ \"vlan %s\" % self.outvlanId in out, \"vlan strip queue disable error: \" + out\n )\n \n def test_vlan_insert_config(self):\n@@ -482,13 +570,17 @@ class TestDualVlan(TestCase):\n \n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n- self.dut.send_expect(\"tx_vlan set %s %s\" % (dutTxPortId, txvlan), \"testpmd> \")\n+ self.dut.send_expect(\n+ \"tx_vlan set %s %s\" % (dutTxPortId, self.txvlanId), \"testpmd> \"\n+ )\n self.dut.send_expect(\"port start all\", \"testpmd> \")\n self.dut.send_expect(\"start\", \"testpmd> \")\n \n self.vlan_send_packet()\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % txvlan in out, \"vlan insert enable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.txvlanId in out, \"vlan insert enable error: \" + out\n+ )\n \n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n@@ -498,7 +590,9 @@ class TestDualVlan(TestCase):\n \n self.vlan_send_packet()\n out = self.get_tcpdump_package()\n- self.verify(\"vlan %s\" % txvlan not in out, \"vlan insert disable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.txvlanId not in out, \"vlan insert disable error: \" + out\n+ )\n \n def test_vlan_tpid_config(self):\n \"\"\"\n@@ -517,23 +611,40 @@ class TestDualVlan(TestCase):\n )\n \n self.mode_config(filter=\"on\", strip=\"on\", extend=\"on\")\n+ # i40e set VLAN id\n+ self.dut.send_expect(\n+ \"rx_vlan add %s %s\" % (self.outvlanId, dutRxPortId),\n+ \"testpmd> \",\n+ )\n # nic only support inner model, except Intel® Ethernet 700 Series nic\n self.dut.send_expect(\"vlan set inner tpid 0x1234 %s\" % dutRxPortId, \"testpmd> \")\n- self.vlan_send_packet(outvlan, invlan)\n+ self.vlan_send_packet(self.outvlanId, self.invlanId)\n \n out = self.get_tcpdump_package()\n self.verify(\"0x8100\" in out, \"tpid is error: \" + out)\n- self.verify(\"vlan %s\" % outvlan in out, \"vlan tpid disable error: \" + out)\n- self.verify(\"vlan %s\" % invlan in out, \"vlan tpid disable error: \" + out)\n+ self.verify(\n+ \"vlan %s\" % self.outvlanId in out, \"vlan tpid disable error: \" + out\n+ )\n+ self.verify(\"vlan %s\" % self.invlanId in out, \"vlan tpid disable error: \" + out)\n \n self.dut.send_expect(\"vlan set inner tpid 0x8100 %s\" % dutRxPortId, \"testpmd> \")\n- self.vlan_send_packet(outvlan, invlan)\n+ self.vlan_send_packet(self.outvlanId, self.invlanId)\n \n out = self.get_tcpdump_package()\n- self.verify(\"0x8100\" in out, \"tpid is error: \" + out)\n- self.verify(\n- out is not None and \"vlan\" not in out, \"vlane tpid enable error: \" + out\n- )\n+ # Because the kernel forces enable Qinq and cannot be closed,\n+ # the dpdk can only add 'extend on' to make the VLAN filter work normally.\n+ # The kernel driver uses the outer VLAN filter, and the DPDK synchronously modifies,\n+ # DPDK filter outer VLAN when firmware >= 8.4, the test result check strip inner.\n+ if self.kdriver == \"i40e\" and self.fwversion >= \"8.40\":\n+ self.verify(\"0x8100\" in out, \"tpid is error: \" + out)\n+ self.verify(\n+ out is not None and f\"vlan {self.invlanId}\" not in out,\n+ \"vlane tpid enable error: \" + out,\n+ )\n+ else:\n+ self.verify(\n+ out is not None and \"vlan\" not in out, \"vlane tpid enable error: \" + out\n+ )\n \n def test_vlan_synthetic_test(self):\n \"\"\"\n@@ -542,7 +653,7 @@ class TestDualVlan(TestCase):\n self.verify(\n self.nic != \"IGB_1G-82574L\", \"sorry, dual vlan cannot support this self.nic\"\n )\n- for i in range(len(vlanCase)):\n+ for i in range(len(self.vlanCase)):\n self.multimode_test(i)\n \n def test_vlan_random_test(self):\n", "prefixes": [ "V4", "2/8" ] }