From patchwork Wed Jul 15 03:49:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yolkfull Chow X-Patchwork-Id: 35625 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6F3o9U8025177 for ; Wed, 15 Jul 2009 03:50:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751976AbZGODtl (ORCPT ); Tue, 14 Jul 2009 23:49:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751927AbZGODtl (ORCPT ); Tue, 14 Jul 2009 23:49:41 -0400 Received: from mx2.redhat.com ([66.187.237.31]:32772 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbZGODtk (ORCPT ); Tue, 14 Jul 2009 23:49:40 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6F3ndx5003632; Tue, 14 Jul 2009 23:49:39 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6F3ncDp031198; Tue, 14 Jul 2009 23:49:38 -0400 Received: from localhost.localdomain (dhcp-66-70-57.nay.redhat.com [10.66.70.57]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6F3nZld008982; Tue, 14 Jul 2009 23:49:36 -0400 From: Yolkfull Chow To: kvm@vger.kernel.org Cc: lmr@redhat.com, autotest@test.kernel.org, Yolkfull Chow Subject: [PATCH] Add a kvm subtest -- pci_hotplug, which supports both Windows OS and Linux OS. Date: Wed, 15 Jul 2009 11:49:39 +0800 Message-Id: <1247629779-9948-1-git-send-email-yzhou@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This is a subtest in kvm. It will verify newly added pci block device now. For Windows support,it needs to use_telnet since 'wmic' which is used to check disk info could only be executed in telnet session not ssh. Just ran it on guest Fedora-11.32 and Windows2008.32, both passed: # ./scan_results.py test status seconds info ---- ------ ------- ---- Fedora.11.32.nic_hotplug.nic_rtl8139 GOOD 68 completed successfully Fedora.11.32.nic_hotplug.nic_virtio GOOD 46 completed successfully Fedora.11.32.block_hotplug.fmt_qcow2.block_virtio GOOD 46 completed successfully Fedora.11.32.block_hotplug.fmt_qcow2.block_scsi GOOD 44 completed successfully Fedora.11.32.block_hotplug.fmt_raw.block_virtio GOOD 45 completed successfully Fedora.11.32.block_hotplug.fmt_raw.block_scsi GOOD 46 completed successfully Win2008.32.nic_hotplug.nic_rtl8139 GOOD 66 completed successfully Win2008.32.block_hotplug.fmt_qcow2.block_scsi GOOD 186 completed successfully Win2008.32.block_hotplug.fmt_raw.block_scsi GOOD 71 completed successfully Signed-off-by: Yolkfull Chow --- client/tests/kvm/kvm.py | 1 + client/tests/kvm/kvm_tests.cfg.sample | 69 +++++++++++++++++++++++- client/tests/kvm/kvm_tests.py | 98 +++++++++++++++++++++++++++++++++ client/tests/kvm/kvm_vm.py | 2 + 4 files changed, 169 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/kvm.py b/client/tests/kvm/kvm.py index b18b643..fc92e10 100644 --- a/client/tests/kvm/kvm.py +++ b/client/tests/kvm/kvm.py @@ -55,6 +55,7 @@ class kvm(test.test): "kvm_install": test_routine("kvm_install", "run_kvm_install"), "linux_s3": test_routine("kvm_tests", "run_linux_s3"), "stress_boot": test_routine("kvm_tests", "run_stress_boot"), + "pci_hotplug": test_routine("kvm_tests", "run_pci_hotplug"), } # Make it possible to import modules from the test's bindir diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 2f864de..7ec6f72 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -91,9 +91,56 @@ variants: - stress_boot: type = stress_boot - max_vms = 5 + max_vms = 5 alive_test_cmd = ps aux + + - nic_hotplug: + type = pci_hotplug + pci_type = nic + modprobe_acpiphp = yes + reference_cmd = lspci + find_pci_cmd = 'lspci | tail -n1' + pci_test_cmd = 'nslookup www.redhat.com' + seconds_wait_for_device_install = 3 + variants: + - nic_8139: + pci_model = rtl8139 + match_string = "8139" + - nic_virtio: + pci_model = virtio + match_string = "Virtio network device" + - nic_e1000: + pci_model = e1000 + match_string = "Gigabit Ethernet Controller" + + - block_hotplug: + type = pci_hotplug + pci_type = block + modprobe_acpiphp = yes + reference_cmd = lspci + find_pci_cmd = 'lspci | tail -n1' + images += " stg" + boot_drive_stg = no + image_name_stg = storage + image_size = 1G + force_create_image_stg = yes + seconds_wait_for_device_install = 3 + pci_test_cmd = 'yes|mke2fs `fdisk -l 2>&1 |grep '/dev/[sv]d[a-z] doesn' | awk '{print $2}'`' + variants: + - block_virtio: + pci_model = virtio + match_string = "Virtio block device" + - block_scsi: + pci_model = scsi + match_string = "SCSI" + variants: + - fmt_qcow2: + image_format_stg = qcow2 + - fmt_raw: + image_format_stg = raw + + # NICs variants: - @rtl8139: @@ -119,6 +166,10 @@ variants: - Fedora: no setup ssh_prompt = "\[root@.{0,50}][\#\$] " + nic_hotplug: + modprobe_acpiphp = no + block_hotplug: + modprobe_acpiphp = no variants: - 8.32: @@ -306,6 +357,22 @@ variants: migration_test_command = ver && vol stress_boot: alive_test_cmd = systeminfo + nic_hotplug: + modprobe_acpiphp = no + reference_cmd = systeminfo + seconds_wait_for_device_install = 10 + find_pci_cmd = ipconfig /all | find "Description" + nic_e1000: + match_string = "Intel(R) PRO/1000 MT Network Connection" + no nic_virtio + block_hotplug: + use_telnet = yes + modprobe_acpiphp = no + reference_cmd = wmic diskdrive + find_pci_cmd = wmic diskdrive | find "disk drives" + seconds_wait_for_device_install = 10 + pci_test_cmd = echo select disk 1 > test.txt && echo detail disk >> test.txt && echo exit >> test.txt && diskpart /s test.txt + only block_scsi variants: - Win2000: diff --git a/client/tests/kvm/kvm_tests.py b/client/tests/kvm/kvm_tests.py index 2d11fed..f4aa8e1 100644 --- a/client/tests/kvm/kvm_tests.py +++ b/client/tests/kvm/kvm_tests.py @@ -585,3 +585,101 @@ def run_stress_boot(tests, params, env): for se in sessions: se.close() logging.info("Total number booted: %d" % (num -1)) + + +def run_pci_hotplug(test, params, env): + """ + Test pci devices' hotplug + 1) pci_add a deivce (nic or storage) + 2) Compare 'info pci' output + 3) Compare 'reference_cmd' output + 4) Verify whether pci_model is shown in 'pci_find_cmd' + 5) Check whether the newly added pci device works fine + 6) pci_del the device, verify whether could remove the pci device + + @param test: kvm test object + @param params: Dictionary with the test parameters + @param env: Dictionary with test environment. + """ + vm = kvm_utils.env_get_vm(env, params.get("main_vm")) + if not vm: + raise error.TestError("VM object not found in environment") + if not vm.is_alive(): + raise error.TestError("VM seems to be dead; Test requires a living VM") + + logging.info("Waiting for guest to be up...") + + session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2) + if not session: + raise error.TestFail("Could not log into guest") + + logging.info("Logged in") + + # modprobe the module that enable hotplug + if params.get("modprobe_acpiphp") == "yes": + if session.get_command_status("modprobe acpiphp"): + raise error.TestError("Modprobe module 'acpiphp' failed") + + # get reference output + s, info_pci_ref = vm.send_monitor_cmd("info pci") + + # compare the output + ref_cmd = params.get("reference_cmd") + reference = session.get_command_output(ref_cmd) + + # implement pci hotplug + tested_model = params.get("pci_model") + logging.info("Testing hotplug pci device:%s" % tested_model) + + test_type = params.get("pci_type") + if test_type == "nic": + pci_add_cmd = "pci_add pci_addr=auto nic model=%s" % tested_model + + elif test_type == "block": + image_name = params.get("image_name_stg") + image_filename = "%s.%s" % (image_name, params.get("image_format_stg")) + image_dir = os.path.join(test.bindir, "images") + storage_name = os.path.join(image_dir, image_filename) + pci_add_cmd = ("pci_add pci_addr=auto storage file=%s,if=%s" % + (storage_name, tested_model)) + + s, add_output = vm.send_monitor_cmd(pci_add_cmd) + if not "OK domain" in add_output: + raise error.TestFail("Add device failed;Hypervisor command is: %s; " + "Output: %s" % (pci_add_cmd, add_output)) + + # compare the output of 'info pci' + s, after_add = vm.send_monitor_cmd("info pci") + if after_add == info_pci_ref: + raise error.TestFail("No new PCI device shown after executing " + "hypervisor command: 'info pci'") + + time.sleep(int(params.get("seconds_wait_for_device_install"))) + + o = session.get_command_output(ref_cmd) + if reference == o: + raise error.TestFail("No new device shown in output of command \ + executed in guest: %s" % ref_cmd) + + cmd = params.get("find_pci_cmd") + output = session.get_command_output(cmd) + if not params.get("match_string") in output: + raise error.TestFail("Not found pci model:%s;Command is:%s;Output:%s" % + (tested_model, cmd, output)) + + + # check whether VM's network & disk work fine + s, o = session.get_command_status_output(params.get("pci_test_cmd")) + if s: + raise error.TestFail("Check for %s device failed after PCI hotplug;" + "Output: %s" % (test_type, o)) + + # del pci device + slot_id = "0" + add_output.split(",")[2].split()[1] + cmd = "pci_del pci_addr=%s" % slot_id + s, after_del = vm.send_monitor_cmd(cmd) + if after_del == after_add: + raise error.TestFail("Failed to hot remove pci device:%s; " + "Hypervisor command: %s" % (tested_model, cmd)) + + session.close() diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 503f636..95b55eb 100644 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -239,6 +239,8 @@ class VM: for image_name in kvm_utils.get_sub_dict_names(params, "images"): image_params = kvm_utils.get_sub_dict(params, image_name) + if image_params.get("boot_drive") == "no": + continue qemu_cmd += " -drive file=%s" % get_image_filename(image_params, image_dir) if image_params.get("drive_format"):