[dts] [PATCH V1] tests/rss_to_rte_flow:support nic springville

[Tu, Lijuan]

Applied, thanks

> -----Original Message-----
> From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of Mei Jianwei
> Sent: Friday, April 24, 2020 9:27 PM
> To: dts at dpdk.org
> Cc: root <root at localhost.localdomain>
> Subject: [dts] [PATCH V1] tests/rss_to_rte_flow:support nic springville
> 
> From: root <root at localhost.localdomain>
> 
> add NIC springville.
> 
> Signed-off-by: root <root at localhost.localdomain>
> ---
>  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