Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104786/?format=api
{ "id": 104786, "url": "http://patchwork.dpdk.org/api/patches/104786/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/patch/20211201143152.20775-3-hailinx.xu@intel.com/", "project": { "id": 3, "url": "http://patchwork.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": "<20211201143152.20775-3-hailinx.xu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20211201143152.20775-3-hailinx.xu@intel.com", "date": "2021-12-01T14:31:51", "name": "[v4,2/3] tests/cvl_rss_configure: change test case", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9ec4b56dee3e9df287e686e19ab79709babf6893", "submitter": { "id": 1704, "url": "http://patchwork.dpdk.org/api/people/1704/?format=api", "name": "hailinx", "email": "hailinx.xu@intel.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dts/patch/20211201143152.20775-3-hailinx.xu@intel.com/mbox/", "series": [ { "id": 20821, "url": "http://patchwork.dpdk.org/api/series/20821/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/list/?series=20821", "date": "2021-12-01T14:31:49", "name": "change test plan and test cases", "version": 4, "mbox": "http://patchwork.dpdk.org/series/20821/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104786/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/104786/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 8F375A0C4C;\n\tWed, 1 Dec 2021 08:02:11 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 826C04120A;\n\tWed, 1 Dec 2021 08:02:11 +0100 (CET)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by mails.dpdk.org (Postfix) with ESMTP id 628E94067B\n for <dts@dpdk.org>; Wed, 1 Dec 2021 08:02:09 +0100 (CET)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 30 Nov 2021 23:02:08 -0800", "from unknown (HELO localhost.localdomain) ([10.240.183.55])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 30 Nov 2021 23:02:05 -0800" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10184\"; a=\"235127496\"", "E=Sophos;i=\"5.87,278,1631602800\"; d=\"scan'208\";a=\"235127496\"", "E=Sophos;i=\"5.87,278,1631602800\"; d=\"scan'208\";a=\"512567660\"" ], "From": "Hailin Xu <hailinx.xu@intel.com>", "To": "dts@dpdk.org,\n\tqi.fu@intel.com", "Cc": "Hailin Xu <hailinx.xu@intel.com>", "Subject": "[dts][PATCH v4 2/3] tests/cvl_rss_configure: change test case", "Date": "Wed, 1 Dec 2021 22:31:51 +0800", "Message-Id": "<20211201143152.20775-3-hailinx.xu@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20211201143152.20775-1-hailinx.xu@intel.com>", "References": "<20211201143152.20775-1-hailinx.xu@intel.com>", "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": "1. Change code to support rss common interface and adapt to test plan.\n2. Change packet checkpoint from queue to hash value.\n\nSigned-off-by: Hailin Xu <hailinx.xu@intel.com>\n---\n tests/TestSuite_cvl_rss_configure.py | 437 +++++++++++++--------------\n 1 file changed, 211 insertions(+), 226 deletions(-)", "diff": "diff --git a/tests/TestSuite_cvl_rss_configure.py b/tests/TestSuite_cvl_rss_configure.py\nindex 1c4ffbfc..e0dbd420 100644\n--- a/tests/TestSuite_cvl_rss_configure.py\n+++ b/tests/TestSuite_cvl_rss_configure.py\n@@ -29,166 +29,192 @@\n # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n-import json\n-import os\n-import re\n import time\n-from collections import OrderedDict\n-\n-from scapy.contrib.gtp import *\n-\n-import framework.packet as packet\n-import tests.rte_flow_common as rfc\n-from framework.packet import IncreaseIP, IncreaseIPv6\n-from framework.pmd_output import PmdOutput\n from framework.test_case import TestCase\n-from framework.utils import BLUE, RED\n-\n-out = os.popen(\"pip list|grep scapy \")\n-version_result =out.read()\n-p=re.compile('scapy\\s+2\\.3\\.\\d+')\n-m=p.search(version_result)\n-\n-tv_mac_ip_ipv4 = {\n- \"name\":\"tv_mac_ip_ipv4\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.%d\", dst=\"192.168.0.%d\")/(\"X\"*480)' %(i, i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ip_ipv6 = {\n- \"name\":\"tv_mac_ip_ipv6\",\n- \"scapy_str\": ['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::%d\", dst=\"2001::%d\")/(\"X\"*480)' %(i, i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv4_udp_l3_random = {\n- \"name\":\"tv_mac_ipv4_udp_l3_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.%d\", dst=\"192.168.0.%d\")/UDP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv4_udp_l4_random = {\n- \"name\":\"tv_mac_ipv4_udp_l4_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP()/UDP(sport=%d, dport=%d)/(\"X\"*480)' %(i+50,i+55) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv6_udp_l3_random = {\n- \"name\":\"tv_mac_ipv6_udp_l3_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::%d\", dst=\"2001::%d\")/UDP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv6_udp_l4_random = {\n- \"name\":\"tv_mac_ipv6_udp_l4_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IPv6()/UDP(sport=%d, dport=%d)/(\"X\"*480)' %(i+50,i+55) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv4_tcp_l3_random = {\n- \"name\":\"tv_mac_ipv4_tcp_l3_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.%d\", dst=\"192.168.0.%d\")/TCP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv4_tcp_l4_random = {\n- \"name\":\"tv_mac_ipv4_tcp_l4_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP()/TCP(sport=%d, dport=%d)/(\"X\"*480)' %(i+50,i+55) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n-}\n-\n-tv_mac_ipv6_tcp_l3_random = {\n- \"name\":\"tv_mac_ipv6_tcp_l3_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::%d\", dst=\"2001::%d\")/TCP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n+from framework.pmd_output import PmdOutput\n+from framework import packet\n+from .rte_flow_common import RssProcessing\n+\n+mac_ipv4_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/(\"X\"*480)'\n+mac_ipv6_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/(\"X\"*480)'\n+mac_ipv4_tcp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/TCP(sport=1026, dport=1027)/(\"X\"*480)'\n+mac_ipv6_tcp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/TCP(sport=1026, dport=1027)/(\"X\"*480)'\n+mac_ipv4_udp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/UDP(sport=1026, dport=1027)/(\"X\"*480)'\n+mac_ipv6_udp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/UDP(sport=1026, dport=1027)/(\"X\"*480)'\n+mac_ipv4_sctp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/SCTP(sport=1026, dport=1027)/(\"X\"*480)'\n+mac_ipv6_sctp_basic_pkt = 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/TCP(sport=1026, dport=1027)/(\"X\"*480)'\n+\n+mac_ipv4_changed_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.5\")/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.5\", dst=\"192.168.0.3\")/(\"X\"*480)']\n+\n+mac_ipv6_changed_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::5\")/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::5\", dst=\"2001::3\")/(\"X\"*480)']\n+\n+mac_ipv4_tcp_changed_l3_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.5\")/TCP(sport=1026, dport=1027)/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.5\", dst=\"192.168.0.3\")/TCP(sport=1026, dport=1027)/(\"X\"*480)']\n+\n+mac_ipv4_tcp_changed_l4_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/TCP(sport=1025, dport=1027)/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.2\", dst=\"192.168.0.3\")/TCP(sport=1026, dport=1025)/(\"X\"*480)']\n+\n+mac_ipv6_tcp_changed_l3_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::5\")/TCP(sport=1026, dport=1027)/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::5\", dst=\"2001::3\")/TCP(sport=1026, dport=1027)/(\"X\"*480)']\n+\n+mac_ipv6_tcp_changed_l4_pkt = ['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/TCP(sport=1025, dport=1027)/(\"X\"*480)',\n+ 'Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::2\", dst=\"2001::3\")/TCP(sport=1026, dport=1025)/(\"X\"*480)']\n+\n+mac_ipv4_udp_changed_l3_pkt = [sv.replace(\"/TCP\", \"/UDP\") for sv in mac_ipv4_tcp_changed_l3_pkt]\n+mac_ipv4_udp_changed_l4_pkt = [sv.replace(\"/TCP\", \"/UDP\") for sv in mac_ipv4_tcp_changed_l4_pkt]\n+\n+mac_ipv6_udp_changed_l3_pkt = [sv.replace(\"/TCP\", \"/UDP\") for sv in mac_ipv6_tcp_changed_l3_pkt]\n+mac_ipv6_udp_changed_l4_pkt = [sv.replace(\"/TCP\", \"/UDP\") for sv in mac_ipv6_tcp_changed_l4_pkt]\n+\n+mac_ipv4_sctp_changed_l3_pkt = [sv.replace(\"/TCP\", \"/SCTP\") for sv in mac_ipv4_tcp_changed_l3_pkt]\n+mac_ipv4_sctp_changed_l4_pkt = [sv.replace(\"/TCP\", \"/SCTP\") for sv in mac_ipv4_tcp_changed_l4_pkt]\n+\n+mac_ipv6_sctp_changed_l3_pkt = [sv.replace(\"/TCP\", \"/SCTP\") for sv in mac_ipv6_tcp_changed_l3_pkt]\n+mac_ipv6_sctp_changed_l4_pkt = [sv.replace(\"/TCP\", \"/SCTP\") for sv in mac_ipv6_tcp_changed_l4_pkt]\n+\n+command_line_option_rss_ip = {\n+ 'sub_casename': 'command_line_option_rss_ip',\n+ 'port_id': 0,\n+ 'test': [\n+ {'send_packet': mac_ipv4_basic_pkt,\n+ 'action': {'save_hash': 'ip-ipv4'}},\n+ {'send_packet': mac_ipv4_changed_pkt,\n+ 'action': {'check_hash_different': 'ip-ipv4'}},\n+ {'send_packet': mac_ipv6_basic_pkt,\n+ 'action': {'save_hash': 'ip-ipv6'}},\n+ {'send_packet': mac_ipv6_changed_pkt,\n+ 'action': {'check_hash_different': 'ip-ipv4'}},\n+ # ipv4/ipv6 tcp\n+ {'send_packet': mac_ipv4_tcp_basic_pkt,\n+ 'action': {'save_hash': 'ipv4-tcp'}},\n+ {'send_packet': mac_ipv4_tcp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv4-tcp'}},\n+ {'send_packet': mac_ipv4_tcp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv4-tcp'}},\n+ {'send_packet': mac_ipv6_tcp_basic_pkt,\n+ 'action': {'save_hash': 'ipv6-tcp'}},\n+ {'send_packet': mac_ipv6_tcp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv6-tcp'}},\n+ {'send_packet': mac_ipv6_tcp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv6-tcp'}},\n+ # ipv4/ipv6 udp\n+ {'send_packet': mac_ipv4_udp_basic_pkt,\n+ 'action': {'save_hash': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv4_udp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv4_udp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv6_udp_basic_pkt,\n+ 'action': {'save_hash': 'ipv6-udp'}},\n+ {'send_packet': mac_ipv6_udp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv6-udp'}},\n+ {'send_packet': mac_ipv6_udp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv6-udp'}},\n+ # ipv4/ipv6 sctp\n+ {'send_packet': mac_ipv4_sctp_basic_pkt,\n+ 'action': {'save_hash': 'ipv4-sctp'}},\n+ {'send_packet': mac_ipv4_sctp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv4-sctp'}},\n+ {'send_packet': mac_ipv4_sctp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv4-sctp'}},\n+ {'send_packet': mac_ipv6_sctp_basic_pkt,\n+ 'action': {'save_hash': 'ipv6-sctp'}},\n+ {'send_packet': mac_ipv6_sctp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv6-sctp'}},\n+ {'send_packet': mac_ipv6_sctp_changed_l4_pkt,\n+ 'action': {'check_hash_same': 'ipv6-sctp'}}\n+ ]\n }\n \n-tv_mac_ipv6_tcp_l4_random = {\n- \"name\":\"tv_mac_ipv6_tcp_l4_random\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IPv6()/TCP(sport=%d, dport=%d)/(\"X\"*480)' %(i+50,i+55) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n+command_line_option_rss_udp = {\n+ 'sub_casename': 'command_line_option_rss_udp',\n+ 'port_id': 0,\n+ 'test': [\n+ # ipv4/ipv6 udp\n+ {'send_packet': mac_ipv4_udp_basic_pkt,\n+ 'action': {'save_hash': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv4_udp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv4_udp_changed_l4_pkt,\n+ 'action': {'check_hash_different': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv6_udp_basic_pkt,\n+ 'action': {'save_hash': 'ipv6-udp'}},\n+ {'send_packet': mac_ipv6_udp_changed_l3_pkt,\n+ 'action': {'check_hash_different': 'ipv6-udp'}},\n+ {'send_packet': mac_ipv6_udp_changed_l4_pkt,\n+ 'action': {'check_hash_different': 'ipv6-udp'}},\n+ # ipv4/ipv6 tcp/sctp\n+ {'send_packet': mac_ipv4_basic_pkt,\n+ 'action': {'check_no_hash': 'ip-ipv4'}},\n+ {'send_packet': mac_ipv6_basic_pkt,\n+ 'action': {'check_no_hash': 'ip-ipv6'}},\n+ {'send_packet': mac_ipv4_tcp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv4-tcp'}},\n+ {'send_packet': mac_ipv6_tcp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv6-tcp'}},\n+ {'send_packet': mac_ipv4_sctp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv4-sctp'}},\n+ {'send_packet': mac_ipv6_sctp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv6-sctp'}},\n+ ]\n }\n \n-tv_mac_ipv4_sctp = {\n- \"name\":\"tv_mac_ipv4_sctp\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IP(src=\"192.168.0.%d\", dst=\"192.168.0.%d\")/SCTP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n+command_line_option_disable_rss = {\n+ 'sub_casename': 'command_line_option_disable',\n+ 'port_id': 0,\n+ 'test': [\n+ # all\n+ {'send_packet': mac_ipv4_basic_pkt,\n+ 'action': {'check_no_hash': 'ip-ipv4'}},\n+ {'send_packet': mac_ipv4_basic_pkt,\n+ 'action': {'check_no_hash': 'ip-ipv6'}},\n+ {'send_packet': mac_ipv4_tcp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv4-tcp'}},\n+ {'send_packet': mac_ipv6_tcp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv6-tcp'}},\n+ {'send_packet': mac_ipv4_udp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv4-udp'}},\n+ {'send_packet': mac_ipv6_udp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv6-udp'}},\n+ {'send_packet': mac_ipv4_sctp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv4-sctp'}},\n+ {'send_packet': mac_ipv6_sctp_basic_pkt,\n+ 'action': {'check_no_hash': 'ipv6-sctp'}},\n+ ]\n }\n \n-tv_mac_ipv6_sctp = {\n- \"name\":\"tv_mac_ipv6_sctp\",\n- \"scapy_str\":['Ether(dst=\"00:00:00:00:01:00\")/IPv6(src=\"2001::%d\", dst=\"2001::%d\")/SCTP()/(\"X\"*480)' %(i,i+10) for i in range(0,100)],\n- \"check_func_param\": {\"expect_port\":0}\n+rss_configure_to_ip = {\n+ 'sub_casename': 'rss_configure_to_ip',\n+ 'port_id': 0,\n+ 'test': command_line_option_rss_ip['test']\n }\n \n-tvs_mac_rss_ip = [\n- tv_mac_ip_ipv4,\n- tv_mac_ip_ipv6\n- ]\n-\n-tvs_mac_rss_l3 = [\n- tv_mac_ip_ipv4,\n- tv_mac_ip_ipv6,\n- tv_mac_ipv4_udp_l3_random,\n- tv_mac_ipv6_udp_l3_random,\n- tv_mac_ipv4_tcp_l3_random,\n- tv_mac_ipv6_tcp_l3_random,\n- tv_mac_ipv4_sctp,\n- tv_mac_ipv6_sctp\n- ]\n-\n-tvs_mac_rss_l4 = [\n- tv_mac_ipv4_udp_l4_random,\n- tv_mac_ipv6_udp_l4_random,\n- tv_mac_ipv4_tcp_l4_random,\n- tv_mac_ipv6_tcp_l4_random\n- ]\n-\n-tvs_mac_rss_udp = [\n- tv_mac_ipv4_udp_l3_random,\n- tv_mac_ipv4_udp_l4_random,\n- tv_mac_ipv6_udp_l3_random,\n- tv_mac_ipv6_udp_l4_random\n- ]\n-\n-tvs_mac_rss_udp_l4 = [\n- tv_mac_ipv4_udp_l4_random,\n- tv_mac_ipv6_udp_l4_random\n- ]\n-\n-tvs_mac_rss_tcp = [\n- tv_mac_ipv4_tcp_l3_random,\n- tv_mac_ipv4_tcp_l4_random,\n- tv_mac_ipv6_tcp_l3_random,\n- tv_mac_ipv6_tcp_l4_random\n- ]\n+rss_configure_to_udp = eval(str(command_line_option_rss_udp)\n+ .replace(\"command_line_option_rss_udp\", \"rss_configure_to_udp\"))\n \n-tvs_mac_rss_tcp_l4 = [\n- tv_mac_ipv4_tcp_l4_random,\n- tv_mac_ipv6_tcp_l4_random\n- ]\n+rss_configure_to_tcp = eval(str(rss_configure_to_udp).replace(\"to_udp\", \"to_tcp\")\n+ .replace(\"/UDP\", \"/UDP1\")\n+ .replace(\"-udp\", \"-udp1\")\n+ .replace(\"/TCP\", \"/UDP\")\n+ .replace(\"-tcp\", \"-udp\")\n+ .replace(\"/UDP1\", \"/TCP\")\n+ .replace(\"-udp1\", \"-tcp\"))\n \n-tvs_mac_rss_sctp = [\n- tv_mac_ipv4_sctp,\n- tv_mac_ipv6_sctp\n- ]\n+rss_configure_to_sctp = eval(str(rss_configure_to_udp).replace(\"to_udp\", \"to_sctp\")\n+ .replace(\"/UDP\", \"/UDP1\")\n+ .replace(\"-udp\", \"-udp1\")\n+ .replace(\"/SCTP\", \"/UDP\")\n+ .replace(\"-sctp\", \"-udp\")\n+ .replace(\"/UDP1\", \"/SCTP\")\n+ .replace(\"-udp1\", \"-sctp\"))\n \n-tvs_mac_rss_all = [\n- tv_mac_ip_ipv4,\n- tv_mac_ip_ipv6,\n- tv_mac_ipv4_udp_l3_random,\n- tv_mac_ipv4_udp_l4_random,\n- tv_mac_ipv6_udp_l3_random,\n- tv_mac_ipv6_udp_l4_random,\n- tv_mac_ipv4_tcp_l3_random,\n- tv_mac_ipv4_tcp_l4_random,\n- tv_mac_ipv6_tcp_l3_random,\n- tv_mac_ipv6_tcp_l4_random,\n- tv_mac_ipv4_sctp,\n- tv_mac_ipv6_sctp\n- ]\n+rss_configure_to_all = eval(str(command_line_option_rss_ip).replace(\"to_udp\", \"to_all\")\n+ .replace(\"check_hash_same\", \"check_hash_different\"))\n \n-test_results = OrderedDict()\n+rss_configure_to_default = eval(str(command_line_option_rss_ip).replace(\"to_udp\", \"to_all\")\n+ .replace(\"check_hash_same\", \"check_hash_different\"))\n \n class RSSConfigureTest(TestCase):\n \n@@ -198,6 +224,7 @@ class RSSConfigureTest(TestCase):\n Generic filter Prerequistites\n \"\"\"\n self.dut_ports = self.dut.get_ports(self.nic)\n+ self.dut.bind_interfaces_linux(self.drivername)\n # Verify that enough ports are available\n self.verify(len(self.dut_ports) >= 1, \"Insufficient ports\")\n #self.cores = \"1S/8C/1T\"\n@@ -209,108 +236,66 @@ class RSSConfigureTest(TestCase):\n self.pf_mac = self.dut.get_mac_address(0)\n self.pf_pci = self.dut.ports_info[self.dut_ports[0]]['pci']\n self.verify(self.nic in [\"columbiaville_25g\",\"columbiaville_100g\"], \"%s nic not support ethertype filter\" % self.nic)\n+ self.rsspro = RssProcessing(self, self.pmdout, [self.__tx_iface], rxq=16)\n \n def set_up(self):\n \"\"\"\n Run before each test case.\n \"\"\"\n- self.dut.kill_all()\n-\n- def tear_down(self):\n- \"\"\"\n- Run after each test case.\n- \"\"\"\n- self.dut.kill_all()\n- \n- def tear_down_all(self):\n- \"\"\"\n- Run after each test suite.\n- \"\"\"\n- self.dut.kill_all()\n+ pass\n \n- def create_testpmd_command(self, line_option):\n- \"\"\"\n- Create testpmd command for non-pipeline mode\n- \"\"\"\n- #Prepare testpmd EAL and parameters \n- all_eal_param = self.dut.create_eal_parameters(ports=[self.pf_pci])\n- print(all_eal_param) #print eal parameters\n- command = self.dut.apps_name['test-pmd'] + all_eal_param + \" -- -i --rxq=10 --txq=10\" + line_option\n- return command\n-\n- def _rss_validate_pattern(self, test_vectors, command, rss_type, is_rss):\n-\n- global test_results\n- out = self.dut.send_expect(command, \"testpmd> \", 120)\n- self.logger.debug(out) #print the log\n- self.dut.send_expect(\"set fwd rxonly\", \"testpmd> \", 15)\n- self.dut.send_expect(\"set verbose 1\", \"testpmd> \", 15)\n+ def launch_testpmd(self, line_option=\"\", rss_type=\"\"):\n+ self.pmdout.start_testpmd(ports=[self.pf_pci], param=\"--rxq=16 --txq=16 \" + line_option)\n+ self.pmdout.execute_cmd(\"set fwd rxonly\")\n+ self.pmdout.execute_cmd(\"set verbose 1\")\n if rss_type != \"\":\n- self.dut.send_expect(\"port config all rss %s\" % rss_type, \"testpmd> \", 15)\n-\n- test_results.clear()\n- self.count = 1\n- self.mac_count=100\n- for tv in test_vectors:\n- self.dut.send_expect(\"start\", \"testpmd> \", 15)\n- time.sleep(2)\n- tv[\"check_func_param\"][\"expect_port\"] = self.dut_ports[0]\n- print(\"expect_port is\", self.dut_ports[0])\n-\n- #send a packet\n- pkt = packet.Packet()\n- pkt.update_pkt(tv[\"scapy_str\"])\n- pkt.send_pkt(self.tester, tx_port=self.__tx_iface, count=self.count)\n-\n- out = self.dut.send_expect(\"stop\", \"testpmd> \",60)\n- print(out)\n- check_result = []\n- check_result = rfc.check_packets_of_each_queue(out)\n- self.verify(check_result[0] == is_rss, check_result[1])\n-\n- self.dut.send_expect(\"quit\", \"#\")\n+ self.pmdout.execute_cmd(\"port config all rss %s\" % rss_type)\n+ self.pmdout.execute_cmd(\"start\")\n \n def test_command_line_option_rss_ip(self):\n- command = self.create_testpmd_command(line_option = \" --rss-ip\")\n- self._rss_validate_pattern(tvs_mac_rss_l3, command, rss_type = \"\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_l4, command, rss_type = \"\", is_rss = False)\n+ self.launch_testpmd(line_option=\"--rss-ip\")\n+ self.rsspro.handle_rss_distribute_cases(command_line_option_rss_ip)\n \n def test_command_line_option_rss_udp(self):\n- command = self.create_testpmd_command(line_option = \" --rss-udp\")\n- self._rss_validate_pattern(tvs_mac_rss_udp, command, rss_type = \"\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_ip, command, rss_type = \"\", is_rss = False)\n- self._rss_validate_pattern(tvs_mac_rss_tcp, command, rss_type = \"\", is_rss = False)\n- self._rss_validate_pattern(tvs_mac_rss_sctp, command, rss_type = \"\", is_rss = False)\n+ self.launch_testpmd(line_option=\"--rss-udp\")\n+ self.rsspro.handle_rss_distribute_cases(command_line_option_rss_udp)\n \n def test_command_line_option_rss_disable(self):\n- command = self.create_testpmd_command(line_option = \" --disable-rss\")\n- self._rss_validate_pattern(tvs_mac_rss_all, command, rss_type = \"\", is_rss = False)\n+ self.launch_testpmd(line_option=\"--disable-rss\")\n+ self.rsspro.handle_rss_distribute_cases(command_line_option_disable_rss)\n \n def test_rss_configure_to_ip(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_l3, command, rss_type = \"\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_l4, command, rss_type = \"\", is_rss = False)\n+ self.launch_testpmd(rss_type=\"ip\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_ip)\n \n def test_rss_configure_to_udp(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_udp, command, rss_type = \"udp\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_tcp_l4, command, rss_type = \"udp\", is_rss = False)\n+ self.launch_testpmd(rss_type=\"udp\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_udp)\n \n def test_rss_configure_to_tcp(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_tcp, command, rss_type = \"tcp\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_udp_l4, command, rss_type = \"tcp\", is_rss = False)\n+ self.launch_testpmd(rss_type=\"tcp\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_tcp)\n \n def test_rss_configure_to_sctp(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_sctp, command, rss_type = \"sctp\", is_rss = True)\n- self._rss_validate_pattern(tvs_mac_rss_udp_l4, command, rss_type = \"sctp\", is_rss = False)\n- self._rss_validate_pattern(tvs_mac_rss_tcp_l4, command, rss_type = \"sctp\", is_rss = False)\n+ self.launch_testpmd(rss_type=\"sctp\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_sctp)\n \n def test_rss_configure_to_all(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_all, command, rss_type = \"all\", is_rss = True)\n+ self.launch_testpmd(rss_type=\"all\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_all)\n \n def test_rss_configure_to_default(self):\n- command = self.create_testpmd_command(line_option = \"\")\n- self._rss_validate_pattern(tvs_mac_rss_all, command, rss_type = \"default\", is_rss = True)\n+ self.launch_testpmd(rss_type=\"default\")\n+ self.rsspro.handle_rss_distribute_cases(rss_configure_to_default)\n+\n+ def tear_down(self):\n+ \"\"\"\n+ Run after each test case.\n+ \"\"\"\n+ self.pmdout.execute_cmd(\"quit\", \"# \")\n+\n+ def tear_down_all(self):\n+ \"\"\"\n+ Run after each test suite.\n+ \"\"\"\n+ self.dut.kill_all()\n", "prefixes": [ "v4", "2/3" ] }