From patchwork Thu Jul 14 08:34:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 113963 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 467FBA00C5; Thu, 14 Jul 2022 10:34:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A6924282B; Thu, 14 Jul 2022 10:34:44 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 066B441156 for ; Thu, 14 Jul 2022 10:34:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657787682; x=1689323682; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=HoNQ3nR+h+p2Mzx7zST4RqIFydzYDwEiE2l7i6n4PwU=; b=LaahepJu2yuM2cncI/jKeRZsSh32oiEND+kcrcQKxSBB4XcWv7xMcNq9 E5OXDfJwGKB/7BXPxU05e8fjEJ+U/nSAsIFl9gFv75QYlUEEm5+jkeGXv 80SLyYU8y4w09XvwL0JMhDFTMCyrQ3CQbunIqjKXobOhqOD9RR5GIwuLN 2hq7AaKBYHsEs343P5SLUJxhCDIG5WbUcbDiUBtDOGMOG11WjIwBmp9CJ /UxxGIIv9bQ66Y35bEbEqWmMcfKI6azgtCkIKg8JkoG1Imdo6STPYv7IM CforUalfd4fUeQIVCmvUfjZkoDkZ31gA4klJ0lL9Z07lYNm/V4DW62trr w==; X-IronPort-AV: E=McAfee;i="6400,9594,10407"; a="285477926" X-IronPort-AV: E=Sophos;i="5.92,269,1650956400"; d="scan'208";a="285477926" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 01:34:40 -0700 X-IronPort-AV: E=Sophos;i="5.92,269,1650956400"; d="scan'208";a="570976723" Received: from unknown (HELO localhost.localdomain) ([10.239.252.248]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 01:34:39 -0700 From: Weiyuan Li To: dts@dpdk.org, yuan.peng@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V1] tests/rss_to_rte_flow: update dts code for dpdk change Date: Thu, 14 Jul 2022 16:34:33 +0800 Message-Id: <20220714083433.13499-1-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 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 44a37f3cffe0(app/testpmd: compact RSS types output) modify the script to adapt to this change. Signed-off-by: Weiyuan Li Tested-by: Lingli Chen Acked-by: Peng, Yuan Signed-off-by: Weiyuan Li Acked-by: Lijuan Tu --- tests/TestSuite_rss_to_rte_flow.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py index 044f3755..29faa5c4 100644 --- a/tests/TestSuite_rss_to_rte_flow.py +++ b/tests/TestSuite_rss_to_rte_flow.py @@ -395,10 +395,10 @@ class TestRSS_to_Rteflow(TestCase): # Show port default RSS functions self.dut.send_expect( - "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" + "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" ) self.dut.send_expect( - "show port 1 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" + "show port 1 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" ) self.send_check_100_packet_queue("ipv4-other", "all", port_id=0) @@ -465,7 +465,7 @@ class TestRSS_to_Rteflow(TestCase): self.dut.send_expect( "show port 1 rss-hash", - "ipv4-frag ipv4-tcp ipv4-udp ipv4-sctp ipv4-other ipv6-frag ipv6-tcp ipv6-udp ipv6-sctp ipv6-other l2-payload sctp", + "sctp ipv4-frag ipv4-tcp ipv4-udp ipv4-sctp ipv4-other\r\n ipv6-frag ipv6-tcp ipv6-udp ipv6-sctp ipv6-other\r\n l2-payload", ) # send the packets and verify the results ptype_list1 = [ @@ -615,7 +615,7 @@ class TestRSS_to_Rteflow(TestCase): "created", ) self.dut.send_expect( - "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" + "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" ) # send the packets and verify the results @@ -646,7 +646,7 @@ class TestRSS_to_Rteflow(TestCase): # flush rule on port 0 self.dut.send_expect("flow flush 0", "testpmd> ") self.dut.send_expect( - "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" + "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other" ) # send the packets and verify the results self.send_check_100_packet_queue("ipv4-other", "all", port_id=0) @@ -1427,7 +1427,7 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Show port default RSS functions - self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6 ipv6-ex") + self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6 ipv6-ex") ptype_list1 = [ "ipv4-other", "ipv4-frag", @@ -1457,7 +1457,7 @@ class TestRSS_to_Rteflow(TestCase): ) self.dut.send_expect( "show port 0 rss-hash", - "ipv4 ipv4-tcp ipv4-udp ipv6 ipv6-tcp ipv6-udp ipv6-ex ipv6-tcp-ex ipv6-udp-ex", + "udp tcp ipv4 ipv4-tcp ipv4-udp ipv6 ipv6-tcp ipv6-udp\r\n ipv6-ex ipv6-tcp-ex ipv6-udp-ex", ) self.send_check_100_packet_queue(ptype_list1, "all", port_id=0) @@ -1489,7 +1489,7 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Show port default RSS fucntions - self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6 ipv6-ex") + self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6 ipv6-ex") # enable ipv4-udp rss function self.dut.send_expect( "flow create 0 ingress pattern end actions rss types ipv4-udp end / end", @@ -1664,7 +1664,7 @@ class TestRSS_to_Rteflow(TestCase): "created", ) self.dut.send_expect( - "show port 0 rss-hash", "ipv4-tcp ipv4-udp ipv6-udp ipv6-udp-ex" + "show port 0 rss-hash", "ipv4-tcp ipv4-udp ipv6-udp ipv6-udp-ex" ) ptype_list1 = ["ipv4-udp", "ipv4-tcp", "ipv6-udp"] ptype_list2 = [ @@ -1700,7 +1700,7 @@ class TestRSS_to_Rteflow(TestCase): "flow create 0 ingress pattern end actions rss types ipv4 ipv6 end queues 3 7 end / end", "created", ) - self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6") + self.dut.send_expect("show port 0 rss-hash", "ipv4 ipv6") ptype_list3 = [ "ipv4-other", "ipv4-frag", @@ -1788,7 +1788,7 @@ class TestRSS_to_Rteflow(TestCase): "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp end queues 5 6 7 end / end", "created", ) - self.dut.send_expect("show port 0 rss-hash", "ipv4-udp ipv6-tcp") + self.dut.send_expect("show port 0 rss-hash", "ipv4-udp ipv6-tcp") # send the packets and verify the results ptype_list2 = ["ipv4-udp", "ipv6-tcp"]