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

[Amos Kong <akong@redhat.com>]

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 <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 |    9 ++++++
 2 files changed, 59 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 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: