From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1929CA00C2; Thu, 23 Apr 2020 12:22:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFA3A1D509; Thu, 23 Apr 2020 12:22:04 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 4B1A11D44C for ; Thu, 23 Apr 2020 12:22:02 +0200 (CEST) IronPort-SDR: Ks/KOD2SoojKbgkUAMj8zdOXMp+c5ROkDCs7wicG938cdUQrx2YwNNw9kwRCzdP90SpJgLfp3f uNhuybewT43g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 03:22:01 -0700 IronPort-SDR: McpDsbg7j/vz6iEnNUbvYCpnVgLi/UVF20zoWL0SWIHPB7vAdLz8/4BW79tbdpt07D8BMn2bnm GoiJFnhMXVoQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,306,1583222400"; d="scan'208";a="274188759" Received: from unknown (HELO localhost.localdomain) ([10.240.183.86]) by orsmga002.jf.intel.com with ESMTP; 23 Apr 2020 03:21:59 -0700 From: Mei Jianwei To: dts@dpdk.org Cc: root Date: Fri, 24 Apr 2020 21:26:56 +0800 Message-Id: <20200424132656.1123-1-jianweix.mei@intel.com> X-Mailer: git-send-email 2.18.2 Subject: [dts] [PATCH V1] tests/rss_to_rte_flow:support nic springville X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "dts" From: root add NIC springville. Signed-off-by: root --- tests/TestSuite_rss_to_rte_flow.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py index b345a84..f9b37ea 100644 --- a/tests/TestSuite_rss_to_rte_flow.py +++ b/tests/TestSuite_rss_to_rte_flow.py @@ -266,7 +266,7 @@ class TestRSS_to_Rteflow(TestCase): """ Set valid and invalid parameter. """ - num = '4' if self.nic == "foxville" else '8' + num = '4' if self.nic in ["foxville", "springville"] else '8' self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%s --txq=%s --port-topology=chained" % (num, num)) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -274,7 +274,7 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': + if self.nic in ['foxville',"springville"]: self.dut.send_expect( #"flow create 0 ingress pattern end actions rss queues 1 4 7 end / end", "created") "flow create 0 ingress pattern end actions rss queues 1 2 3 end / end", "created") @@ -298,7 +298,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt6, rss_queue) self.send_and_check(self.pkt7, rss_queue) else: - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt1, rss_queue) self.send_and_check(self.pkt2, rss_queue) @@ -347,7 +347,7 @@ class TestRSS_to_Rteflow(TestCase): self.dut.send_expect( "flow create 0 ingress pattern end actions rss queues 8 end / end", "error") # Set all the queues to the rule - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: self.dut.send_expect( "flow create 0 ingress pattern end actions rss queues 0 1 2 3 end / end", "created") else: @@ -358,7 +358,7 @@ class TestRSS_to_Rteflow(TestCase): """ Set valid and invalid parameter. """ - num = '4' if self.nic == "foxville" else '8' + num = '4' if self.nic in ["foxville", "springville"] else '8' self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%s --txq=%s --port-topology=chained" % (num, num)) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -366,7 +366,7 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: self.dut.send_expect( #"flow create 0 ingress pattern end actions rss types udp ipv4-tcp ipv6-sctp ipv4-other end queues 1 4 7 end / end", "created") "flow create 0 ingress pattern end actions rss types udp ipv4-tcp ipv6-sctp ipv4-other end queues 1 2 3 end / end", "created") @@ -391,7 +391,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) self.send_and_check(self.pkt6, rss_queue) - elif(self.nic in ["foxville"]): + elif(self.nic in ["foxville", "springville"]): rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) @@ -493,7 +493,7 @@ class TestRSS_to_Rteflow(TestCase): """ Set RSS queue rule while disable RSS in command-line. """ - num = '4' if self.nic == "foxville" else '8' + num = '4' if self.nic in ["foxville", "springville"] else '8' self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%s --txq=%s --disable-rss --port-topology=chained" % (num, num)) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -514,7 +514,7 @@ class TestRSS_to_Rteflow(TestCase): self.dut.send_expect("start", "testpmd> ", 120) time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: self.dut.send_expect( "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp sctp ipv6-other end queues 1 2 3 end / end", "created") else: @@ -534,7 +534,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt4, rss_queue) self.send_and_check(self.pkt6, rss_queue) else: - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: rss_queue = ["1", "2", "3"] self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt7, rss_queue) @@ -562,7 +562,7 @@ class TestRSS_to_Rteflow(TestCase): """ Set RSS queue rule and flow director rule in meantime. """ - num = '4' if self.nic == "foxville" else '8' + num = '4' if self.nic in ["foxville", "springville"] else '8' self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%s --txq=%s --pkt-filter-mode=perfect" % (num, num)) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -570,17 +570,17 @@ class TestRSS_to_Rteflow(TestCase): time.sleep(2) # Create a rss queue rule - if self.nic == 'foxville': + if self.nic in ['foxville', 'springville']: self.dut.send_expect( "flow create 0 ingress pattern end actions rss types udp end queues 1 2 3 end / end", "created") else: self.dut.send_expect( "flow create 0 ingress pattern end actions rss types udp end queues 3 4 5 end / end", "created") # send the packets and verify the results - rss_queue = ["1", "2", "3"] if self.nic == 'foxville' else ["3", "4", "5"] + rss_queue = ["1", "2", "3"] if self.nic in ['foxville', 'springville'] else ["3", "4", "5"] self.send_and_check(self.pkt2, rss_queue) # Create a flow director rule - if (self.nic in ["bartonhills", "powerville", "foxville"]): + if (self.nic in ["bartonhills", "powerville", "foxville", "springville"]): # Create a flow director rule self.dut.send_expect( "flow create 0 ingress pattern eth / ipv4 proto is 6 / udp dst is 50 / end actions queue index 1 / end", "created") @@ -596,7 +596,7 @@ class TestRSS_to_Rteflow(TestCase): self.send_and_check(self.pkt2, rss_queue) # There can't be more than one RSS queue rule existing. self.dut.send_expect("flow destroy 0 rule 1", "testpmd> ") - rss_queue = ["1", "2", "3"] if self.nic == 'foxville' else ["3", "4", "5"] + rss_queue = ["1", "2", "3"] if self.nic in ['foxville', 'springville'] else ["3", "4", "5"] self.send_and_check(self.pkt2, rss_queue) def test_queue_region_with_rss_rule_api(self): -- 2.18.2