test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V3] tests/generic_filter: use flow api replace legancy
@ 2021-06-21 10:10 Zhimin Huang
  2021-07-26  6:07 ` Tu, Lijuan
  0 siblings, 1 reply; 2+ messages in thread
From: Zhimin Huang @ 2021-06-21 10:10 UTC (permalink / raw)
  To: dts; +Cc: Zhimin Huang

*.use flow api replace legancy filter command

Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 tests/TestSuite_generic_filter.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/TestSuite_generic_filter.py b/tests/TestSuite_generic_filter.py
index d4ea8926..b34c9dd0 100644
--- a/tests/TestSuite_generic_filter.py
+++ b/tests/TestSuite_generic_filter.py
@@ -729,7 +729,6 @@ class TestGeneric_filter(TestCase):
                 "vlan set filter off %s" % valports[0], "testpmd> ")
             self.dut.send_expect(
                 "vlan set filter off %s" % valports[1], "testpmd> ")
-            frames_to_send = 1
             queue = ['64', '127', '128']
 
             for i in [0, 1, 2]:
@@ -739,30 +738,31 @@ class TestGeneric_filter(TestCase):
                     if 'Invalid RX queue %s' % (queue[i]) not in out:
                         set_filter_flag = 0
                         break
-                    out = self.dut.send_expect(
-                        "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port %s src_port 1 protocol 0x06 mask 0x1f tcp_flags 0x0 priority 3 queue %s " % (valports[0], (i + 1), queue[i]), "testpmd> ")
-                    if 'error' not in out:
+                    cmd = "flow create {} ingress pattern eth / ".format(
+                        valports[0]) + "ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is {} src is 1 / ".format(
+                        i + 1) + "end actions queue index {} / end".format(queue[i])
+                    out = self.dut.send_expect(cmd, "testpmd> ")
+                    if 'Invalid argument' not in out:
                         set_filter_flag = 0
                         break
                     continue
                 else:
                     self.dut.send_expect("set stat_qmap rx %s %s %s" %
                                          (valports[0], queue[i], (i + 1)), "testpmd> ")
-                    out = self.dut.send_expect("5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port %s src_port 1 protocol 0x06 mask 0x1f tcp_flags 0x0 priority %d queue %s " % (
-                        valports[0], (i + 1), (3 - i), queue[i]), "testpmd> ")
+                    cmd = "flow create {} ingress pattern eth / ".format(
+                        valports[0]) + "ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is {} src is 1 / ".format(
+                        i + 1) + "end actions queue index {} / end".format(queue[i])
+                    self.dut.send_expect(cmd, "testpmd> ")
                     self.dut.send_expect("start", "testpmd> ", 120)
                 global filters_index
                 filters_index = i
                 self.filter_send_packet("packet")
                 time.sleep(1)
                 out = self.dut.send_expect("stop", "testpmd> ")
-                cmd = "Stats reg  %s RX-packets:             ([0-9]+)" % (
-                    i + 1)
-                result_scanner = r"%s" % cmd
-                scanner = re.compile(result_scanner, re.DOTALL)
-                m = scanner.search(out)
-                cur_pkt = m.group(1)
-                if int(cur_pkt) != frames_to_send:
+                p = re.compile(r"Forward Stats for RX Port= \d+/Queue=(\s?\d+)")
+                res = p.findall(out)
+                queues = [int(i) for i in res]
+                if queues[0] != int(queue[i]):
                     packet_flag = 0
                     break
             self.dut.send_expect("quit", "#", timeout=30)
-- 
2.17.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dts] [PATCH V3] tests/generic_filter: use flow api replace legancy
  2021-06-21 10:10 [dts] [PATCH V3] tests/generic_filter: use flow api replace legancy Zhimin Huang
@ 2021-07-26  6:07 ` Tu, Lijuan
  0 siblings, 0 replies; 2+ messages in thread
From: Tu, Lijuan @ 2021-07-26  6:07 UTC (permalink / raw)
  To: Huang, ZhiminX, dts; +Cc: Huang, ZhiminX

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhimin Huang
> Sent: 2021年6月21日 18:11
> To: dts@dpdk.org
> Cc: Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: [dts] [PATCH V3] tests/generic_filter: use flow api replace legancy
> 
> *.use flow api replace legancy filter command
> 
> Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com>

Applied

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-26  6:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-21 10:10 [dts] [PATCH V3] tests/generic_filter: use flow api replace legancy Zhimin Huang
2021-07-26  6:07 ` Tu, Lijuan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).