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

[Herbert Guan <herbert.guan@arm.com>]

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@arm.com>
---
 conf/vf_port_start_stop.cfg           | 32 +++++++++++++++++++++++++++++++-
 tests/TestSuite_vf_port_start_stop.py |  4 ++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/conf/vf_port_start_stop.cfg b/conf/vf_port_start_stop.cfg
index 8576404..9840e86 100644
--- a/conf/vf_port_start_stop.cfg
+++ b/conf/vf_port_start_stop.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 | ...]
@@ -63,13 +80,14 @@
 #               prop_addr: 0x3
 #
 # monitor
-#       port: 6061   
+#       port: 6061
 #           note: if adding monitor to vm, need to specicy
 #                 this port, else it will get a free port
 #                 on the host machine.
 #
 # serial_port
 #       enable: [yes | no]
+#       opt_type: [pty | unix]
 #
 # vnc
 #       displayNum: 1
@@ -83,20 +101,32 @@
 
 # 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=4,cpupin=5 6 7 8 9; 
 disk =
     file=/home/image/fedora23.img;
+# Example for libvirt:
+#    file=/var/lib/libvirt/images/DTSVM.qcow2,opt_format=qcow2,opt_bus=scsi,opt_dev=sda,opt_controller=virtio-scsi;
 mem =
     size=8196
 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=11;
+# 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_port_start_stop.py b/tests/TestSuite_vf_port_start_stop.py
index 3ebee73..a9e88d8 100644
--- a/tests/TestSuite_vf_port_start_stop.py
+++ b/tests/TestSuite_vf_port_start_stop.py
@@ -3,7 +3,7 @@
 import re
 import time
 
-from qemu_kvm import QEMUKvm
+from virt_common import VM
 from test_case import TestCase
 from pmd_output import PmdOutput
 from utils import RED, GREEN
@@ -180,7 +180,7 @@ class TestVfPortStartStop(TestCase):
                 self.host_testpmd.start_testpmd("1S/2C/2T", eal_param=eal_param)
 
             # set up VM0 ENV
-            self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_port_start_stop')
+            self.vm0 = VM(self.dut, 'vm0', 'vf_port_start_stop')
             self.vm0.set_vm_device(driver=self.vf_assign_method, **vf0_prop)
             self.vm0.set_vm_device(driver=self.vf_assign_method, **vf1_prop)
             self.vm_dut_0 = self.vm0.start()
-- 
1.8.3.1