Virsh domiftune

.gitignore

@@ -16,6 +16,7 @@
 *.so
 .settings
 shared/data
+shared/deps/cpuid_test_kernel/cpuid_dump_kernel.bin
 qemu/env
 logs
 qemu/unittests

MAINTAINERS

@@ -26,7 +26,7 @@ Pull request maintenance - Libvirt subtests
 
 M: Christopher Evich <[email protected]>
 M: Yu Mingfei <[email protected]>
-
+M: Yang Dongsheng <[email protected]>
 
 Pull request maintenance - Libguestfs
 -------------------------------------

README.rst

@@ -119,3 +119,30 @@ platform. Autotest is a modular framework, and this suite can be used as
 a submodule of the client module. If you do not want to use or know about
 autotest, this is fine too, and we'll provide documentation and tools to
 perform development style testing with it.
+
+
+Basic Troubleshooting
+---------------------
+
+If you have problems with the basic usage described here, it's possible
+that there's some local change in your working copy of virt-test. These
+changes can come in (at least) two different categories:
+
+- Code changes, which you can check with the git tools (try "git diff"
+  and "git branch" first)
+- Configuration changes that can you reset with "update_config.py"
+
+If you find that you have local changes in the code, please try to reset
+your checked out copy to upstream's master by running::
+
+$ git checkout master
+$ git pull
+
+
+And then, reset you configuration. If you're going to run qemu tests, run::
+
+$ qemu/update_config.py
+
+
+If you're still having problems after these basic troubleshoot steps,
+please contact us!

libguestfs/tests/cfg/guestfs_add.cfg

@@ -0,0 +1,25 @@
+- guestfs_add:
+    type = guestfs_add
+    start_vm = "no"
+    # If login to check whether write content successfully.
+    login_to_check_write = "yes"
+    variants:
+        - normal_test:
+            status_error = "no"
+            guestfs_add_readonly = "no"
+            variants:
+                - add_disk:
+                    guestfs_add_ref = "disk"
+                - add_domain:
+                    guestfs_add_ref = "domain"
+        - error_test:
+            status_error = "yes"
+            guestfs_add_readonly = "yes"
+            # normally write content will be failed.
+            login_to_check_write = "no"
+            variants:
+                # Write content to readonly disk or domain
+                - add_disk_ro:
+                    guestfs_add_ref = "disk"
+                - add_domain_ro:
+                    guestfs_add_ref = "domain"

libguestfs/tests/guestfs_add.py

@@ -0,0 +1,188 @@
+import logging, re, commands
+from autotest.client.shared import error
+from virttest import utils_libguestfs as lgf
+from virttest import aexpect
+
+
+def set_guestfs_args(guestfs, ignore_status=True, debug=False, timeout=60):
+    """
+    Maintain Guestfish class' arguments.
+    """
+    guestfs.set_ignore_status(ignore_status)
+    guestfs.set_debug(debug)
+    guestfs.set_timeout(timeout)
+
+
+def add_disk_or_domain(guestfs, disk_or_domain, add_ref="domain",
+                       readonly=False):
+    """
+    Add disk or domain to guestfish
+
+    @param guestfs: a session of guestfish
+    @param disk_or_domain: a disk or a domain
+    @param add_ref: domain or disk
+    @param readonly: is added disk or domain readonly.
+    """
+    if add_ref == "domain":
+        add_result = guestfs.add_domain(disk_or_domain, readonly=readonly)
+    elif add_ref == "disk":
+        add_result = guestfs.add_drive_opts(disk_or_domain, readonly=readonly)
+    else:
+        guestfs.close_session()
+        raise error.TestFail("Added must be a disk or a domain.")
+
+    if add_result.exit_status:
+        guestfs.close_session()
+        raise error.TestFail("Add %s failed:%s" % (add_ref, add_result))
+    logging.debug("Add %s successfully.", add_ref)
+
+
+def launch_disk(guestfs):
+    # Launch added disk or domain
+    launch_result = guestfs.run()
+    if launch_result.exit_status:
+        guestfs.close_session()
+        raise error.TestFail("Launch failed:%s" % launch_result)
+    logging.debug("Launch successfully.")
+
+
+def get_root(guestfs):
+    getroot_result = guestfs.inspect_os()
+    roots_list = getroot_result.stdout.splitlines()
+    if getroot_result.exit_status or not len(roots_list):
+        guestfs.close_session()
+        raise error.TestFail("Get root failed:%s" % getroot_result)
+    return roots_list[0]
+
+
+def mount_filesystem(guestfs, filesystem, mountpoint):
+    mount_result = guestfs.mount(filesystem, mountpoint)
+    if mount_result.exit_status:
+        guestfs.close_session()
+        raise error.TestFail("Mount filesystem failed:%s" % mount_result)
+    logging.debug("Mount filesystem successfully.")
+
+
+def run_guestfs_add(test, params, env):
+    """
+    Test of built-in 'add-xxx' commands in guestfish.
+
+    1) Get parameters for test
+    2) Set options for commands
+    3) Run key commands:
+       a.add disk or domain with readonly or not
+       b.launch
+       c.mount root device
+    4) Write a file to help result checking
+    5) Check result
+    """
+
+    vm_name = params.get("main_vm")
+    vm = env.get_vm(vm_name)
+
+    # Get parameters
+    add_ref = params.get("guestfs_add_ref", "domain")
+    add_readonly = "yes" == params.get("guestfs_add_readonly", "no")
+    status_error = "yes" == params.get("status_error", "no")
+    login_to_check = "yes" == params.get("login_to_check_write", "no")
+    # Any failed info will be recorded in this dict
+    # Result check will rely on it.
+    fail_flag = 0
+    fail_info = {}
+
+    if vm.is_alive():
+        # Execute guestfish when vm is alive is dangerous.
+        # Do not support this test right now.
+        vm.destroy()
+
+    if add_ref == "domain":
+        disk_or_domain = vm_name
+    elif add_ref == "disk":
+        # Get system disk path of tested domain
+        disks = vm.get_disk_devices()
+        if len(disks):
+            disk = disks.values()[0]
+            disk_or_domain = disk['source']
+        else:
+            # No need to test since getting vm's disk failed.
+            raise error.TestFail("Can not get disk of %s" % vm_name)
+
+    guestfs = lgf.GuestfishPersistent()
+    set_guestfs_args(guestfs)
+
+    # Add tested disk or domain
+    add_disk_or_domain(guestfs, disk_or_domain, add_ref, add_readonly)
+
+    # Launch added disk or domain
+    launch_disk(guestfs)
+
+    # Mount root filesystem
+    root = get_root(guestfs)
+    mount_filesystem(guestfs, root, '/')
+
+    # Write content to file
+    status, content = commands.getstatusoutput("uuidgen")
+    write_result = guestfs.write("/guestfs_temp", content)
+    if write_result.exit_status:
+        fail_flag = 1
+        fail_info['write_content'] = ("Write content to file failed:"
+                                      "%s" % write_result)
+    else:
+        logging.debug("Write content to file successfully.")
+        fail_info['write_content'] = "Write content to file successfully."
+
+    # Check writed file in a new guestfish session
+    guestfs.new_session()
+    set_guestfs_args(guestfs)
+    add_disk_or_domain(guestfs, disk_or_domain, add_ref, add_readonly)
+    launch_disk(guestfs)
+    mount_filesystem(guestfs, root, '/')
+    cat_result = guestfs.cat("/guestfs_temp")
+    if cat_result.exit_status:
+        fail_flag = 1
+        fail_info['cat_writed'] = ("Cat writed file failed:"
+                                   "%s" % cat_result)
+    else:
+        guestfs_writed_text = cat_result.stdout
+        if not re.search(content, guestfs_writed_text):
+            fail_flag = 1
+            fail_info['cat_writed'] = ("Catted text is not match with writed:"
+                                       "%s" % cat_result)
+            logging.debug("Catted text is not match with writed")
+        else:
+            logging.debug("Cat content of file successfully.")
+            fail_info['cat_writed'] = "Cat content of file successfully."
+
+    # Start vm and login to check writed file.
+    guestfs.close_session()
+    if login_to_check:
+        try:
+            vm.start()
+            session = vm.wait_for_login()
+            session.cmd("mount %s /mnt" % root)
+            try:
+                login_wrote_text = session.cmd_output("cat /mnt/guestfs_temp",
+                                                       timeout=5)
+            except aexpect.ShellTimeoutError, detail:
+                # writen content with guestfs.write won't contain line break
+                # Is is a bug of guestfish.write?
+                login_wrote_text = str(detail)
+            if not re.search(content, login_wrote_text):
+                fail_flag = 1
+                fail_info['login_to_check'] = ("Login to check failed:"
+                                               "%s" % login_wrote_text)
+            else:
+                logging.debug("Login to check successfully.")
+                fail_info['login_to_check'] = "Login to check successfully."
+        except aexpect.ShellError, detail:
+            fail_flag = 1
+            fail_info['login_to_check'] = detail
+        vm.destroy()
+
+    if status_error:
+        if not fail_flag:
+            raise error.TestFail("Expected error is successful:"
+                                 "%s" % fail_info)
+    else:
+        if fail_flag:
+            raise error.TestFail(fail_info)

libguestfs/tests/virt_edit.py

@@ -1,6 +1,6 @@
 import logging, re
 from autotest.client.shared import utils, error
-from virttest import libvirt_vm
+from virttest import libvirt_vm, utils_libvirtd
 import virttest.utils_libguestfs as lgf
 
 
@@ -88,7 +88,7 @@ def run_virt_edit(test, params, env):
     # Stop libvirtd if test need.
     libvirtd = params.get("libvirtd", "on")
     if libvirtd == "off":
-        libvirt_vm.libvirtd_stop()
+        utils_libvirtd.libvirtd_stop()
 
     # Run test
     virsh_dargs = {'ignore_status': True, 'debug': True, 'uri': uri}
@@ -98,7 +98,7 @@ def run_virt_edit(test, params, env):
 
     # Recover libvirtd.
     if libvirtd == "off":
-        libvirt_vm.libvirtd_start()
+        utils_libvirtd.libvirtd_start()
 
     utils.run("rm -f %s" % created_img)
 

libvirt/control

@@ -22,6 +22,8 @@ from virttest import utils_misc, cartesian_config
 
 # set English environment (command output might be localized, need to be safe)
 os.environ['LANG'] = 'en_US.UTF-8'
+# set editor environment (some command will use default editor "vi")
+os.environ['EDITOR'] = 'vi'
 
 libvirt_test_dir = os.path.join(os.environ['AUTODIR'],'tests/virt/libvirt')
 

libvirt/tests/cfg/virsh_cmd/domain/virsh_change_media.cfg

@@ -1,14 +1,15 @@
 - virsh_change_media:
+    virt_test_type = libvirt
     type = virsh_change_media
-    old_iso = "change_media_old.iso"
-    new_iso = "change_media_new.iso"
-    update_iso_xml = "update_iso.xml"
-    disk_device = "hdc"
-    vm_ref = "name"
-    init_cdrom = "''"
+    change_media_update_iso_xml = "update_iso.xml"
+    change_media_disk_device = "hdc"
+    change_media_vm_ref = "name"
+    change_media_init_cdrom = "''"
+    change_media_old_iso = "change_media_old.iso"
+    change_media_new_iso = "change_media_new.iso"
     libvirtd = "on"
-    init_iso = "change_media_old.iso"
     change_media_source =
+    change_media_init_iso = "change_media_old.iso"
     variants:
         - positive_test:
             status_error = "no"
@@ -21,52 +22,52 @@
                 - options:
                     variants:
                         - none:
-                            options = " "
+                            change_media_options = " "
                         - current:
-                            options = "--current"
+                            change_media_options = "--current"
                         - live:
                             no shutoff_guest
-                            options = "--live"
+                            change_media_options = "--live"
                         - force:
-                            options = "--force"
+                            change_media_options = "--force"
                         - config:
-                            options = "--config"
+                            change_media_options = "--config"
             variants:
                 - eject:
-                    action = "--eject "
-                    check_file =
+                    change_media_action = "--eject "
+                    change_media_check_file =
                 - insert:
                     change_media_source = "change_media_old.iso"
-                    action = "--insert "
-                    check_file = "old"
-                    init_iso =
+                    change_media_action = "--insert "
+                    change_media_check_file = "old"
+                    change_media_init_iso =
                 - update:
                     change_media_source = "change_media_new.iso"
-                    action = "--update "
-                    check_file = "new"
+                    change_media_action = "--update "
+                    change_media_check_file = "new"
         - negative_test:
             status_error = "yes"
             start_vm = "no"
-            options = "--current"
+            change_media_options = "--current"
             variants:
                 - no_option:
                     only insert
-                    options = " "
+                    change_media_options = " "
                 - no_name:
-                    vm_ref = " "
+                    change_media_vm_ref = " "
                 - unexpect_option:
-                    vm_ref = "\#"
+                    change_media_vm_ref = "\#"
                 - invalid_option:
-                    options = "--xyz"
+                    change_media_options = "--xyz"
                 - with_libvirtd_stop:
-                    requires_root = "yes"
+                    change_media_requires_root = "yes"
                     libvirtd = "off"
                 - shutoff_guest_with_live:
-                    options = "--live"
+                    change_media_options = "--live"
             variants:
                 - eject:
-                    action = "--eject "
+                    change_media_action = "--eject "
                 - insert:
-                    action = "--insert "
+                    change_media_action = "--insert "
                 - update:
-                    action = "--update "
+                    change_media_action = "--update "