From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id EFA9E1B358 for ; Mon, 12 Feb 2018 10:58:29 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 70E9515AB; Mon, 12 Feb 2018 01:58:29 -0800 (PST) Received: from lenovo-a010984.shanghai.arm.com (lenovo-a010984.shanghai.arm.com [10.169.40.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 01D1F3F41F; Mon, 12 Feb 2018 01:58:28 -0800 (PST) From: Herbert Guan To: dts@dpdk.org Cc: Herbert Guan Date: Mon, 12 Feb 2018 17:57:41 +0800 Message-Id: <1518429462-30299-9-git-send-email-herbert.guan@arm.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518429462-30299-1-git-send-email-herbert.guan@arm.com> References: <1518157565-17167-1-git-send-email-herbert.guan@arm.com> <1518429462-30299-1-git-send-email-herbert.guan@arm.com> Subject: [dts] [PATCH v2 8/9] tests/vf_jumboframe: use virt_common for VM creation X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2018 09:58:30 -0000 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 --- conf/vf_jumboframe.cfg | 12 +++++++++++- tests/TestSuite_vf_jumboframe.py | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/conf/vf_jumboframe.cfg b/conf/vf_jumboframe.cfg index 94e68b4..a73e427 100644 --- a/conf/vf_jumboframe.cfg +++ b/conf/vf_jumboframe.cfg @@ -1,11 +1,21 @@ +# Configuration sample: sriov_kvm.cfg [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; disk = file=/storage/vm-image/vm0.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; -vnc = +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_jumboframe.py b/tests/TestSuite_vf_jumboframe.py index 78a43cd..dfafbd4 100644 --- a/tests/TestSuite_vf_jumboframe.py +++ b/tests/TestSuite_vf_jumboframe.py @@ -4,7 +4,7 @@ import re import time import utils -from qemu_kvm import QEMUKvm +from virt_common import VM from test_case import TestCase from pmd_output import PmdOutput from settings import HEADER_SIZE @@ -111,7 +111,7 @@ class TestVfJumboFrame(TestCase): vf_popt = {'opt_host': self.sriov_vfs_port[0].pci} # set up VM ENV - self.vm = QEMUKvm(self.dut, 'vm0', 'vf_jumboframe') + self.vm = VM(self.dut, 'vm0', 'vf_jumboframe') self.vm.set_vm_device(driver=self.vf_assign_method, **vf_popt) self.vm_dut = self.vm.start() if self.vm_dut is None: -- 1.8.3.1