[V1] tests/dpdk_gro_lib:modify cbdma case set testpmd params after start vm

Message ID 20201103110232.110606-1-weix.ling@intel.com (mailing list archive)
State Accepted
Headers
Series [V1] tests/dpdk_gro_lib:modify cbdma case set testpmd params after start vm |

Commit Message

Ling, WeiX Nov. 3, 2020, 11:02 a.m. UTC
  modify cbdma case set testpmd params after start vm

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_dpdk_gro_lib.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
  

Comments

Ling, WeiX Nov. 3, 2020, 3:07 a.m. UTC | #1
Tested-by: Ling, Wei <weix.ling@intel.com>

Regards,
Ling Wei

> -----Original Message-----
> From: lingwei <weix.ling@intel.com>
> Sent: Tuesday, November 3, 2020 07:03 PM
> To: dts@dpdk.org
> Cc: Ling, WeiX <weix.ling@intel.com>
> Subject: [dts][PATCH V1] tests/dpdk_gro_lib:modify cbdma case set testpmd
> params after start vm
  
Tu, Lijuan Nov. 3, 2020, 4:35 a.m. UTC | #2
> modify cbdma case set testpmd params after start vm
> 
> Signed-off-by: lingwei <weix.ling@intel.com>

Applied
  

Patch

diff --git a/tests/TestSuite_dpdk_gro_lib.py b/tests/TestSuite_dpdk_gro_lib.py
index 1a4910a..ed3c810 100644
--- a/tests/TestSuite_dpdk_gro_lib.py
+++ b/tests/TestSuite_dpdk_gro_lib.py
@@ -163,11 +163,17 @@  class TestDPDKGROLib(TestCase):
             self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=igb_uio  %s' % self.pci, '# ', 20)
             eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=["'net_vhost0,iface=%s/vhost-net,queues=%s,dmas=[%s],dmathr=1024'" % (self.base_dir, queue, self.dmas_info)])
             self.testcmd_start = self.path + eal_param + " -- -i --txd=1024 --rxd=1024 --txq=2 --rxq=2"
+            self.vhost_user = self.dut.new_session(suite="user")
+            self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
         else:
             eal_param = self.dut.create_eal_parameters(cores=self.vhost_list, vdevs=['net_vhost0,iface=%s/vhost-net,queues=%s' % (self.base_dir, queue)])
             self.testcmd_start = self.path + eal_param + " -- -i  --enable-hw-vlan-strip --tx-offloads=0x00 --txd=1024 --rxd=1024"
-        self.vhost_user = self.dut.new_session(suite="user")
-        self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
+            self.vhost_user = self.dut.new_session(suite="user")
+            self.vhost_user.send_expect(self.testcmd_start, "testpmd> ", 120)
+            self.set_testpmd_params()
+
+    def set_testpmd_params(self, mode=1):
+        # set testpmd params
         self.vhost_user.send_expect("set fwd csum", "testpmd> ", 120)
         self.vhost_user.send_expect("stop", "testpmd> ", 120)
         self.vhost_user.send_expect("port stop 0", "testpmd> ", 120)
@@ -176,10 +182,10 @@  class TestDPDKGROLib(TestCase):
         self.vhost_user.send_expect("csum set ip hw 0", "testpmd> ", 120)
         self.vhost_user.send_expect("csum set tcp hw 1", "testpmd> ", 120)
         self.vhost_user.send_expect("csum set ip hw 1", "testpmd> ", 120)
-        if(mode == 1 or mode == 5):
+        if (mode == 1 or mode == 5):
             self.vhost_user.send_expect("set port 0 gro on", "testpmd> ", 120)
             self.vhost_user.send_expect("set gro flush 1", "testpmd> ", 120)
-        elif(mode == 2):
+        elif (mode == 2):
             self.vhost_user.send_expect("set port 0 gro on", "testpmd> ", 120)
             self.vhost_user.send_expect("set gro flush 2", "testpmd> ", 120)
         elif (mode == 3):
@@ -456,9 +462,8 @@  class TestDPDKGROLib(TestCase):
             'ifconfig %s %s up' %
             (self.vm1_intf, self.virtio_ip1), '#', 10)
         self.vm1_dut.send_expect('ethtool -L %s combined 2' % self.vm1_intf, '#', 10)
-        self.vm1_dut.send_expect(
-            'ethtool -K %s gro off' %
-            (self.vm1_intf), '#', 10)
+        self.vm1_dut.send_expect('ethtool -K %s gro off' %  (self.vm1_intf), '#', 10)
+        self.set_testpmd_params()
         self.vm1_dut.send_expect('iperf -s', '', 10)
         self.dut.send_expect('rm /root/iperf_client.log', '#', 10)
         out = self.dut.send_expect(