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 EF18B1B303 for ; Mon, 12 Feb 2018 10:58:26 +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 B7F811529; Mon, 12 Feb 2018 01:58:26 -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 4C5C73F41F; Mon, 12 Feb 2018 01:58:26 -0800 (PST) From: Herbert Guan To: dts@dpdk.org Cc: Herbert Guan Date: Mon, 12 Feb 2018 17:57:37 +0800 Message-Id: <1518429462-30299-5-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 4/9] tests/vf_vlan: 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:27 -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_vlan.cfg | 3 +++ tests/TestSuite_vf_vlan.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/vf_vlan.cfg b/conf/vf_vlan.cfg index 94e68b4..5e0754b 100644 --- a/conf/vf_vlan.cfg +++ b/conf/vf_vlan.cfg @@ -1,3 +1,4 @@ +# Configuration sample: sriov_kvm.cfg [vm0] cpu = model=host,number=4,cpupin=5 6 7 8; @@ -5,7 +6,9 @@ disk = file=/storage/vm-image/vm0.img; login = user=root,password=tester; +# 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_vlan.py b/tests/TestSuite_vf_vlan.py index c0b26a3..da9330d 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.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 packet import Packet, sniff_packets, load_sniff_packets @@ -114,7 +114,7 @@ class TestVfVlan(TestCase): vf1_prop = {'opt_host': self.sriov_vfs_port_1[0].pci} # set up VM0 ENV - self.vm0 = QEMUKvm(self.dut, 'vm0', 'vf_vlan') + self.vm0 = VM(self.dut, 'vm0', 'vf_vlan') 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