[dts] [PATCH v1 4/8] tests/vf_rss: use virt_common for VM creation

Herbert Guan herbert.guan at arm.com
Fri Feb 9 07:26:01 CET 2018


Use 'VM' form virt_common instead of 'QEMUKvm' from qemu_kvm for VM
creation.  This will allow VM type selection (kvm/libvirt etc.) for
each VM defined in test suite's config file.


Signed-off-by: Herbert Guan <herbert.guan at arm.com>
---
 conf/vf_rss.cfg           | 30 ++++++++++++++++++++++++++++++
 tests/TestSuite_vf_rss.py |  4 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/conf/vf_rss.cfg b/conf/vf_rss.cfg
index 8e6025f..31c9204 100644
--- a/conf/vf_rss.cfg
+++ b/conf/vf_rss.cfg
@@ -2,6 +2,15 @@
 # name
 #       name: vm0
 #
+# virt_type
+#       virt_type: [ KVM | LIBVIRT ]
+#
+# os
+#       loader:  /path/to/loader/file.fd
+#           note: applicable for libvirt only
+#       nvram:   /path/to/nvram/file.fd
+#           note: applicable for libvirt only
+#
 # enable_kvm
 #       enable: [yes | no]
 #
@@ -15,9 +24,17 @@
 #
 # mem
 #       size: 1024
+#           note: Set VM memory size in MB
 #
 # disk
 #       file: /path/to/image/test.img
+#       opt_format: [ raw | qcow2 | ... ]
+#       opt_bus:  [ virtio | scsi | ... ]
+#            note: applicable for libvirt only
+#       opt_dev:  [ sda | sdb | vda | ... ]
+#            note: applicable for libvirt only
+#       opt_controller:  [ virtio-scsi | ...]
+#            note: applicable for libvirt only
 #
 # net
 #        type: [nic | user | tap | bridge | ...]
@@ -70,6 +87,7 @@
 #
 # serial_port
 #       enable: [yes | no]
+#       opt_type: [pty | unix]
 #
 # vnc
 #       displayNum: 1
@@ -83,18 +101,30 @@
 
 # vm configuration for pmd sriov case
 [vm0]
+# Default virt_type is KVM
+#virt_type =
+#    virt_type=LIBVIRT;
+# os option is applicable for libvirt only
+#os =
+#    loader=/usr/share/AAVMF/AAVMF_CODE.fd,nvram=/var/lib/libvirt/qemu/nvram/DTSVM_VARS.fd;
 cpu =
     model=host,number=8,cpupin=5 6 7 8 9 10 11 12 ;
 disk =
     file=/home/image/fedora23-ok.img;
+# Example for libvirt:
+#    file=/var/lib/libvirt/images/DTSVM.qcow2,opt_format=qcow2,opt_bus=scsi,opt_dev=sda,opt_controller=virtio-scsi;
 login =
     user=root,password=tester;
+# net option is not necessary for libvirt, comment out below 2 lines if using libvirt
 net = 
    type=nic,opt_vlan=0;
    type=user,opt_vlan=0; 
+# monitor option is not supported by libvirt yet, comment out below 2 lines if using libvirt
 monitor = 
     port=;
+# vnc option is not supported by libvirt yet, comment out below 2 lines if using libvirt
 vnc = 
     displayNum=1;
+# daemon option is not supported by libvirt yet, comment out below 2 lines if using libvirt
 daemon =
     enable=yes;
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index 33591b5..f2730e7 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -44,7 +44,7 @@ reta_lines = []
 # and collect the hash result of five tuple and the queue id.
 from test_case import TestCase
 from pmd_output import PmdOutput
-from qemu_kvm import QEMUKvm
+from virt_common import VM
 
 class TestVfRss(TestCase):
 
@@ -262,7 +262,7 @@ class TestVfRss(TestCase):
                 self.host_testpmd.start_testpmd("1S/2C/2T", eal_param=eal_param)
 
             # set up VM0 ENV
-            self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_rss')
+            self.vm0 = VM(self.dut, 'vm0', 'vf_rss')
             self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prot)
 
             self.vm_dut_0 = self.vm0.start()
-- 
1.8.3.1



More information about the dts mailing list