[V1] tests/vm2vm_virtio_net_perf: fix script issue
Commit Message
1.Fix testcase 8 iperf test parameter wrong issue.
2.Use 'killall qemu-system-x86_64' command to kill qemu to avoid
when qemu exception can't quit issue.
Signed-off-by: Wei Ling <weix.ling@intel.com>
---
tests/TestSuite_vm2vm_virtio_net_perf.py | 36 ++++++++++++------------
1 file changed, 18 insertions(+), 18 deletions(-)
@@ -73,12 +73,16 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.device_str = None
self.checked_vm = False
self.dut.restore_interfaces()
+ self.path=self.dut.apps_name['test-pmd']
+ self.testpmd_name=self.path.split("/")[-1]
def set_up(self):
"""
run before each test case.
"""
self.dut.send_expect("rm -rf %s/vhost-net*" % self.base_dir, "#")
+ self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
+ self.dut.send_expect("killall qemu-system-x86_64", "#")
self.vm_dut = []
self.vm = []
@@ -291,8 +295,11 @@ class TestVM2VMVirtioNetPerf(TestCase):
return iperfdata
def stop_all_apps(self):
- for i in range(len(self.vm)):
- self.vm[i].stop()
+ try:
+ for i in range(len(self.vm)):
+ self.vm[i].stop()
+ except:
+ self.dut.send_expect("killall qemu-system-x86_64", "#")
self.pmd_vhost.quit()
def offload_capbility_check(self, vm_client):
@@ -338,20 +345,13 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.verify(md5_send == md5_revd, 'the received file is different with send file')
def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
+ for port in ports:
+ netdev = self.dut.ports_info[port]['port']
+ driver_now = netdev.get_nic_driver()
+ if driver == "":
+ driver = netdev.default_driver
+ if driver != driver_now:
+ netdev.bind_driver(driver=driver)
def test_vm2vm_split_ring_iperf_with_tso(self):
"""
@@ -490,7 +490,7 @@ class TestVM2VMVirtioNetPerf(TestCase):
self.vm_args = "disable-modern=false,mrg_rxbuf=on,csum=on,guest_csum=on,host_tso4=on,guest_tso4=on,guest_ecn=on,packed=on"
self.prepare_test_env(cbdma=True, no_pci=False, client_mode=False, enable_queues=1, nb_cores=2,
server_mode=False, opt_queue=None, combined=False, rxq_txq=None)
- self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='ufo')
+ self.start_iperf_and_verify_vhost_xstats_info(iperf_mode='tso')
def test_vm2vm_packed_ring_iperf_with_ufo(self):
"""
@@ -595,9 +595,9 @@ class TestVM2VMVirtioNetPerf(TestCase):
"""
run after each test case.
"""
+ self.bind_cbdma_device_to_kernel()
self.stop_all_apps()
self.dut.kill_all()
- self.bind_cbdma_device_to_kernel()
def tear_down_all(self):
"""