diff mbox series

[V1] Optimize script: wait_link_status_up after start testpmd

Message ID 1637562295-14806-1-git-send-email-yux.jiang@intel.com (mailing list archive)
State Accepted
Headers show
Series [V1] Optimize script: wait_link_status_up after start testpmd | expand

Checks

Context Check Description
ci/Intel-dts-suite-test success Testing OK

Commit Message

Yu Jiang Nov. 22, 2021, 6:24 a.m. UTC
optimize script: ddp_gtp_qregion&dual_vlan&external_memory&link_flowctrl&mtu_update&qos_api&scatter
wait_link_status_up after start testpmd or before send_packets to enhance script robustness

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 tests/TestSuite_ddp_gtp_qregion.py |  2 ++
 tests/TestSuite_dual_vlan.py       | 31 ++++++-------------------------
 tests/TestSuite_external_memory.py |  4 +++-
 tests/TestSuite_link_flowctrl.py   |  5 ++++-
 tests/TestSuite_mtu_update.py      |  1 +
 tests/TestSuite_qos_api.py         |  3 ++-
 tests/TestSuite_scatter.py         |  1 +
 7 files changed, 19 insertions(+), 28 deletions(-)

Comments

Yu Jiang Nov. 22, 2021, 7:41 a.m. UTC | #1
> -----Original Message-----
> From: Jiang, YuX <yux.jiang@intel.com>
> Sent: Monday, November 22, 2021 2:25 PM
> To: Lin, Xueqin <xueqin.lin@intel.com>; dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>
> Subject: [dts][PATCH V1] Optimize script: wait_link_status_up after start
> testpmd
> 
> optimize script:
> ddp_gtp_qregion&dual_vlan&external_memory&link_flowctrl&mtu_update
> &qos_api&scatter
> wait_link_status_up after start testpmd or before send_packets to enhance
> script robustness
> 
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>
Tested-by: Yu Jiang <yux.jiang@intel.com>
Tu, Lijuan Nov. 22, 2021, 2:51 p.m. UTC | #2
> -----Original Message-----
> From: Jiang, YuX <yux.jiang@intel.com>
> Sent: 2021年11月22日 15:42
> To: Lin, Xueqin <xueqin.lin@intel.com>; dts@dpdk.org
> Subject: RE: [dts][PATCH V1] Optimize script: wait_link_status_up after start
> testpmd
> 
> > -----Original Message-----
> > From: Jiang, YuX <yux.jiang@intel.com>
> > Sent: Monday, November 22, 2021 2:25 PM
> > To: Lin, Xueqin <xueqin.lin@intel.com>; dts@dpdk.org
> > Cc: Jiang, YuX <yux.jiang@intel.com>
> > Subject: [dts][PATCH V1] Optimize script: wait_link_status_up after
> > start testpmd
> >
> > optimize script:
> > ddp_gtp_qregion&dual_vlan&external_memory&link_flowctrl&mtu_update
> > &qos_api&scatter
> > wait_link_status_up after start testpmd or before send_packets to
> > enhance script robustness
> >
> > Signed-off-by: Yu Jiang <yux.jiang@intel.com>
> Tested-by: Yu Jiang <yux.jiang@intel.com>

Applied
diff mbox series

Patch

diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py
index e870db3..1fbb05c 100644
--- a/tests/TestSuite_ddp_gtp_qregion.py
+++ b/tests/TestSuite_ddp_gtp_qregion.py
@@ -322,6 +322,7 @@  class TestDdpGtpQregion(TestCase):
         self.dut_testpmd.execute_cmd('set fwd rxonly')
         self.dut_testpmd.execute_cmd('set verbose 1')
         self.dut_testpmd.execute_cmd('start')
+        self.dut_testpmd.wait_link_status_up(self.dut_ports[0])
         qnum = self.send_verify_fd(flowtype, keywords, 'word_opt')
         self.verify(qnum == 0, "Receive packet from wrong queue!!!")
         self.raw_packet_generate(flowtype)
@@ -385,6 +386,7 @@  class TestDdpGtpQregion(TestCase):
         self.dut_testpmd.execute_cmd('set fwd rxonly')
         self.dut_testpmd.execute_cmd('set verbose 1')
         self.dut_testpmd.execute_cmd('start')
+        self.dut_testpmd.wait_link_status_up(self.dut_ports[0])
         self.send_and_verify(flowtype, qmin, qmax, keyword)
 
     def test_outer_dst_contrl_gtpcq(self):
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index 0f9247f..f7dbcf6 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -87,18 +87,14 @@  class TestDualVlan(TestCase):
         global dutTxPortId
 
         # Based on h/w type, choose how many ports to use
-        ports = self.dut.get_ports(self.nic)
-        self.verify(len(ports) >= 2, "Insufficient ports")
-        self.ports_socket = self.dut.get_numa_id(ports[0])
+        self.dut_ports = self.dut.get_ports(self.nic)
+        self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
+        self.ports_socket = self.dut.get_numa_id(self.dut_ports[0])
 
         cores = self.dut.get_core_list('1S/2C/2T')
         coreMask = utils.create_mask(cores)
-
-        ports = self.dut.get_ports(self.nic)
-        valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
-
+        valports = [_ for _ in self.dut_ports if self.tester.get_local_port(_) != -1]
         portMask = utils.create_mask(valports[:2])
-
         dutRxPortId = valports[0]
         dutTxPortId = valports[1]
 
@@ -141,7 +137,8 @@  class TestDualVlan(TestCase):
         vlanString += 'IP(len=46)],iface="%s", count=4)' % txItf
 
         self.tester.scapy_append(vlanString)
-
+        # check link status before send pkg
+        self.pmdout.wait_link_status_up(self.dut_ports[0])
         self.tester.scapy_execute()
 
     def mode_config(self, **modeName):
@@ -185,17 +182,6 @@  class TestDualVlan(TestCase):
             else:
                 self.verify("%s %s" % (mode, modeName[mode]) in out, "%s setting error" % mode)
 
-    def verify_link_up(self):
-        ports = self.dut.get_ports(self.nic)
-        for port_id in range(len(ports)):
-            out = self.dut.send_expect("show port info %s" % port_id, "testpmd> ")
-            port_time_up = 0
-            while (port_time_up <= 10) and ("Link status: down" in out):
-                time.sleep(1)
-                out = self.dut.send_expect("show port info %s" % port_id, "testpmd> ")
-                port_time_up += 1
-            self.verify("Link status: down" not in out, "Port %s Link down, please check your link" % port_id)
-
     def multimode_test(self, caseIndex):
         """
         Setup Strip/Filter/Extend/Insert enable/disable for synthetic test.
@@ -217,7 +203,6 @@  class TestDualVlan(TestCase):
             self.dut.send_expect('tx_vlan set %s %s' % (dutTxPortId, txvlan), "testpmd> ")
             self.dut.send_expect('port start all', "testpmd> ")
             self.dut.send_expect('start', "testpmd> ")
-            self.verify_link_up()
 
         configMode = "Strip %s, filter %s 0x1, extend %s, insert %s" % (temp[0], temp[1], temp[2], "on" if (caseDef & txCase) != 0 else "off")
 
@@ -236,7 +221,6 @@  class TestDualVlan(TestCase):
                 self.dut.send_expect('tx_vlan reset %s' % dutTxPortId, "testpmd> ")
                 self.dut.send_expect('port start all', "testpmd> ")
                 self.dut.send_expect('start', "testpmd> ")
-                self.verify_link_up()
 
         else:
             self.dut.send_expect('rx_vlan add %s %s' % (invlan, dutRxPortId), "testpmd> ")
@@ -249,7 +233,6 @@  class TestDualVlan(TestCase):
                 self.dut.send_expect('tx_vlan reset %s' % dutTxPortId, "testpmd> ")
                 self.dut.send_expect('port start all', "testpmd> ")
                 self.dut.send_expect('start', "testpmd> ")
-                self.verify_link_up()
             self.dut.send_expect('rx_vlan rm %s %s' % (invlan, dutRxPortId), "testpmd> ")
             self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId), "testpmd> ")
 
@@ -378,7 +361,6 @@  class TestDualVlan(TestCase):
         self.dut.send_expect("tx_vlan set %s %s" % (dutTxPortId, txvlan), "testpmd> ")
         self.dut.send_expect("port start all", "testpmd> ")
         self.dut.send_expect("start", "testpmd> ")
-        self.verify_link_up()
 
         self.vlan_send_packet()
         out = self.get_tcpdump_package()
@@ -389,7 +371,6 @@  class TestDualVlan(TestCase):
         self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ")
         self.dut.send_expect("port start all", "testpmd> ")
         self.dut.send_expect("start", "testpmd> ")
-        self.verify_link_up()
 
         self.vlan_send_packet()
         out = self.get_tcpdump_package()
diff --git a/tests/TestSuite_external_memory.py b/tests/TestSuite_external_memory.py
index f68a9a6..2f862fa 100644
--- a/tests/TestSuite_external_memory.py
+++ b/tests/TestSuite_external_memory.py
@@ -40,6 +40,7 @@  import time
 
 import framework.utils as utils
 from framework.test_case import TestCase
+from framework.pmd_output import PmdOutput
 
 
 class TestExternalMemory(TestCase):
@@ -49,7 +50,7 @@  class TestExternalMemory(TestCase):
         """
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
-
+        self.pmdout = PmdOutput(self.dut)
         self.app_testpmd_path = self.dut.apps_name['test-pmd']
 
     def set_up(self):
@@ -134,6 +135,7 @@  class TestExternalMemory(TestCase):
 
     def verifier_result(self):
         self.dut.send_expect("start", "testpmd>",10)
+        self.pmdout.wait_link_status_up(self.dut_ports[0])
         self.scapy_send_packet(20)
         out = self.dut.send_expect("stop", "testpmd>", 10)
 
diff --git a/tests/TestSuite_link_flowctrl.py b/tests/TestSuite_link_flowctrl.py
index a102288..96ba231 100644
--- a/tests/TestSuite_link_flowctrl.py
+++ b/tests/TestSuite_link_flowctrl.py
@@ -134,6 +134,7 @@  class TestLinkFlowctrl(TestCase):
 
         self.dut.send_expect("set fwd csum", "testpmd> ")
         self.dut.send_expect("start", "testpmd> ", 60)
+        self.pmdout.wait_link_status_up(self.dutPorts[0])
 
     def pause_frame_loss_test(self, rx_flow_control='off',
                               tx_flow_control='off',
@@ -171,6 +172,7 @@  class TestLinkFlowctrl(TestCase):
         return port_stats
 
     def send_packets(self, frame):
+        self.pmdout.wait_link_status_up(self.dutPorts[0])
         tester_tx_port = self.tester.get_local_port(self.rx_port)
         tx_interface = self.tester.get_interface(tester_tx_port)
         tester_rx_port = self.tester.get_local_port(self.tx_port)
@@ -530,7 +532,7 @@  class TestLinkFlowctrl(TestCase):
         self.dut.send_expect("port stop 0", "testpmd> ")
         self.dut.send_expect("port start 0", "testpmd> ", 60)
         self.dut.send_expect("start", "testpmd> ", 60)
-
+        self.pmdout.wait_link_status_up(self.dutPorts[0])
         tgenInput = self.get_tgen_input()
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
@@ -555,6 +557,7 @@  class TestLinkFlowctrl(TestCase):
         self.dut.send_expect("port stop 0", "testpmd> ")
         self.dut.send_expect("port start 0", "testpmd> ", 60)
         self.dut.send_expect("start", "testpmd> ", 60)
+        self.pmdout.wait_link_status_up(self.dutPorts[0])
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
         if self.nic == "niantic":
diff --git a/tests/TestSuite_mtu_update.py b/tests/TestSuite_mtu_update.py
index ad13a8a..f16eb8e 100644
--- a/tests/TestSuite_mtu_update.py
+++ b/tests/TestSuite_mtu_update.py
@@ -235,6 +235,7 @@  class TestMtuUpdate(TestCase):
         self.exec("port start all")
         self.exec("set fwd mac")
         self.exec("start")
+        self.pmdout.wait_link_status_up(self.dut_ports[0])
         """
         On 1G NICs, when the jubmo frame MTU set > 1500, the software adjust it to MTU+4.
         """
diff --git a/tests/TestSuite_qos_api.py b/tests/TestSuite_qos_api.py
index 70b3d0d..82c4d0e 100644
--- a/tests/TestSuite_qos_api.py
+++ b/tests/TestSuite_qos_api.py
@@ -120,6 +120,7 @@  class TestQosApi(TestCase):
         self.dut.send_expect('port start all', 'testpmd> ')
 
     def scapy_send_packet_verify(self, n):
+        self.host_testpmd.wait_link_status_up(self.dut_ports[0])
         self.tester.scapy_foreground()
         dmac = self.dut.get_mac_address(P0)
         queues_4tc = [0, 32, 64, 96]
@@ -220,7 +221,7 @@  class TestQosApi(TestCase):
         self.perf_test(n)
 
     def perf_test(self, n):
-
+        self.host_testpmd.wait_link_status_up(self.dut_ports[0])
         dmac = self.dut.get_mac_address(self.dut_ports[0])
         pkts = []
         for i in range(n):
diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py
index 85312c5..499c0ab 100644
--- a/tests/TestSuite_scatter.py
+++ b/tests/TestSuite_scatter.py
@@ -110,6 +110,7 @@  class TestScatter(TestCase):
 
         self.dut.send_expect("set fwd mac", "testpmd> ", 120)
         self.dut.send_expect("start", "testpmd> ")
+        self.pmdout.wait_link_status_up(self.port)
 
         for offset in [-1, 0, 1, 4, 5]:
             ret = self.scatter_pktgen_send_packet(self.mbsize + offset)