[PATCH v3] KVM-test: Add subtest: usb

Amos Kong
2011-08-03T05:39:15Z

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

Changes from v2:
- reuse the new interface to add a usb disk to guest
- report a rh-bug 727725

CC: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Amos Kong <akong@redhat.com>
---
client/tests/kvm/tests/usb.py | 50 ++++++++++++++++++++++++++++++++
client/tests/kvm/tests_base.cfg.sample | 15 ++++++++++
2 files changed, 65 insertions(+), 0 deletions(-)
create mode 100644 client/tests/kvm/tests/usb.py

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 ccc17f6..1392898 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -1122,6 +1122,21 @@ variants:
kill_vm_gracefully = no
# Do not define test variants below shutdown

+ - usb: install setup image_copy unattended_install.cdrom
+ type = usb
+ kill_vm = yes
+ format_timeout = 400
+ images += " stg"
+ image_name_stg = "usbdevice"
+ image_format_stg = "qcow2"
+ image_boot_stg = no
+ drive_format_stg = "usb2"
+ drive_index_stg = 1
+ create_image_stg = yes
+ image_size_stg = 10M