From patchwork Fri Dec 9 08:07:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingli Chen X-Patchwork-Id: 120696 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 7787FA034C; Fri, 9 Dec 2022 10:04:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70B28410FB; Fri, 9 Dec 2022 10:04:48 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 9CC0740E03 for ; Fri, 9 Dec 2022 10:04:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670576686; x=1702112686; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=N2m9hHBR1Dz8+fh5qWUWF+JjdBgctIW2xrtXxdPU13E=; b=OVB5iVMKJf9X1glrggwuyT1M5+ZlYTFUXhZ6PIBcxckFBgUd8UBpCFfW r04SE0EeTetcGWhNK9e02cQxczWowvL1kSqvCriTBh4d1Xml3U/d7nH+U 5kVODSVEJWfLn4ApqoJhjf9HUd+11Uir9UKaHNnF4vkx3e9iViPeZJkjM H9+S2FQ4Bu51+xEzTNZJ8JxB09NScSLfEIxv6EZNUBHtyaUTiQssdKv96 wZGO1nfkXu3mepUOCkJG8adBJ1MD9PON6wjACCF+73thE/EqfefgSH0qf KJYudDKSWz65XgSB08j0NUx58vdzoXEJjmneHZp2iT8DAiuUGz6e7bIZd w==; X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="379631196" X-IronPort-AV: E=Sophos;i="5.96,230,1665471600"; d="scan'208";a="379631196" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2022 01:04:46 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="597672424" X-IronPort-AV: E=Sophos;i="5.96,230,1665471600"; d="scan'208";a="597672424" Received: from unknown (HELO localhost.localdomain) ([10.239.252.99]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2022 01:04:44 -0800 From: Lingli Chen To: dts@dpdk.org Cc: zhiminx.huang@intel.com, Lingli Chen Subject: [dts][PATCH V1 2/2] tests/ddp_*: remove flow_director_filter raw pkt test case Date: Fri, 9 Dec 2022 03:07:57 -0500 Message-Id: <20221209080757.2372-2-linglix.chen@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221209080757.2372-1-linglix.chen@intel.com> References: <20221209080757.2372-1-linglix.chen@intel.com> 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 According to dpdk commit 5007ac1318 (ethdev: remove deprecated Flow Director configuration) remove flow_director_filter raw pkt test case. Signed-off-by: Lingli Chen --- tests/TestSuite_ddp_gtp_qregion.py | 138 ------------------------- tests/TestSuite_ddp_ppp_l2tp.py | 160 ----------------------------- 2 files changed, 298 deletions(-) diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py index a3dea1b2..7d6508b6 100644 --- a/tests/TestSuite_ddp_gtp_qregion.py +++ b/tests/TestSuite_ddp_gtp_qregion.py @@ -288,62 +288,6 @@ class TestDdpGtpQregion(TestCase): "Failed update flow type to pctype mapping!!!", ) - def run_fd_test(self, crlwords, flowtype, pctype, keywords, qchecks): - """ - Use dynamic flowtype/pctype mapping, use default or dynamic change - control words to set flow director input configuration for new - protocol, setup raw flow type filter for flow director, check flow - director could work. - crlwords: control words of keyword - flowtype: define flow type 23~63 values for GTP packet types as test - plan table. - pctype: profile defines below 10~25 pctypes for GTP packet types. - keywords: keywords have Session ID, S-Port, D-Port, IP SA, IP DA and - etc. - qchecks: define sameq and difq. If change keywords, direct packets to - queue 0, otherwise direct packets to same queue. - """ - - self.flowtype_pctype_mapping(flowtype, pctype) - if crlwords is not None: - self.dut_testpmd.execute_cmd("port stop all") - time.sleep(1) - self.dut_testpmd.execute_cmd( - "port config 0 pctype %s fdir_inset clear all" % pctype - ) - for word in crlwords: - self.dut_testpmd.execute_cmd( - "port config 0 pctype %s fdir_inset set field %s" % (pctype, word) - ) - self.dut_testpmd.execute_cmd("port start all") - self.dut_testpmd.execute_cmd("set fwd rxonly") - self.dut_testpmd.execute_cmd("set verbose 1") - self.dut_testpmd.execute_cmd("start") - self.dut_testpmd.wait_link_status_up(self.dut_ports[0]) - qnum = self.send_verify_fd(flowtype, keywords, "word_opt") - self.verify(qnum == 0, "Receive packet from wrong queue!!!") - self.raw_packet_generate(flowtype) - queue = random.randint(1, self.PF_QUEUE - 1) - self.dut_testpmd.execute_cmd( - "flow_director_filter 0 mode raw add flow %d fwd queue %d \ - fd_id 1 packet /tmp/test_gtp.raw" - % (flowtype, queue) - ) - qnum = self.send_verify_fd(flowtype, keywords, "word_opt") - qdef = qnum - self.verify(qnum == queue, "Receive packet from wrong queue!!!") - for word, chk in zip(keywords, qchecks): - qnum = self.send_verify_fd(flowtype, word, "chg_sufword_opt") - if qnum == qdef: - result = "sameq" - elif qnum == 0: - result = "difq" - self.verify( - result == chk, - "Faild to verify flow director when \ - key word change!!!", - ) - def run_gtp_test(self, crlwords, flowtype, pctype, qmin, qmax, keyword): """ Use dynamic flowtype/pctype mapping, queue region, dynamic change @@ -523,88 +467,6 @@ class TestDdpGtpQregion(TestCase): crlwords = list(range(21, 29)) self.run_gtp_test(crlwords, 23, 23, 10, 25, "dst_ipv6") - def test_fd_gtpu_ipv4(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, default flow director input - set configuration is teid, setup raw flow type filter for flow - director check flow director could work when sending matched teid - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ip", "dst_ip", "sport", "dport", "teid"] - qchecks = ["sameq", "sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 26, 22, keywords, qchecks) - - def test_fd_gtpu_ipv4_dstip(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, dynamic to change flow - director input set configuration for dst IPv4 words 27~28, setup - raw flow type filter for flow director, check flow director could - work when sending matched dst IPv4 packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(27, 29)) - keywords = ["src_ip", "sport", "dport", "dst_ip"] - qchecks = ["sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 26, 22, keywords, qchecks) - - def test_fd_gtpu_ipv4_srcip(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, dynamic to change flow - director input set configuration for src IPv4 words 15~16, setup - raw flow type filter for flow director, check flow director could - work when sending matched src IPv4 packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(15, 17)) - keywords = ["dst_ip", "sport", "dport", "src_ip"] - qchecks = ["sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 26, 22, keywords, qchecks) - - def test_fd_gtpu_ipv6(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, default flow director input - set configuration is teid, setup raw flow type filter for flow - director check flow director could work when sending matched teid - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ipv6", "dst_ipv6", "sport", "dport", "teid"] - qchecks = ["sameq", "sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 23, 23, keywords, qchecks) - - def test_fd_gtpu_ipv6_dstipv6(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, dynamic to change flow - director input set configuration for dst IPv6 words 21~28, setup - raw flow type filter for flow director, check flow director could - work when sending matched dst IPv6 packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(21, 29)) - keywords = ["src_ipv6", "sport", "dport", "teid", "dst_ipv6"] - qchecks = ["sameq", "sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 23, 23, keywords, qchecks) - - def test_fd_gtpu_ipv6_srcipv6(self): - """ - GTP is supported by NVM with profile updated. Download profile then - set queue region/flowtype/pctype mapping, dynamic to change flow - director input set configuration for src IPv6 words 13~20, setup - raw flow type filter for flow director, check flow director could - work when sending matched src IPv6 packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(13, 21)) - keywords = ["dst_ipv6", "sport", "dport", "teid", "src_ipv6"] - qchecks = ["sameq", "sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 23, 23, keywords, qchecks) - def test_outer_64pre_dst_contrl_gtpcq(self): """ GTP is supported by NVM with profile updated. Download profile then diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py index c0890a48..b0468706 100644 --- a/tests/TestSuite_ddp_ppp_l2tp.py +++ b/tests/TestSuite_ddp_ppp_l2tp.py @@ -295,60 +295,6 @@ class TestDdpPppL2tp(TestCase): result = "difq" self.verify(result == chk, "Faild to verify RSS when key word change!!!") - def run_fd_test(self, crlwords, flowtype, pctype, keywords, qchecks): - """ - Use dynamic flowtype/pctype mapping, use default or dynamic change - control words to set flow director input configuration for new - protocol, setup raw flow type filter for flow director, check flow - director could work. - crlwords: control words of keyword - flowtype: define flow type 23~63 values for PPPoE and PPPoL2TPv2 packet - types as test plan table. - pctype: profile defines below 14~21 pctypes for PPPoE and PPPoL2TPv2 - packet types. - keywords: keywords have Session ID, S-Port, D-Port, IP SA, IP DA and - etc. - qchecks: define sameq and difq. If change keywords, direct packets to - queue 0, otherwise direct packets to same queue. - """ - - self.pctype_flowtype_mapping(flowtype, pctype) - if crlwords is not None: - self.dut_testpmd.execute_cmd("port stop all") - time.sleep(1) - self.dut_testpmd.execute_cmd( - "port config 0 pctype %s fdir_inset clear all" % pctype - ) - for word in crlwords: - self.dut_testpmd.execute_cmd( - "port config 0 pctype %s fdir_inset set field %s" % (pctype, word) - ) - self.dut_testpmd.execute_cmd("port start all") - self.dut_testpmd.execute_cmd("start") - qnum = self.send_and_verify(flowtype, "def", "fd") - self.verify(qnum == 0, "Receive packet from wrong queue!!!") - self.raw_packet_generate(flowtype) - queue = random.randint(1, self.PF_QUEUE - 1) - self.dut_testpmd.execute_cmd( - "flow_director_filter 0 mode raw add flow %d fwd queue %d \ - fd_id 1 packet /tmp/test.raw" - % (flowtype, queue) - ) - qnum = self.send_and_verify(flowtype, "def", "fd") - qdef = qnum - self.verify(qnum == queue, "Receive packet from wrong queue!!!") - for word, chk in zip(keywords, qchecks): - qnum = self.send_and_verify(flowtype, word, "fd") - if qnum == qdef: - result = "sameq" - elif qnum == 0: - result = "difq" - self.verify( - result == chk, - "Faild to verify flow director when \ - key word change!!!", - ) - def test_rss_pppoe(self): """ PPPoE is supported by NVM with profile updated. Download profile then @@ -481,112 +427,6 @@ class TestDdpPppL2tp(TestCase): qchecks = ["difq", "sameq"] self.run_rss_test(crlwords, 23, 18, keywords, qchecks) - def test_fd_pppoe(self): - """ - PPPoE is supported by NVM with profile updated. Download profile then - set flowtype/pctype mapping, default flow director input set are MAC - SA, session ID, setup raw flow type filter for flow director, check - flow director could work when sending matched packets to configured - queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_mac", "session_id", "dst_mac"] - qchecks = ["difq", "difq", "sameq"] - self.run_fd_test(crlwords, 30, 17, keywords, qchecks) - - def test_fd_l2tp(self): - """ - L2TPv2 PAY is supported by NVM with profile updated. Download profile - then set flowtype/pctype mapping, default flow director input set are - MAC SA, session ID, setup raw flow type filter for flow director, check - flow director could work when sending matched packets to configured - queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_mac", "session_id", "dst_mac"] - qchecks = ["difq", "difq", "sameq"] - self.run_fd_test(crlwords, 26, 21, keywords, qchecks) - - def test_fd_pppoe_ipv4(self): - """ - PPPoE IPv4 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, default flow director input - set are IPv4 SA, IPv4 DA, S-Port, D-Port, setup raw flow type filter - for flow director, check flow director could work when sending matched - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ip", "dst_ip", "sport", "dport", "session_id"] - qchecks = ["difq", "difq", "difq", "difq", "sameq"] - self.run_fd_test(crlwords, 28, 15, keywords, qchecks) - - def test_fd_pppoe_ipv6(self): - """ - PPPoE IPv6 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, default flow director input - set are IPv6 SA, IPv6 DA, S-Port, D-Port, setup raw flow type filter - for flow director, check flow director could work when sending matched - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ipv6", "dst_ipv6", "sport", "dport", "session_id"] - qchecks = ["difq", "difq", "difq", "difq", "sameq"] - self.run_fd_test(crlwords, 29, 16, keywords, qchecks) - - def test_fd_pppol2tp_ipv4(self): - """ - PPPoL2TPv2 IPv4 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, default flow director input - set are IPv4 SA, IPv4 DA, S-Port, D-Port, setup raw flow type filter - for flow director, check flow director could work when sending matched - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ip", "dst_ip", "sport", "dport"] - qchecks = ["difq", "difq", "difq", "difq"] - self.run_fd_test(crlwords, 23, 18, keywords, qchecks) - - def test_fd_pppol2tp_ipv6(self): - """ - PPPoL2TPv2 IPv6 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, default flow director input - set are IPv6 SA, IPv6 DA, S-Port, D-Port, setup raw flow type filter - for flow director, check flow director could work when sending matched - packets to configured queue, otherwise direct packets to queue 0. - """ - crlwords = None - keywords = ["src_ipv6", "dst_ipv6", "sport", "dport"] - qchecks = ["difq", "difq", "difq", "difq"] - self.run_fd_test(crlwords, 24, 19, keywords, qchecks) - - def test_fd_pppol2tp_ipv4_dstip(self): - """ - PPPoL2TPv2 IPv4 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, dynamic to change flow - director input set configuration for IPv4 DA words 27~28, setup - raw flow type filter for flow director, check flow director could - work when sending matched IPv4 DA packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(27, 29)) - keywords = ["src_ip", "sport", "dport", "dst_ip"] - qchecks = ["sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 23, 18, keywords, qchecks) - - def test_fd_pppol2tp_ipv6_dstipv6(self): - """ - PPPoL2TPv2 IPv6 is supported by NVM with profile updated. Download - profile then set flowtype/pctype mapping, dynamic to change flow - director input set configuration for IPv6 DA words 21~28, setup - raw flow type filter for flow director, check flow director could - work when sending matched IPv6 DA packets to configured queue, - otherwise direct packets to queue 0. - """ - crlwords = list(range(21, 29)) - keywords = ["src_ipv6", "sport", "dport", "dst_ipv6"] - qchecks = ["sameq", "sameq", "sameq", "difq"] - self.run_fd_test(crlwords, 24, 19, keywords, qchecks) - def tear_down(self): self.dut_testpmd.execute_cmd("stop") out = self.dut_testpmd.execute_cmd("ddp get list 0")