From patchwork Tue Aug 2 11:47:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 1029302 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p72Bh6Ps027546 for ; Tue, 2 Aug 2011 11:43:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034Ab1HBLmr (ORCPT ); Tue, 2 Aug 2011 07:42:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11070 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754019Ab1HBLmo (ORCPT ); Tue, 2 Aug 2011 07:42:44 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p72BghnI023304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 Aug 2011 07:42:43 -0400 Received: from [127.0.0.1] (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p72BgfpB025185; Tue, 2 Aug 2011 07:42:42 -0400 Subject: [PATCH v2] KVM-test: Add subtest: usb To: autotest@test.kernel.org, lmr@redhat.com, kraxel@redhat.com, kvm@vger.kernel.org From: Amos Kong Date: Tue, 02 Aug 2011 19:47:04 +0800 Message-ID: <20110802114704.16296.14331.stgit@t> In-Reply-To: <4E3656E5.4070000@redhat.com> References: <4E3656E5.4070000@redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Aug 2011 11:43:07 +0000 (UTC) This test adds a usb storage for the guest, and do some check from monitor and inside the guest. Changes from v1: - use old options to add a usb disk to guest '-usbdevice disk:format=qcow2:/tmp/usbdevice.qcow2' - identify device name of new disk by '/dev/disk/by-path/' - match device with the detail output of 'lsusb -v' - create disk image by pre_cmd CC: Gerd Hoffmann Signed-off-by: Amos Kong --- client/tests/kvm/tests/usb.py | 50 ++++++++++++++++++++++++++++++++ client/tests/kvm/tests_base.cfg.sample | 9 ++++++ 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 client/tests/kvm/tests/usb.py -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/client/tests/kvm/tests/usb.py b/client/tests/kvm/tests/usb.py new file mode 100644 index 0000000..d1849de --- /dev/null +++ b/client/tests/kvm/tests/usb.py @@ -0,0 +1,50 @@ +import logging +from autotest_lib.client.common_lib import error + + +@error.context_aware +def run_usb(test, params, env): + """ + Test usb device of guest + + 1) create a image file by qemu-img + 2) boot up a guest add this file as a usb device + 3) check usb device information by execute monitor/guest command + + @param test: kvm test object + @param params: Dictionary with the test parameters + @param env: Dictionary with test environment. + """ + vm = env.get_vm(params["main_vm"]) + vm.create() + + session = vm.wait_for_login(timeout=int(params.get("login_timeout", 360))) + + output = vm.monitor.cmd("info usb") + if "Product QEMU USB MSD" not in output: + logging.debug(output) + raise error.TestFail("Could not find mass storage device") + + output = session.get_command_output("lsusb -v") + #no bus specified, default using "usb.0" for "usb-storage" + for i in ["ID 0000:0000", "Mass Storage", "SCSI", "QEMU USB HARDDRIVE"]: + if i not in output: + logging.debug(output) + raise error.TestFail("No '%s' in the output of 'lsusb -v'" % i) + + output = session.get_command_output("fdisk -l") + if params.get("fdisk_string") not in output: + logging.debug(output) + raise error.TestFail("Could not realise the usb device") + + error.context("Formating usb disk") + devname = session.get_command_output("ls /dev/disk/by-path/*|grep usb") + session.cmd("yes |mkfs %s" % devname, + timeout=int(params.get("format_timeout"))) + + error.context("Checking if exist I/O error in dmesg") + output = session.get_command_output("dmesg") + if "Buffer I/O error" in output: + logging.debug(output) + raise error.TestFail("Exists I/O error when format usb device") + session.close() diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index d597b52..a4e9a93 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1115,6 +1115,15 @@ variants: image_snapshot = yes only Linux + - usb: install setup image_copy unattended_install.cdrom + type = usb + kill_vm = yes + format_timeout = 400 + extra_params += " -usbdevice disk:format=qcow2:/tmp/usbdevice.qcow2" + pre_command += "qemu-img create -f qcow2 /tmp/usbdevice.qcow2 10M;" + fdisk_string = "Units = cylinders of 20 * 512 = 10240 bytes" + only Linux + # NICs variants: