RE: [dts][PATCH V2 2/2] test_plans/generic_flow_api_test_plan:remove dpdk code modification.

RE: [dts][PATCH V2 2/2] test_plans/generic_flow_api_test_plan:remove dpdk code modification.

[Tu, Lijuan]

> -----Original Message-----
> From: Li, WeiyuanX <weiyuanx.li@intel.com>
> Sent: 2022年2月10日 17:31
> To: dts@dpdk.org; Tu, Lijuan <lijuan.tu@intel.com>
> Cc: Li, WeiyuanX <weiyuanx.li@intel.com>
> Subject: [dts][PATCH V2 2/2] test_plans/generic_flow_api_test_plan:remove
> dpdk code modification.
> 
> Sync modify the test plan remove dpdk code modification.
> 
> Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>

Series applied.

[dts][PATCH V2 1/2] tests/TestSuite_generic_flow_api:remove dpdk code modification.

[Weiyuan Li]

Default use 64 queues for test.
Remove dpdk code modification.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---

v2:
-Modify number of dpdk-testpmd cores in the test plan.

 tests/TestSuite_generic_flow_api.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index 23143be8..80dae50d 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -2624,17 +2624,15 @@ class TestGeneric_flow_api(TestCase):
         self.tester.send_expect("ifconfig %s mtu %s" % (txItf, 1500), "# ")
         self.tester.send_expect("ifconfig %s mtu %s" % (rxItf, 1500), "# ")
 
-    def test_128_queues(self):
+    def test_64_queues(self):
 
         set_filter_flag = 1
         packet_flag = 1
         if self.kdriver == "ixgbe":
-            self.dut.send_expect("sed -i -e 's/#define IXGBE_NONE_MODE_TX_NB_QUEUES 64$/#define IXGBE_NONE_MODE_TX_NB_QUEUES 128/' drivers/net/ixgbe/ixgbe_ethdev.h", "# ",30)
-            self.dut.build_install_dpdk(self.target)
             global valports
-            total_mbufs = self.request_mbufs(128) * len(valports)
+            total_mbufs = self.request_mbufs(64) * len(valports)
             self.pmdout.start_testpmd(
-                "all", "--disable-rss --rxq=128 --txq=128 --portmask=%s --nb-cores=4 --total-num-mbufs=%d" % (portMask, total_mbufs))
+                "all", "--disable-rss --rxq=64 --txq=64 --portmask=%s --nb-cores=4 --total-num-mbufs=%d" % (portMask, total_mbufs))
             self.dut.send_expect(
                 "set stat_qmap rx %s 0 0" % valports[0], "testpmd> ")
             self.dut.send_expect(
@@ -2647,7 +2645,7 @@ class TestGeneric_flow_api(TestCase):
                 "vlan set filter off %s" % valports[0], "testpmd> ")
             self.dut.send_expect(
                 "vlan set filter off %s" % valports[1], "testpmd> ")
-            queue = ['64', '127', '128']
+            queue = ['16', '32', '64']
             for i in [0, 1, 2]:
                 if i == 2:
                     out = self.dut.send_expect(
@@ -2686,8 +2684,6 @@ class TestGeneric_flow_api(TestCase):
                     packet_flag = 0
                     break
             self.dut.send_expect("quit", "#", timeout=30)
-            self.dut.send_expect("sed -i -e 's/#define IXGBE_NONE_MODE_TX_NB_QUEUES 128$/#define IXGBE_NONE_MODE_TX_NB_QUEUES 64/' drivers/net/ixgbe/ixgbe_ethdev.h", "# ",30)
-            self.dut.build_install_dpdk(self.target)
             self.verify(set_filter_flag == 1, "set filters error")
             self.verify(packet_flag == 1, "packet pass assert error")
         else:
-- 
2.27.0

[dts][PATCH V2 2/2] test_plans/generic_flow_api_test_plan:remove dpdk code modification.

[Weiyuan Li]

Sync modify the test plan remove dpdk code modification.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---

v2:
-Modify number of dpdk-testpmd cores in the test plan.

 test_plans/generic_flow_api_test_plan.rst | 28 +++++++++--------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/test_plans/generic_flow_api_test_plan.rst b/test_plans/generic_flow_api_test_plan.rst
index c4c0301e..98baec62 100644
--- a/test_plans/generic_flow_api_test_plan.rst
+++ b/test_plans/generic_flow_api_test_plan.rst
@@ -2213,20 +2213,14 @@ the packet are not received on the queue 2::
 
     testpmd> stop
 
-Test Case: 128 queues
+Test Case: 64 queues
 ========================
 
-This case is designed for NIC(niantic). Since NIC(niantic) has 128 transmit
-queues, it should be supports 128 kinds of filter if Hardware have enough
-cores.
-DPDK enable 64 queues in ixgbe driver by default. Enlarge queue number to 128
-for 128 queues test::
-
-    sed -i -e 's/#define IXGBE_NONE_MODE_TX_NB_QUEUES 64$/#define IXGBE_NONE_MODE_TX_NB_QUEUES 128/' drivers/net/ixgbe/ixgbe_ethdev.h
+This case is designed for NIC(niantic). Default use 64 queues for test
 
 Launch the app ``testpmd`` with the following arguments::
 
-    ./dpdk-testpmd -l 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53 -n 4 -- -i --disable-rss --rxq=128 --txq=128 --portmask=0x3 --nb-cores=4      --total-num-mbufs=263168
+    ./dpdk-testpmd -l 1,2,3,4,5 -n 4 -- -i --disable-rss --rxq=64 --txq=64 --portmask=0x3 --nb-cores=4 --total-num-mbufs=263168
 
     testpmd>set stat_qmap rx 0 0 0
     testpmd>set stat_qmap rx 1 0 0
@@ -2235,17 +2229,17 @@ Launch the app ``testpmd`` with the following arguments::
     testpmd>vlan set filter off 0
     testpmd>vlan set filter off 1
 
-Create the 5-tuple Filters with different queues (64,127) on port 0 for
+Create the 5-tuple Filters with different queues (32,63) on port 0 for
 niantic::
 
-    testpmd> set stat_qmap rx 0 64 1
-    testpmd> flow create 0 ingress pattern eth / ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is 1 src is 1 / end actions queue index 64 / end
-    testpmd> set stat_qmap rx 0 127 2
-    testpmd> flow create 0 ingress pattern eth / ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is 2 src is 1 / end actions queue index 127 / end
+    testpmd> set stat_qmap rx 0 32 1
+    testpmd> flow create 0 ingress pattern eth / ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is 1 src is 1 / end actions queue index 32 / end
+    testpmd> set stat_qmap rx 0 63 2
+    testpmd> flow create 0 ingress pattern eth / ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is 2 src is 1 / end actions queue index 63 / end
 
 Send packets(`dst_ip` = 2.2.2.5 `src_ip` = 2.2.2.4 `dst_port` = 1 `src_port` =
 1 `protocol` = tcp) and (`dst_ip` = 2.2.2.5 `src_ip` = 2.2.2.4 `dst_port` = 2
 `src_port` = 1 `protocol` = tcp ). Then reading the stats for port 0 after
-sending packets. packets are received on the queue 64 and queue 127 When
-setting 5-tuple Filter with queue(128), it will display failure because the
-number of queues no more than 128.
+sending packets. packets are received on the queue 32 and queue 63 When
+setting 5-tuple Filter with queue(64), it will display failure because the
+number of queues no more than 64.
-- 
2.27.0