[Libvirt-cim] [PATCH 1/2] cimtest: Use vda instead of hda for disk RASDs

From: Thilo Boehm <tboehm(a)linux.vnet.ibm.com&gt; Running cimtest against a s390 host will fail almost every testcase involving a disk definition in a domain. This is because the testcase instantiate IDE disk drives implicitly by using hdx as disk identifiers. Changing the testcases to use virtio disks will enable s390 domains to be started, while the testcases will still function under x86. Signed-off-by: Thilo Boehm <tboehm(a)linux.vnet.ibm.com&gt; Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com&gt; --- .../cimtest/ElementAllocatedFromPool/01_forward.py | 2 +- .../cimtest/ElementAllocatedFromPool/02_reverse.py | 2 +- .../ElementAllocatedFromPool/03_reverse_errs.py | 2 +- .../ElementAllocatedFromPool/04_forward_errs.py | 2 +- .../cimtest/HostedAccessPoint/01_forward.py | 2 +- .../cimtest/HostedAccessPoint/02_reverse.py | 2 +- .../02_guest_add_mod_rem_rasd_ind.py | 2 +- .../cimtest/ServiceAccessBySAP/01_forward.py | 2 +- .../cimtest/ServiceAccessBySAP/02_reverse.py | 2 +- .../cimtest/SettingsDefine/01_forward.py | 2 +- .../cimtest/SettingsDefine/02_reverse.py | 2 +- .../cimtest/SettingsDefine/03_sds_fwd_errs.py | 2 +- .../cimtest/SettingsDefine/04_sds_rev_errs.py | 2 +- .../libvirt-cim/cimtest/SystemDevice/01_forward.py | 2 +- .../libvirt-cim/cimtest/SystemDevice/03_fwderrs.py | 2 +- suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py | 2 +- .../13_refconfig_additional_devs.py | 2 +- .../14_define_sys_disk.py | 2 +- .../30_dynamic_disk_mod.py | 2 +- .../02_reverse.py | 2 +- .../03_vssdc_fwd_errs.py | 2 +- suites/libvirt-cim/lib/XenKvmLib/const.py | 2 +- suites/libvirt-cim/lib/XenKvmLib/vsms.py | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py index f7503dd..82b12a5 100755 --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py @@ -146,7 +146,7 @@ def main(): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' # Getting the VS list and deleting the test_dom if it already exists. destroy_and_undefine_all(server) diff --git a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py index e682f11..30367cd 100644 --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py @@ -176,7 +176,7 @@ def main(): if virt == 'Xen': test_disk = 'xvdb' else: - test_disk = 'hda' + test_disk = 'vda' # Getting the VS list and deleting the test_dom if it already exists. virt_type = get_class(virt) diff --git a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py index bb273b8..7787c1d 100644 --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py @@ -180,7 +180,7 @@ def main(): if virt == "Xen": test_disk = "xvda" else: - test_disk = "hda" + test_disk = "vda" virt_type = get_class(virt) vsxml = virt_type (test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk) diff --git a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py index 3281942..fc1dcf7 100644 --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py @@ -496,7 +496,7 @@ def main(): if virt == "Xen": test_disk = "xvda" else: - test_disk = "hda" + test_disk = "vda" destroy_and_undefine_all(options.ip) vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk) diff --git a/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py b/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py index 8493ed7..9ffd0fd 100644 --- a/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py +++ b/suites/libvirt-cim/cimtest/HostedAccessPoint/01_forward.py @@ -41,7 +41,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = get_class(virt) if virt == 'LXC': diff --git a/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py b/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py index 74850ed..2d6daf1 100644 --- a/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py +++ b/suites/libvirt-cim/cimtest/HostedAccessPoint/02_reverse.py @@ -41,7 +41,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = get_class(virt) if virt == 'LXC': diff --git a/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py index 329c7b4..6d513bd 100644 --- a/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py +++ b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py @@ -151,7 +151,7 @@ def main(): ndpath = cxml.secondary_disk_path if virt == 'KVM': - nddev = 'hdb' + nddev = 'vdb' else: nddev = 'xvdb' diff --git a/suites/libvirt-cim/cimtest/ServiceAccessBySAP/01_forward.py b/suites/libvirt-cim/cimtest/ServiceAccessBySAP/01_forward.py index 525e05f..4840522 100644 --- a/suites/libvirt-cim/cimtest/ServiceAccessBySAP/01_forward.py +++ b/suites/libvirt-cim/cimtest/ServiceAccessBySAP/01_forward.py @@ -43,7 +43,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = get_class(virt) diff --git a/suites/libvirt-cim/cimtest/ServiceAccessBySAP/02_reverse.py b/suites/libvirt-cim/cimtest/ServiceAccessBySAP/02_reverse.py index 1c1c913..14c0db1 100644 --- a/suites/libvirt-cim/cimtest/ServiceAccessBySAP/02_reverse.py +++ b/suites/libvirt-cim/cimtest/ServiceAccessBySAP/02_reverse.py @@ -42,7 +42,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = get_class(virt) diff --git a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py index 850f3ce..5850090 100755 --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py @@ -45,7 +45,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = get_class(virt) if virt == 'LXC': cxml = virt_xml(test_dom) diff --git a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py index fdae709..1917113 100644 --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py @@ -70,7 +70,7 @@ def setup_env(server, virt): if virt == 'Xen': test_disk = 'xvdb' else: - test_disk = 'hdb' + test_disk = 'vdb' virt_xml = get_class(virt) if virt == 'LXC': cxml = virt_xml(test_dom) diff --git a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py index 58b9cbc..d4f7c89 100644 --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py @@ -211,7 +211,7 @@ def main(): if options.virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = vxml.get_class(options.virt) if options.virt == 'LXC': diff --git a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py index 43484e9..fdd0086 100644 --- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py +++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py @@ -101,7 +101,7 @@ def main(): if options.virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' virt_xml = vxml.get_class(options.virt) if options.virt == 'LXC': diff --git a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py index 330c6fb..15a4ff5 100644 --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py @@ -52,7 +52,7 @@ def main(): elif virt == 'LXC': test_disk = '/tmp' else: - test_disk = 'hdb' + test_disk = 'vdb' status = PASS virt_xml = vxml.get_class(virt) diff --git a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py index 0e7e167..e48bcf5 100644 --- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py +++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py @@ -60,7 +60,7 @@ def main(): if options.virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' status = PASS virt_xml = vxml.get_class(options.virt) diff --git a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py index 4d24b39..04b0b6e 100755 --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py @@ -214,7 +214,7 @@ def main(): if virt == "LXC": test_disk = "/tmp" else: - test_disk = "hda" + test_disk = "vda" status, vsxml = setup_env(virt) if status != PASS: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py index a47db8f..5e9e780 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py @@ -125,7 +125,7 @@ def main(): test_disk = 'xvdb' disk_path = Xen_secondary_disk_path else: - test_disk = 'hdb' + test_disk = 'vdb' disk_path = KVM_secondary_disk_path cxml2 = virt_xml(test_dom2, mac=mac2, diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py index 294c275..4adabbd 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py @@ -67,7 +67,7 @@ def get_rasd_list(ip, virt, addr, disk_type): if virt == 'Xen': test_disk = 'xvda' else: - test_disk = 'hda' + test_disk = 'vda' for rasd in rasds: if rasd.classname == drasd_cn: diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py index 8e6a3ae..5d81a21 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py @@ -39,7 +39,7 @@ def main(): options = main.options if options.virt == 'KVM': - nddev = 'vda' + nddev = 'vdb' else: nddev = 'xvdb' diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py index 0624b1d..3a13b2a 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py @@ -159,7 +159,7 @@ def main(): elif options.virt == "LXC": test_disk = "/tmp" else: - test_disk = "hdb" + test_disk = "vdb" virt_xml = vxml.get_class(options.virt) if options.virt == 'LXC': diff --git a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py index 492a55f..52f8c48 100644 --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py @@ -105,7 +105,7 @@ def main(): if virt == "Xen": test_disk = "xvda" else: - test_disk = "hda" + test_disk = "vda" virt_xml = vxml.get_class(virt) if virt == 'LXC': diff --git a/suites/libvirt-cim/lib/XenKvmLib/const.py b/suites/libvirt-cim/lib/XenKvmLib/const.py index 6701d36..1d655d0 100755 --- a/suites/libvirt-cim/lib/XenKvmLib/const.py +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py @@ -86,7 +86,7 @@ Xen_default_mac = '88:22:33:aa:bb:cc' KVM_default_emulator = '/usr/bin/qemu-system-x86_64' KVM_disk_path = os.path.join(_image_dir, 'default-kvm-dimage') KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') -KVM_default_disk_dev = 'hda' +KVM_default_disk_dev = 'vda' KVM_default_cdrom_dev = 'hdc' KVM_default_mac = '88:22:33:aa:bb:cc' diff --git a/suites/libvirt-cim/lib/XenKvmLib/vsms.py b/suites/libvirt-cim/lib/XenKvmLib/vsms.py index 03cbe30..d7f33f9 100755 --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py @@ -339,7 +339,7 @@ def default_vssd_rasd_str(dom_name='test_domain', class_dasd = get_dasd_class(virt) if virt == 'KVM': - disk_dev = 'hda' + disk_dev = 'vda' disk_source = const.KVM_disk_path elif virt == 'XenFV': disk_dev = 'hda' -- 1.7.9.5