[v1] tests/TestSuite_vhost_user_live_migration.py

Message ID 20201104154533.65072-1-yinan.wang@intel.com (mailing list archive)
State Accepted
Headers
Series [v1] tests/TestSuite_vhost_user_live_migration.py |

Commit Message

Wang, Yinan Nov. 4, 2020, 3:45 p.m. UTC
Delete dequeue zero copy case and change test with vfio-pci to instead of igb_uio.

Signed-off-by: Yinan Wang <yinan.wang@intel.com>
---
 tests/TestSuite_vhost_user_live_migration.py | 44 --------------------
 1 file changed, 44 deletions(-)
  

Comments

Tu, Lijuan Nov. 11, 2020, 3:31 a.m. UTC | #1
> Delete dequeue zero copy case and change test with vfio-pci to instead of
> igb_uio.
> 
> Signed-off-by: Yinan Wang <yinan.wang@intel.com>

Applied
  

Patch

diff --git a/tests/TestSuite_vhost_user_live_migration.py b/tests/TestSuite_vhost_user_live_migration.py
index ed58901..351b9e6 100644
--- a/tests/TestSuite_vhost_user_live_migration.py
+++ b/tests/TestSuite_vhost_user_live_migration.py
@@ -397,7 +397,6 @@  class TestVhostUserLiveMigration(TestCase):
         self.launch_testpmd_as_vhost_on_both_dut()
         self.start_testpmd_with_fwd_mode_on_both_dut()
         self.setup_vm_env_on_both_dut()
-
         # bind virtio-net back to virtio-pci
         self.bind_nic_driver_of_vm(self.vm_dut_host, driver="")
         self.start_tcpdump_on_vm(self.vm_dut_host)
@@ -409,26 +408,7 @@  class TestVhostUserLiveMigration(TestCase):
         self.launch_testpmd_as_vhost_on_both_dut()
         self.start_testpmd_with_fwd_mode_on_both_dut()
         self.setup_vm_env_on_both_dut()
-        # bind virtio-net to igb_uio
-        self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
-        self.start_testpmd_on_vm(self.vm_dut_host)
-
-        self.send_and_verify(self.verify_dpdk)
-
-    def test_migrate_with_split_ring_virtio_pmd_zero_copy(self):
-        self.queue_number = 1
-        zero_copy = True
-        # start testpmd and qemu on dut
-        # after qemu start ok, then send 'start' command to testpmd
-        # if send 'start' command before start qemu, maybe qemu will start failed
-        self.launch_testpmd_as_vhost_on_both_dut(zero_copy)
-        self.setup_vm_env_on_both_dut()
-        self.start_testpmd_with_fwd_mode_on_both_dut()
-
-        # bind virtio-net to igb_uio
-        self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
         self.start_testpmd_on_vm(self.vm_dut_host)
-
         self.send_and_verify(self.verify_dpdk)
 
     def test_migrate_with_packed_ring_virtio_pmd(self):
@@ -436,27 +416,7 @@  class TestVhostUserLiveMigration(TestCase):
         self.launch_testpmd_as_vhost_on_both_dut()
         self.start_testpmd_with_fwd_mode_on_both_dut()
         self.setup_vm_env_on_both_dut(packed=True)
-
-        # bind virtio-net to igb_uio
-        self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
-        self.start_testpmd_on_vm(self.vm_dut_host)
-
-        self.send_and_verify(self.verify_dpdk)
-
-    def test_migrate_with_packed_ring_virtio_pmd_zero_copy(self):
-        self.queue_number = 1
-        zero_copy = True
-        # start testpmd and qemu on dut
-        # after qemu start ok, then send 'start' command to testpmd
-        # if send 'start' command before start qemu, maybe qemu will start failed
-        self.launch_testpmd_as_vhost_on_both_dut(zero_copy)
-        self.setup_vm_env_on_both_dut(packed=True)
-        self.start_testpmd_with_fwd_mode_on_both_dut()
-
-        # bind virtio-net to igb_uio
-        self.bind_nic_driver_of_vm(self.vm_dut_host, driver="igb_uio")
         self.start_testpmd_on_vm(self.vm_dut_host)
-
         self.send_and_verify(self.verify_dpdk)
 
     def test_migrate_with_packed_ring_virtio_net(self):
@@ -468,12 +428,10 @@  class TestVhostUserLiveMigration(TestCase):
         self.launch_testpmd_as_vhost_on_both_dut()
         self.start_testpmd_with_fwd_mode_on_both_dut()
         self.setup_vm_env_on_both_dut(packed=True)
-
         # bind virtio-net back to virtio-pci
         self.bind_nic_driver_of_vm(self.vm_dut_host, driver="")
         # start screen and tcpdump on vm
         self.start_tcpdump_on_vm(self.vm_dut_host)
-
         self.send_and_verify(self.verify_kernel)
 
     def test_adjust_packed_ring_virtio_net_queue_numbers_while_migreting_with_virtio_net(self):
@@ -481,11 +439,9 @@  class TestVhostUserLiveMigration(TestCase):
         self.launch_testpmd_as_vhost_on_both_dut()
         self.start_testpmd_with_fwd_mode_on_both_dut()
         self.setup_vm_env_on_both_dut(packed=True)
-
         # bind virtio-net back to virtio-pci
         self.bind_nic_driver_of_vm(self.vm_dut_host, driver="")
         self.start_tcpdump_on_vm(self.vm_dut_host)
-
         self.send_and_verify(self.verify_kernel, True)
 
     def tear_down(self):