Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94213/?format=api
{ "id": 94213, "url": "https://patches.dpdk.org/api/patches/94213/?format=api", "web_url": "https://patches.dpdk.org/project/dts/patch/20210615104613.14658-6-junx.dong@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": "<20210615104613.14658-6-junx.dong@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20210615104613.14658-6-junx.dong@intel.com", "date": "2021-06-15T10:46:13", "name": "[V1,6/6] tests/*: update test suits after removed fm10k", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c5565f140ffba8b0e0998a7de5ea7d180c7e6fca", "submitter": { "id": 2237, "url": "https://patches.dpdk.org/api/people/2237/?format=api", "name": "Jun Dong", "email": "junx.dong@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dts/patch/20210615104613.14658-6-junx.dong@intel.com/mbox/", "series": [ { "id": 17333, "url": "https://patches.dpdk.org/api/series/17333/?format=api", "web_url": "https://patches.dpdk.org/project/dts/list/?series=17333", "date": "2021-06-15T10:46:08", "name": "[V1,1/6] dts/*: remove fm10k related modules and patch", "version": 1, "mbox": "https://patches.dpdk.org/series/17333/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94213/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/94213/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 69A2BA0C47;\n\tTue, 15 Jun 2021 12:46:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6287B4067E;\n\tTue, 15 Jun 2021 12:46:41 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by mails.dpdk.org (Postfix) with ESMTP id 2DD9F41137\n for <dts@dpdk.org>; Tue, 15 Jun 2021 12:46:39 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 Jun 2021 03:46:38 -0700", "from unknown (HELO localhost.localdomain.sh.intel.com)\n ([10.240.182.57])\n by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 Jun 2021 03:46:36 -0700" ], "IronPort-SDR": [ "\n q4xSWCH7DglvuAzp5eUVDzSMvZovLSVA8FaO5jxXgKkQOVQjyu9mwTzkiLMkBjfKjTj0OiV5zM\n sHGbxnL+nkig==", "\n WEgSVcSlQ0yQZB26kKQ3C6qk8goE1HjoM/f7A4x8ARKX3TJY9dQcX+v2vTptzKRadnjRcbqmSW\n DOnHvg0PWwIw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10015\"; a=\"291598503\"", "E=Sophos;i=\"5.83,275,1616482800\"; d=\"scan'208\";a=\"291598503\"", "E=Sophos;i=\"5.83,275,1616482800\"; d=\"scan'208\";a=\"484428221\"" ], "From": "Jun Dong <junx.dong@intel.com>", "To": "junx.dong@intel.com", "Cc": "dts@dpdk.org", "Date": "Tue, 15 Jun 2021 18:46:13 +0800", "Message-Id": "<20210615104613.14658-6-junx.dong@intel.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210615104613.14658-1-junx.dong@intel.com>", "References": "<20210615104613.14658-1-junx.dong@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dts] [PATCH V1 6/6] tests/*: update test suits after removed fm10k", "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", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "1. update TestSuit_jumboframes,remove fm10k related conditional branch. \n 2. update TestSuit_pmdrss_hash,remove fm10k related conditional branch. \n 3. update TestSuit_pmdrssreta,remove fm10k related conditional branch. \n 4. update TestSuite_rss_key_update,remove fm10k conditional branch. \n 5. update TestSuite_scatter,remove fm10k conditional branch. \n 6. update TestSuite_shutdown_api,remove fm10k conditional branch. \n 7. update TestSuite_vf_offload,remove fm10k conditional branch. \n 8. update TestSuite_vf_rss,remove fm10k conditional branch. \n 9. update TestSuite_vlan, remove fm10k conditional branch. \n 10. update TestSuite_vlan_ethertype_config,remove fm10k conditional branch.\n\nSigned-off-by: Jun Dong <junx.dong@intel.com>\n---\n tests/TestSuite_jumboframes.py | 10 -------\n tests/TestSuite_pmdrss_hash.py | 16 +++--------\n tests/TestSuite_pmdrssreta.py | 6 ++--\n tests/TestSuite_rss_key_update.py | 16 ++++-------\n tests/TestSuite_scatter.py | 10 ++-----\n tests/TestSuite_shutdown_api.py | 35 ++++--------------------\n tests/TestSuite_vf_offload.py | 4 ---\n tests/TestSuite_vf_rss.py | 19 ++++---------\n tests/TestSuite_vlan.py | 22 ---------------\n tests/TestSuite_vlan_ethertype_config.py | 13 ---------\n 10 files changed, 24 insertions(+), 127 deletions(-)", "diff": "diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py\nindex 181908d2..e277bace 100644\n--- a/tests/TestSuite_jumboframes.py\n+++ b/tests/TestSuite_jumboframes.py\n@@ -126,12 +126,6 @@ class TestJumboframes(TestCase):\n \n self.port_mask = utils.create_mask([self.rx_port, self.tx_port])\n \n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[self.tx_port]['port']\n- netobj.enable_jumbo(framesize = ETHER_JUMBO_FRAME_MTU)\n- netobj = self.dut.ports_info[self.rx_port]['port']\n- netobj.enable_jumbo(framesize = ETHER_JUMBO_FRAME_MTU)\n-\n self.tester.send_expect(\"ifconfig %s mtu %s\" % (self.tester.get_interface(self.tester.get_local_port(self.rx_port)), ETHER_JUMBO_FRAME_MTU + 200), \"# \")\n \n self.pmdout = PmdOutput(self.dut)\n@@ -162,10 +156,6 @@ class TestJumboframes(TestCase):\n This case aims to test transmitting jumbo frame packet on testpmd without\n jumbo frame support.\n \"\"\"\n- # RRC has no ability to set the max pkt len to hardware\n- if self.kdriver == \"fm10k\":\n- print(utils.RED(\"fm10k not support this case\\n\"))\n- return\n self.pmdout.start_testpmd(\"Default\", \"--max-pkt-len=%d --port-topology=loop --tx-offloads=0x8000\" % (ETHER_STANDARD_MTU))\n self.dut.send_expect(\"set fwd mac\", \"testpmd> \")\n self.dut.send_expect(\"start\", \"testpmd> \")\ndiff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py\nindex 54c0a89d..9ea6f9ae 100644\n--- a/tests/TestSuite_pmdrss_hash.py\n+++ b/tests/TestSuite_pmdrss_hash.py\n@@ -414,8 +414,7 @@ class TestPmdrssHash(TestCase):\n \"\"\"\n \n self.verify(self.nic in [\"columbiaville_25g\", \"columbiaville_100g\",\"fortville_eagle\", \"fortville_spirit\",\n- \"fortville_spirit_single\", \"redrockcanyou\", \"atwood\",\n- \"boulderrapid\", \"fortpark_TLV\", \"fortpark_BASE-T\",\"fortville_25g\", \"niantic\", \"carlsville\", \"foxville\"],\n+ \"fortville_spirit_single\", \"fortpark_TLV\", \"fortpark_BASE-T\",\"fortville_25g\", \"niantic\", \"carlsville\", \"foxville\"],\n \"NIC Unsupported: \" + str(self.nic))\n global reta_num\n global iptypes\n@@ -436,13 +435,11 @@ class TestPmdrssHash(TestCase):\n 'ipv6-tcp': 'tcp',\n 'ipv6-frag': 'ip'\n }\n- elif self.nic in [\"redrockcanyou\", \"atwood\", \"boulderrapid\"]:\n- reta_num = 128\n else:\n self.verify(False, \"NIC Unsupported:%s\" % str(self.nic))\n ports = self.dut.get_ports(self.nic)\n self.verify(len(ports) >= 1, \"Not enough ports available\")\n- self.path=self.dut.apps_name['test-pmd']\n+ self.path = self.dut.apps_name['test-pmd']\n \n def set_up(self):\n \"\"\"\n@@ -543,10 +540,6 @@ class TestPmdrssHash(TestCase):\n global reta_num\n global iptypes\n \n- if self.kdriver in [\"fm10k\"]:\n- iptypes.pop('ipv4-sctp')\n- iptypes.pop('ipv6-sctp')\n-\n self.dut.kill_all()\n \n # test with different rss queues\n@@ -564,9 +557,8 @@ class TestPmdrssHash(TestCase):\n \n self.dut.send_expect(\"port stop all\", \"testpmd> \")\n # some nic not support change hash algorithm\n- if self.kdriver not in [\"fm10k\"]:\n- self.dut.send_expect(\n- \"set_hash_global_config 0 simple_xor %s enable\" % iptype, \"testpmd> \")\n+ self.dut.send_expect(\n+ \"set_hash_global_config 0 simple_xor %s enable\" % iptype, \"testpmd> \")\n self.dut.send_expect(\"port start all\", \"testpmd> \")\n out = self.dut.send_expect(\n \"port config all rss %s\" % rsstype, \"testpmd> \")\ndiff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py\nindex 4dd3a5a5..ce3ee421 100644\n--- a/tests/TestSuite_pmdrssreta.py\n+++ b/tests/TestSuite_pmdrssreta.py\n@@ -154,7 +154,7 @@ class TestPmdrssreta(TestCase):\n hash_index = int(tmp_reta_line[\"RSS hash\"], 16) % 64\n elif(self.nic in [\"hi1822\"]):\n hash_index = int(tmp_reta_line[\"RSS hash\"], 16) % 256\n- elif (self.nic in [\"niantic\", \"redrockcanyou\", \"atwood\", \"boulderrapid\", \"foxville\", \"twinpond\"]):\n+ elif (self.nic in [\"niantic\", \"foxville\", \"twinpond\"]):\n # compute the hash result of five tuple into the 7 LSBs value.\n hash_index = int(tmp_reta_line[\"RSS hash\"], 16) % 128\n else:\n@@ -239,7 +239,7 @@ class TestPmdrssreta(TestCase):\n reta_entries.insert(i, random.randint(0, queue - 1))\n self.dut.send_expect(\n \"port config 0 rss reta (%d,%d)\" % (i, reta_entries[i]), \"testpmd> \")\n- elif (self.nic in [\"niantic\", \"redrockcanyou\", \"atwood\", \"boulderrapid\", \"foxville\"]):\n+ elif (self.nic in [\"niantic\", \"foxville\"]):\n for i in range(128):\n reta_entries.insert(i, random.randint(0, queue - 1))\n self.dut.send_expect(\n@@ -255,7 +255,7 @@ class TestPmdrssreta(TestCase):\n self.dut.send_expect(\"quit\", \"# \", 30)\n \n def test_rss_key_size(self):\n- nic_rss_key_size = {\"columbiaville_25g\": 52, \"columbiaville_100g\": 52, \"fortville_eagle\": 52, \"fortville_spirit\": 52, \"fortville_spirit_single\": 52, \"fortville_25g\": 52, \"niantic\": 40, \"e1000\": 40, \"redrockcanyou\": 40, \"atwood\": 40, \"boulderrapid\": 40, \"fortpark_TLV\": 52,\"fortpark_BASE-T\": 52, \"hi1822\": 40, \"cavium_a063\": 48, \"cavium_a064\": 48, \"carlsville\": 52, \"sagepond\": 40, \"sageville\": 40, \"foxville\": 40, \"twinpond\": 40}\n+ nic_rss_key_size = {\"columbiaville_25g\": 52, \"columbiaville_100g\": 52, \"fortville_eagle\": 52, \"fortville_spirit\": 52, \"fortville_spirit_single\": 52, \"fortville_25g\": 52, \"niantic\": 40, \"e1000\": 40, \"fortpark_TLV\": 52,\"fortpark_BASE-T\": 52, \"hi1822\": 40, \"cavium_a063\": 48, \"cavium_a064\": 48, \"carlsville\": 52, \"sagepond\": 40, \"sageville\": 40, \"foxville\": 40, \"twinpond\": 40}\n self.verify(self.nic in list(nic_rss_key_size.keys()), \"Not supporte rss key on %s\" % self.nic)\n \n dutPorts = self.dut.get_ports(self.nic)\ndiff --git a/tests/TestSuite_rss_key_update.py b/tests/TestSuite_rss_key_update.py\nindex 4a9e3d83..f74641cb 100644\n--- a/tests/TestSuite_rss_key_update.py\n+++ b/tests/TestSuite_rss_key_update.py\n@@ -171,8 +171,7 @@ class TestRssKeyUpdate(TestCase):\n \"\"\"\n \n self.verify(self.nic in [\"columbiaville_25g\", \"columbiaville_100g\", \"fortville_eagle\", \"fortville_spirit\",\n- \"fortville_spirit_single\", \"redrockcanyou\", \"atwood\",\n- \"boulderrapid\", \"fortpark_TLV\", \"fortpark_BASE-T\", \"fortville_25g\", \"niantic\",\n+ \"fortville_spirit_single\", \"fortpark_TLV\", \"fortpark_BASE-T\", \"fortville_25g\", \"niantic\",\n \"carlsville\", \"foxville\"],\n \"NIC Unsupported: \" + str(self.nic))\n global reta_num\n@@ -195,8 +194,6 @@ class TestRssKeyUpdate(TestCase):\n 'ipv6-tcp': 'tcp',\n 'ipv6-frag': 'ip'\n }\n- elif self.nic in [\"redrockcanyou\", \"atwood\", \"boulderrapid\"]:\n- reta_num = 128\n else:\n self.verify(False, f\"NIC Unsupported: {self.nic}\")\n \n@@ -301,13 +298,10 @@ class TestRssKeyUpdate(TestCase):\n def test_set_hash_key_short_long(self):\n \n nic_rss_key_size = {\"columbiaville_25g\": 52, \"columbiaville_100g\": 52, \"fortville_eagle\": 52,\n- \"fortville_spirit\": 52,\n- \"fortville_spirit_single\": 52, \"fortville_25g\": 52, \"niantic\": 40, \"e1000\": 40,\n- \"redrockcanyou\": 40,\n- \"atwood\": 40, \"boulderrapid\": 40, \"fortpark_TLV\": 52, \"fortpark_BASE-T\": 52, \"hi1822\": 40,\n- \"cavium_a063\": 48,\n- \"cavium_a064\": 48, \"carlsville\": 52, \"sagepond\": 40, \"sageville\": 40, \"foxville\": 40,\n- \"twinpond\": 40}\n+ \"fortville_spirit\": 52, \"fortville_spirit_single\": 52, \"fortville_25g\": 52,\n+ \"niantic\": 40, \"e1000\": 40, \"fortpark_TLV\": 52, \"fortpark_BASE-T\": 52,\n+ \"hi1822\": 40, \"cavium_a063\": 48, \"cavium_a064\": 48, \"carlsville\": 52,\n+ \"sagepond\": 40, \"sageville\": 40, \"foxville\": 40, \"twinpond\": 40}\n \n self.verify(self.nic in list(nic_rss_key_size.keys()), f\"Not supported rss key on {self.nic}\")\n \ndiff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py\nindex 525ecfeb..2049f357 100644\n--- a/tests/TestSuite_scatter.py\n+++ b/tests/TestSuite_scatter.py\n@@ -65,15 +65,12 @@ class TestScatter(TestCase):\n self.pmdout = PmdOutput(self.dut)\n if self.nic in [\"magnolia_park\", \"niantic\", \"sageville\", \"fortpark\", \"fortville_eagle\",\n \"fortville_spirit\", \"fortville_spirit_single\", \"fortville_25g\", \"x722_37d2\",\n- \"redrockcanyou\", \"atwood\", \"boulderrapid\",\n- \"ironpond\", \"twinpond\", \"springfountain\", \"fortpark_TLV\",\"fortpark_BASE-T\", \"sagepond\", \"carlsville\",\"columbiaville_25g\",\"columbiaville_100g\"]:\n+ \"ironpond\", \"twinpond\", \"springfountain\", \"fortpark_TLV\",\"fortpark_BASE-T\",\n+ \"sagepond\", \"carlsville\",\"columbiaville_25g\",\"columbiaville_100g\"]:\n self.mbsize = 2048\n else:\n self.mbsize = 1024\n \n- if self.kdriver == \"fm10k\":\n- self.dut.ports_info[self.port]['port'].enable_jumbo(framesize=9000)\n-\n self.tester.send_expect(\"ifconfig %s mtu 9000\" % self.intf, \"#\")\n \n def scatter_pktgen_send_packet(self, pktsize):\n@@ -130,7 +127,4 @@ class TestScatter(TestCase):\n \"\"\"\n Run after each test suite.\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- self.dut.ports_info[self.port]['port'].enable_jumbo(framesize=1518)\n self.tester.send_expect(\"ifconfig %s mtu 1500\" % self.intf, \"#\")\n- pass\ndiff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py\nindex 03eb89ab..3810b53a 100644\n--- a/tests/TestSuite_shutdown_api.py\n+++ b/tests/TestSuite_shutdown_api.py\n@@ -157,21 +157,12 @@ class TestShutdownApi(TestCase):\n rx_bytes_exp = pktSize*4\n tx_bytes_exp = pktSize*4\n \n- if self.kdriver == \"fm10k\":\n- # RRC will always strip rx/tx crc\n- rx_bytes_exp -= 4\n- tx_bytes_exp -= 4\n- if vlan_strip is True:\n- # RRC will always strip rx/tx vlan\n- rx_bytes_exp -= 4\n- tx_bytes_exp -= 4\n- else:\n- # some NIC will always include tx crc\n- rx_bytes_exp -= 16\n+ # The NIC will always include tx crc\n+ rx_bytes_exp -= 16\n+ tx_bytes_exp -= 16\n+ if vlan_strip is True:\n+ # vlan strip default is off\n tx_bytes_exp -= 16\n- if vlan_strip is True:\n- # vlan strip default is off\n- tx_bytes_exp -= 16\n \n # fortville nic enable send lldp packet function when port setup\n # now the tx-packets size is lldp_size(110) * n + forward packe size\n@@ -188,10 +179,6 @@ class TestShutdownApi(TestCase):\n \"\"\"\n Check link status of the ports.\n \"\"\"\n- # RRC not support link speed change\n- if self.kdriver == \"fm10k\":\n- return\n-\n for port in self.ports:\n out = self.tester.send_expect(\n \"ethtool %s\" % self.tester.get_interface(self.tester.get_local_port(port)), \"# \")\n@@ -475,10 +462,6 @@ class TestShutdownApi(TestCase):\n \"\"\"\n Change Link Speed.\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- print((utils.RED(\"RRC not support\\n\")))\n- return\n-\n self.pmdout.start_testpmd(\"Default\", \"--portmask=%s --port-topology=loop\" % utils.create_mask(self.ports), socket=self.ports_socket)\n self.dut.send_expect(\"set promisc all off\", \"testpmd>\")\n \n@@ -598,10 +581,6 @@ class TestShutdownApi(TestCase):\n \"\"\"\n Enable/Disable Jumbo Frames.\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- print((utils.RED(\"RRC not support\\n\")))\n- return\n-\n jumbo_size = 2048\n self.pmdout.start_testpmd(\"Default\", \"--portmask=%s --port-topology=loop\" % utils.create_mask(self.ports), socket=self.ports_socket)\n self.dut.send_expect(\"set promisc all off\", \"testpmd>\")\n@@ -779,10 +758,6 @@ class TestShutdownApi(TestCase):\n \"\"\"\n port link stats test\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- print((utils.RED(\"RRC not support\\n\")))\n- return\n-\n self.pmdout.start_testpmd(\"Default\", \"--portmask=%s --port-topology=loop\" % utils.create_mask(self.ports), socket=self.ports_socket)\n self.dut.send_expect(\"set promisc all off\", \"testpmd>\")\n self.dut.send_expect(\"set fwd mac\", \"testpmd>\")\ndiff --git a/tests/TestSuite_vf_offload.py b/tests/TestSuite_vf_offload.py\nindex b819c6c5..4a16134b 100644\n--- a/tests/TestSuite_vf_offload.py\n+++ b/tests/TestSuite_vf_offload.py\n@@ -264,10 +264,6 @@ class TestVfOffload(TestCase):\n 'IPv6/UDP': 'Ether(dst=\"02:00:00:00:00:00\", src=\"%s\")/IPv6(src=\"%s\")/UDP()/(\"X\"*46)' % (mac, expIPv6),\n 'IPv6/TCP': 'Ether(dst=\"02:00:00:00:00:00\", src=\"%s\")/IPv6(src=\"%s\")/TCP()/(\"X\"*46)' % (mac, expIPv6)}\n \n- if self.nic in ['redrockcanyou', 'atwood']:\n- del pkts['IP/SCTP']\n- del pkts_ref['IP/SCTP']\n-\n self.checksum_enablehw(0,self.vm_dut_0)\n \n self.vm0_testpmd.execute_cmd('start')\ndiff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py\nindex 35d4ea2e..4e48163b 100644\n--- a/tests/TestSuite_vf_rss.py\n+++ b/tests/TestSuite_vf_rss.py\n@@ -204,10 +204,7 @@ class TestVfRss(TestCase):\n self.verify(len(reta_lines) > 0, \"The testpmd output has no RSS hash!\")\n for tmp_reta_line in reta_lines:\n status = \"false\"\n- if self.kdriver == \"fm10k\":\n- # compute the hash result of five tuple into the 7 LSBs value.\n- hash_index = int(tmp_reta_line[\"RSS hash\"], 16) % 128\n- elif self.kdriver == 'i40e' or self.kdriver == 'ice' or self.nic in ['sageville', 'sagepond']:\n+ if self.kdriver == 'i40e' or self.kdriver == 'ice' or self.nic in ['sageville', 'sagepond']:\n # compute the hash result of five tuple into the 7 LSBs value.\n hash_index = int(tmp_reta_line[\"RSS hash\"], 16) % 64\n else:\n@@ -233,9 +230,9 @@ class TestVfRss(TestCase):\n \"\"\"\n \n self.verify(\n- self.nic in [\"redrockcanyou\", \"atwood\", \"boulderrapid\", \"fortville_eagle\", \"fortville_spirit\",\n- \"fortville_spirit_single\", \"fortville_25g\", \"sageville\", \"sagepond\", \"fortpark_TLV\",\n- \"fortpark_BASE-T\", \"carlsville\", \"columbiaville_25g\", \"columbiaville_100g\"],\n+ self.nic in [\"fortville_eagle\", \"fortville_spirit\", \"fortville_spirit_single\", \"fortville_25g\",\n+ \"sageville\", \"sagepond\", \"fortpark_TLV\",\"fortpark_BASE-T\", \"carlsville\",\n+ \"columbiaville_25g\", \"columbiaville_100g\"],\n \"NIC Unsupported: \" + str(self.nic))\n self.dut_ports = self.dut.get_ports(self.nic)\n self.verify(len(self.dut_ports) >= 1, \"Not enough ports available\")\n@@ -358,13 +355,7 @@ class TestVfRss(TestCase):\n \"set nbcore %d\" % (queue + 1), \"testpmd> \")\n \n # configure the reta with specific mappings.\n- if self.nic in [\"redrockcanyou\", \"atwood\", \"boulderrapid\"]:\n- for i in range(128):\n- reta_entries.insert(i, random.randint(0, queue - 1))\n- self.vm_dut_0.send_expect(\n- \"port config 0 rss reta (%d,%d)\" % (i, reta_entries[i]), \"testpmd> \")\n- self.vm_dut_0.send_expect(\"port config all rss %s\" % rss_type, \"testpmd> \")\n- elif self.kdriver == 'i40e' or self.kdriver == 'ice' or self.nic in ['sageville', 'sagepond']:\n+ if self.kdriver == 'i40e' or self.kdriver == 'ice' or self.nic in ['sageville', 'sagepond']:\n if self.nic in ['sageville', 'sagepond'] and rss_type == 'sctp':\n self.logger.info('sageville and sagepond do not support rsstype sctp')\n continue\ndiff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py\nindex 95e8cffa..c1c09ee0 100644\n--- a/tests/TestSuite_vlan.py\n+++ b/tests/TestSuite_vlan.py\n@@ -79,10 +79,6 @@ class TestVlan(TestCase):\n self.dut.send_expect(\"vlan set strip off %s\" % dutRxPortId, \"testpmd> \")\n self.vlan = 51\n \n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[dutRxPortId]['port']\n- netobj.add_vlan(vlan_id = self.vlan)\n-\n def get_tcpdump_package(self):\n pkts = self.tester.load_tcpdump_sniff_packets(self.inst)\n vlans = []\n@@ -128,10 +124,6 @@ class TestVlan(TestCase):\n \"\"\"\n Enable receipt of VLAN packets and strip off\n \"\"\"\n-\n- if self.kdriver == \"fm10k\":\n- print((utils.RED(\"fm10k not support this case\\n\")))\n- return\n self.dut.send_expect(\"rx_vlan add %d %s\" % (self.vlan, dutRxPortId), \"testpmd> \")\n self.dut.send_expect(\"vlan set strip off %s\" % dutRxPortId, \"testpmd> \")\n self.dut.send_expect(\"start\", \"testpmd> \", 120)\n@@ -183,11 +175,6 @@ class TestVlan(TestCase):\n \"\"\"\n Enable VLAN header insertion in transmitted packets\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[dutTxPortId]['port']\n- netobj.add_vlan(vlan_id = self.vlan)\n- netobj.add_txvlan(vlan_id = self.vlan)\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 %d\" % (dutTxPortId, self.vlan), \"testpmd> \")\n@@ -204,11 +191,6 @@ class TestVlan(TestCase):\n self.dut.send_expect(\"port start all\", \"testpmd> \")\n self.dut.send_expect(\"stop\", \"testpmd> \", 30)\n \n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[dutTxPortId]['port']\n- # not delete vlan for self.vlan will used later\n- netobj.delete_txvlan(vlan_id = self.vlan)\n-\n def tear_down(self):\n \"\"\"\n Run after each test case.\n@@ -220,7 +202,3 @@ class TestVlan(TestCase):\n Run after each test suite.\n \"\"\"\n self.dut.kill_all()\n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[dutRxPortId]['port']\n- netobj.delete_txvlan(vlan_id = self.vlan)\n- netobj.delete_vlan(vlan_id = self.vlan)\ndiff --git a/tests/TestSuite_vlan_ethertype_config.py b/tests/TestSuite_vlan_ethertype_config.py\nindex c31f585a..514bdd1f 100644\n--- a/tests/TestSuite_vlan_ethertype_config.py\n+++ b/tests/TestSuite_vlan_ethertype_config.py\n@@ -165,9 +165,6 @@ class TestVlanEthertypeConfig(TestCase):\n \"\"\"\n Test Case 1: change VLAN TPID\n \"\"\"\n- if self.kdriver == \"fm10k\":\n- print((dts.RED(\"fm10k not support this case\\n\")))\n- return\n random_vlan = random.randint(1, MAX_VLAN - 1)\n self.dut.send_expect(\"set fwd rxonly\", \"testpmd> \")\n self.dut.send_expect(\"set verbose 1\", \"testpmd> \")\n@@ -324,12 +321,6 @@ class TestVlanEthertypeConfig(TestCase):\n vlan_string = str(\"%04x\" % tpid) + str(\"%04x\" % tx_vlan)\n self.verify(vlan_string not in out, \"Wrong vlan:\" + str(out))\n \n- if self.kdriver == \"fm10k\":\n- for tx_vlan in tx_vlans:\n- netobj = self.dut.ports_info[dutTxPortId]['port']\n- # not delete vlan for self.vlan will used later\n- netobj.delete_txvlan(vlan_id=tx_vlan)\n-\n def test_vlan_qinq_tpid(self):\n \"\"\"\n Test Case 6: Change S-Tag and C-Tag within QinQ\n@@ -377,7 +368,3 @@ class TestVlanEthertypeConfig(TestCase):\n Run after each test suite.\n \"\"\"\n self.dut.kill_all()\n- if self.kdriver == \"fm10k\":\n- netobj = self.dut.ports_info[dutRxPortId]['port']\n- netobj.delete_txvlan(vlan_id=self.vlan)\n- netobj.delete_vlan(vlan_id=self.vlan)\n", "prefixes": [ "V1", "6/6" ] }