[dts][PATCH V3 1/2] tests/dynamic_queue: modify script according to dpdk code change

[dts][PATCH V3 1/2] tests/dynamic_queue: modify script according to dpdk code change

[Lingli Chen]

According to dpdk commit 3c4426db54fc(app/testpmd: do not poll stopped queues).
modify dynamic_queue: Tx stopped queue not display

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 test_plans/dynamic_queue_test_plan.rst |  4 ++--
 tests/TestSuite_dynamic_queue.py       | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test_plans/dynamic_queue_test_plan.rst b/test_plans/dynamic_queue_test_plan.rst
index 96cfcb8a..d22068a0 100644
--- a/test_plans/dynamic_queue_test_plan.rst
+++ b/test_plans/dynamic_queue_test_plan.rst
@@ -94,7 +94,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
   
 Setup this stopped queue on the port::
 
@@ -162,7 +162,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
 
 Reconfigure ring size as 512 for the stopped queues on port 0::
 
diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index ebbe869c..5a826bd1 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -163,13 +163,14 @@ class TestDynamicQueue(TestCase):
             out = self.dut_testpmd.execute_cmd("stop")
             tx_num = qringsize - 1
 
-            if self.nic in ["cavium_a063", "cavium_a064"]:
-                self.verify("TX-packets: 0" in out, "Fail to stop txq at runtime")
-            else:
-                # Check Tx stopped queue only transmits qringsize-1 packets
-                self.verify(
-                    "TX-packets: %d" % tx_num in out, "Fail to stop txq at runtime"
-                )
+            # check rxq start successful
+            self.verify("TX-packets:" in out, "txq start failed")
+            # check Tx stopped queue not display
+            self.verify(
+                "TX Port= 0/Queue={:>2}".format(queue) not in out,
+                "Fail to stop txq at runtime",
+            )
+
             if chgflag == 1:
                 chg_qringsize = qringsize % 1024 + 256
                 if qringsize == 512:
-- 
2.17.1

[dts][PATCH V3 2/2] tests/queue_start_stop: modify script according to dpdk code change

[Lingli Chen]

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

According to dpdk commit 3c4426db54fc(app/testpmd: do not poll stopped queues).
modify queue_start_stop: after set “port 0 txq 0 stop”, no print in testpmd.

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---

V3: modify test_plan add check tester port receive packets steps.
V2: modify script add verify no print "ports 0 queue 0 receive " in testpmd 

 test_plans/queue_start_stop_test_plan.rst | 28 +++++++++++++++++------
 tests/TestSuite_queue_start_stop.py       | 20 ++++++++--------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/test_plans/queue_start_stop_test_plan.rst b/test_plans/queue_start_stop_test_plan.rst
index de7c46d2..10c417ac 100644
--- a/test_plans/queue_start_stop_test_plan.rst
+++ b/test_plans/queue_start_stop_test_plan.rst
@@ -35,15 +35,29 @@ This case support PF (Intel® Ethernet 700 Series/Intel® Ethernet 800 Series/82
 
       printf("ports %u queue %u received %u packages\n", fs->rx_port, fs->rx_queue, nb_rx);
 
-#. Compile testpmd again, then run testpmd.
+#. Compile testpmd again, then run 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 fwd mac" to set fwd type
 #. Run "start" to start fwd package
-#. Start packet generator to transmit and receive packets
+
+#. Start a packet capture on the tester in the background::
+    tcpdump -i ens7  'ether[12:2] != 0x88cc'  -Q in -w /tmp/tester/sniff_ens7.pcap
+
+#. Start packet generator to transmit packets::
+    sendp([Ether(dst='3c:fd:fe:c1:0f:4c', src='00:00:20:00:00:00')/IP()/UDP()/Raw(load=b'XXXXXXXXXXXXXXXXXX')],iface="ens7",count=4,inter=0,verbose=False)
+
+#. Quit tcpdump and check tester port receive packets
+
 #. Run "port 0 rxq 0 stop" to stop rxq 0 in port 0
-#. Start packet generator to transmit and not receive packets
+#. Start packet generator to transmit and check tester port not receive packets
+
 #. Run "port 0 rxq 0 start" to start rxq 0 in port 0
-#. Run "port 1 txq 1 stop" to start txq 0 in port 1
-#. Start packet generator to transmit and not receive packets but in testpmd it is a "ports 0 queue 0 received 1 packages" print
-#. Run "port 1 txq 1 start" to start txq 0 in port 1
-#. Start packet generator to transmit and receive packets
+#. 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
+
+#. 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
 #. Test it again with VF
diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py
index 1df59a1b..b6f4ba96 100644
--- a/tests/TestSuite_queue_start_stop.py
+++ b/tests/TestSuite_queue_start_stop.py
@@ -137,17 +137,10 @@ class TestQueueStartStop(TestCase):
             out = self.dut.get_session_output()
         except Exception as e:
             raise IOError("queue start/stop forward failure: %s" % e)
-
-        if self.nic == "cavium_a063":
-            self.verify(
-                "ports 0 queue 0 receive 4 packages" in out,
-                "start queue revice package failed, out = %s" % out,
-            )
-        else:
-            self.verify(
-                "ports 0 queue 0 receive 1 packages\r\n" * 4 in out,
-                "start queue revice package failed, out = %s" % out,
-            )
+        self.verify(
+            "ports 0 queue 0 receive " not in out,
+            "start queue revice package failed, out = %s" % out,
+        )
 
         try:
             # start tx queue test
@@ -156,8 +149,13 @@ class TestQueueStartStop(TestCase):
             self.dut.send_expect("port 0 txq 0 start", "testpmd>")
             self.dut.send_expect("start", "testpmd>")
             self.check_forwarding([0, 0], self.nic)
+            out = self.dut.get_session_output()
         except Exception as e:
             raise IOError("queue start/stop forward failure: %s" % e)
+        self.verify(
+            "ports 0 queue 0 receive " in out,
+            "start queue revice package failed, out = %s" % out,
+        )
 
     def tear_down(self):
         """
-- 
2.17.1

[dts][PATCH V3 1/2] tests/dynamic_queue: modify script according to dpdk code change

[Lingli Chen]

According to dpdk commit 3c4426db54fc(app/testpmd: do not poll stopped queues).
modify dynamic_queue: Tx stopped queue not display

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
---
 test_plans/dynamic_queue_test_plan.rst |  4 ++--
 tests/TestSuite_dynamic_queue.py       | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test_plans/dynamic_queue_test_plan.rst b/test_plans/dynamic_queue_test_plan.rst
index 96cfcb8a..d22068a0 100644
--- a/test_plans/dynamic_queue_test_plan.rst
+++ b/test_plans/dynamic_queue_test_plan.rst
@@ -94,7 +94,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
   
 Setup this stopped queue on the port::
 
@@ -162,7 +162,7 @@ Stop one Tx queue on port 0::
 
 Set txonly forward, start testpmd
 
-Start testpmd, then stop, check this stopped queue only transmits 255 packets
+Start testpmd, then stop, check this stopped queue not display
 
 Reconfigure ring size as 512 for the stopped queues on port 0::
 
diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index ebbe869c..5a826bd1 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -163,13 +163,14 @@ class TestDynamicQueue(TestCase):
             out = self.dut_testpmd.execute_cmd("stop")
             tx_num = qringsize - 1
 
-            if self.nic in ["cavium_a063", "cavium_a064"]:
-                self.verify("TX-packets: 0" in out, "Fail to stop txq at runtime")
-            else:
-                # Check Tx stopped queue only transmits qringsize-1 packets
-                self.verify(
-                    "TX-packets: %d" % tx_num in out, "Fail to stop txq at runtime"
-                )
+            # check rxq start successful
+            self.verify("TX-packets:" in out, "txq start failed")
+            # check Tx stopped queue not display
+            self.verify(
+                "TX Port= 0/Queue={:>2}".format(queue) not in out,
+                "Fail to stop txq at runtime",
+            )
+
             if chgflag == 1:
                 chg_qringsize = qringsize % 1024 + 256
                 if qringsize == 512:
-- 
2.17.1