[dts][PATCH V1 1/2] test_plans/queue_start_stop: optimize test_plans to remove re-compile dpdk test step

[dts][PATCH V1 1/2] test_plans/queue_start_stop: optimize test_plans to remove re-compile dpdk test step

[Lingli Chen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1837 bytes --]

remove re-compile dpdk test step

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 test_plans/queue_start_stop_test_plan.rst | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/test_plans/queue_start_stop_test_plan.rst b/test_plans/queue_start_stop_test_plan.rst
index aecdb095..44b9c2df 100644
--- a/test_plans/queue_start_stop_test_plan.rst
+++ b/test_plans/queue_start_stop_test_plan.rst
@@ -31,13 +31,10 @@ Test Case: queue start/stop
 
 This case support PF (Intel® Ethernet 700 Series/Intel® Ethernet 800 Series/82599), VF (Intel® Ethernet 700 Series, 82599)
 
-#. Update testpmd source code. Add the following C code in ./app/test-pmd/fwdmac.c::
-
-      printf("ports %u queue %u received %u packages\n", fs->rx_port, fs->rx_queue, nb_rx);
-
-#. Compile testpmd again, then run testpmd::
+#. Launch testpmd::
     x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -l 1-2 -n 4 -a 0000:af:00.0 -- -i --portmask=0x1 --port-topology=loop
 
+#. Run "set verbose 1" to set verbose
 #. Run "set fwd mac" to set fwd type
 #. Run "start" to start fwd package
 
@@ -55,9 +52,9 @@ This case support PF (Intel® Ethernet 700 Series/Intel® Ethernet 800 Series/82
 #. Run "port 0 rxq 0 start" to start rxq 0 in port 0
 #. Run "port 0 txq 0 stop" to stop txq 0 in port 0
 #. Start packet generator to transmit and check tester port not receive packets
-   and in testpmd it not has "ports 0 queue 0 received 1 packages" print
+   and in testpmd it not has "port 0/queue 0: received 1 packets" print
 
 #. Run "port 0 txq 0 start" to start txq 0 in port 0
 #. Start packet generator to transmit and check tester port receive packets
-   and in testpmd it has "ports 0 queue 0 received 1 packages" print
+   and in testpmd it has "port 0/queue 0: received 1 packets" print
 #. Test it again with VF
-- 
2.17.1

[dts][PATCH V1 2/2] tests/queue_start_stop: optimize test script to remove re-compile dpdk test

[Lingli Chen]

remove re-compile dpdk test step to sync with test_plans

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 tests/TestSuite_queue_start_stop.py | 43 +++--------------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py
index 80baf8d6..cfae1ada 100644
--- a/tests/TestSuite_queue_start_stop.py
+++ b/tests/TestSuite_queue_start_stop.py
@@ -43,21 +43,7 @@ class TestQueueStartStop(TestCase):
         """
         Run before each test case.
         """
-        try:
-            patch_file = FOLDERS["Depends"] + r"/macfwd_log.patch"
-        except:
-            self.logger.warning(str(FOLDERS))
-            patch_file = r"dep/macfwd_log.patch"
-            FOLDERS["Depends"] = "dep"
-        patch_dst = "/tmp/"
-
-        # dpdk patch and build
-        try:
-            self.dut.session.copy_file_to(patch_file, patch_dst)
-            self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", True)
-            self.dut.build_install_dpdk(self.target)
-        except Exception as e:
-            raise IOError("dpdk setup failure: %s" % e)
+        pass
 
     def check_forwarding(self, ports, nic, pktSize=64, received=True):
         self.send_packet(ports[0], ports[1], self.nic, pktSize, received)
@@ -85,20 +71,6 @@ class TestQueueStartStop(TestCase):
         else:
             self.verify(len(sniff_pkts) == 0, "stop queue not work as expected")
 
-    def patch_hotfix_dpdk(self, patch_dir, on=True):
-        """
-        This function is to apply or remove patch for dpdk.
-        patch_dir: the abs path of the patch
-        on: True for apply, False for remove
-        """
-        try:
-            if on:
-                self.dut.send_expect("patch -p0 < %s" % patch_dir, "[~|~\]]# ")
-            else:
-                self.dut.send_expect("patch -p0 -R < %s" % patch_dir, "[~|~\]]# ")
-        except Exception as e:
-            raise ValueError("patch_hotfix_dpdk failure: %s" % e)
-
     def test_queue_start_stop(self):
         """
         queue start/stop test
@@ -114,6 +86,7 @@ class TestQueueStartStop(TestCase):
             )
             time.sleep(5)
             self.dut.send_expect("set fwd mac", "testpmd>")
+            self.dut.send_expect("set verbose 1", "testpmd>")
             self.dut.send_expect("start", "testpmd>")
             self.check_forwarding([0, 0], self.nic)
         except Exception as e:
@@ -138,7 +111,7 @@ class TestQueueStartStop(TestCase):
         except Exception as e:
             raise IOError("queue start/stop forward failure: %s" % e)
         self.verify(
-            "ports 0 queue 0 receive " not in out,
+            "port 0/queue 0: received 1 packets" not in out,
             "start queue revice package failed, out = %s" % out,
         )
 
@@ -153,7 +126,7 @@ class TestQueueStartStop(TestCase):
         except Exception as e:
             raise IOError("queue start/stop forward failure: %s" % e)
         self.verify(
-            "ports 0 queue 0 receive " in out,
+            "port 0/queue 0: received 1 packets" in out,
             "start queue revice package failed, out = %s" % out,
         )
 
@@ -161,7 +134,6 @@ class TestQueueStartStop(TestCase):
         """
         Run after each test case.
         """
-        patch_dst = "/tmp/"
 
         try:
             self.dut.send_expect("stop", "testpmd>")
@@ -169,13 +141,6 @@ class TestQueueStartStop(TestCase):
         except:
             print("Failed to quit testpmd")
 
-        self.dut.kill_all()
-
-        try:
-            self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", False)
-        except Exception as e:
-            print(("patch_hotfix_dpdk remove failure :%s" % e))
-
     def tear_down_all(self):
         """
         Run after each test suite.
-- 
2.17.1

Re: [dts][PATCH V1 2/2] tests/queue_start_stop: optimize test script to remove re-compile dpdk test

[David Marchand]

On Thu, Apr 6, 2023 at 9:38 AM Lingli Chen <linglix.chen@intel.com> wrote:
>
> remove re-compile dpdk test step to sync with test_plans
>
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> ---
>  tests/TestSuite_queue_start_stop.py | 43 +++--------------------------

The dep/macfwd_log.patch file can be removed.


-- 
David Marchand

RE: [dts][PATCH V1 2/2] tests/queue_start_stop: optimize test script to remove re-compile dpdk test

[Chen, LingliX]

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Thursday, April 6, 2023 3:42 PM
> To: Chen, LingliX <linglix.chen@intel.com>
> Cc: dts@dpdk.org; Huang, ZhiminX <zhiminx.huang@intel.com>
> Subject: Re: [dts][PATCH V1 2/2] tests/queue_start_stop: optimize test script
> to remove re-compile dpdk test
> 
> On Thu, Apr 6, 2023 at 9:38 AM Lingli Chen <linglix.chen@intel.com> wrote:
> >
> > remove re-compile dpdk test step to sync with test_plans
> >
> > Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> > ---
> >  tests/TestSuite_queue_start_stop.py | 43 +++--------------------------
> 
> The dep/macfwd_log.patch file can be removed.
> 
> 
> --
> David Marchand

Yes. Thanks for the reminde.

Regards,
Chen, Lingli