- CIM - libvirt List Archives

[PATCH] Improve random MAC generator
by Kaitlin Rupert 23 Mar '09

23 Mar '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1237266354 25200 # Node ID 69b7af00d9da92ce169d915bb6b17c493fe0b021 # Parent 160e1a86d82e8ed930e3006098f2af8b230c9834 Improve random MAC generator Use microseconds since the epoch instead of seconds. When defining a guest with multiple net devices specified (in which none of them have a MAC supplied), it's possible for _net_rand_mac() to be called in rapid succession. Also, initialize s - the seed value passed to rand_r(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 160e1a86d82e -r 69b7af00d9da src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Mar 16 13:55:02 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Mar 16 22:05:54 2009 -0700 @@ -25,6 +25,7 @@ #include <stdbool.h> #include <inttypes.h> #include <time.h> +#include <sys/time.h> #include <libvirt/libvirt.h> #include "cmpidt.h" @@ -383,8 +384,14 @@ const char *_mac = NULL; CMPIString *str = NULL; CMPIStatus status; + struct timeval curr_time; - srand(time(NULL)); + ret = gettimeofday(&curr_time, NULL); + if (ret != 0) + goto out; + + srand(curr_time.tv_usec); + s = curr_time.tv_usec; r = rand_r(&s); ret = asprintf(&mac,

2 1

[PATCH] [TEST] #2 Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD
by yunguol＠cn.ibm.com 23 Mar '09

23 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237786756 25200 # Node ID 57f08f1c7a1a8b7c9068e1bf0e76368bb92ead26 # Parent 5bafbcfb09fd3fb9c4cf532488c92d9ddefc663c [TEST] #2 Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD Updates from 1 to 2: Set rasd['VirtualDevice'] value by xvda or hda instead of KVM_default_disk_dev or Xen_default_disk_dev Tested for Xen, XenFV, KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r 5bafbcfb09fd -r 57f08f1c7a1a suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Wed Mar 18 06:41:56 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Sun Mar 22 22:39:16 2009 -0700 @@ -35,14 +35,14 @@ from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.rasd import get_default_rasds -from XenKvmLib.const import do_main, _image_dir, f9_changeset, \ - KVM_default_disk_dev, get_provider_version +from XenKvmLib.const import do_main, _image_dir, get_provider_version from XenKvmLib.vxml import get_class from XenKvmLib.common_util import parse_instance_id from XenKvmLib.enumclass import EnumInstances sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = 'rstest_disk_domain' +libvirt_cim_dasd_caption = 707 def make_long_disk_path(ip): path = os.path.join(_image_dir, 'cimtest_large_image') @@ -64,14 +64,19 @@ rasd_list = {} + if virt == 'Xen': + test_disk = 'xvda' + else: + test_disk = 'hda' + for rasd in rasds: if rasd.classname == drasd_cn: - if disk_type != "" and rasd['Caption'] != disk_type: + curr_cim_rev, changeset = get_provider_version(virt, ip) + if disk_type != "" and rasd['Caption'] != disk_type and \ + curr_cim_rev >= libvirt_cim_dasd_caption: continue rasd['Address'] = addr - curr_cim_rev, changeset = get_provider_version(virt, ip) - if changeset == f9_changeset and virt == 'KVM': - rasd['VirtualDevice'] = KVM_default_disk_dev + rasd['VirtualDevice'] = test_disk rasd_list[rasd.classname] = inst_to_mof(rasd) return rasd_list

2 1

Test Run Summary (Mar 23 2009): KVM on Fedora release 10 (Cambridge) with sfcb
by Guo Lian Yun 23 Mar '09

23 Mar '09

================================================= Test Run Summary (Mar 23 2009): KVM on Fedora release 10 (Cambridge) with sfcb ================================================= Distro: Fedora release 10 (Cambridge) Kernel: 2.6.27.15-170.2.24.fc10.x86_64 libvirt: 0.4.5 Hypervisor: QEMU 0.9.1 CIMOM: sfcb sfcbd 1.3.4preview Libvirt-cim revision: 830 Libvirt-cim changeset: 6195f98ebe5e Cimtest revision: 655 Cimtest changeset: 5bafbcfb09fd ================================================= FAIL : 1 XFAIL : 4 SKIP : 5 PASS : 138 ----------------- Total : 148 ================================================= FAIL Test Summary: ComputerSystemIndication - 01_created_indication.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 32_start_reboot.py: XFAIL ComputerSystem - 33_suspend_reboot.py: XFAIL VirtualSystemManagementService - 09_procrasd_persist.py: XFAIL VirtualSystemManagementService - 16_removeresource.py: XFAIL ================================================= SKIP Test Summary: VSSD - 02_bootldr.py: SKIP VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: PASS -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_pause_pause.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_pause_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: XFAIL ERROR - Got CIM error Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot with return code 1 ERROR - Exception: Unable reboot dom 'cs_test_domain' InvokeMethod(RequestStateChange): Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Got CIM error State not supported with return code 7 ERROR - Exception: Unable Suspend dom 'test_domain' InvokeMethod(RequestStateChange): State not supported Bug:<00012> -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: FAIL ERROR - Exception : Request Failed: 200 Traceback (most recent call last): File "./lib/XenKvmLib/const.py", line 145, in do_try File "01_created_indication.py", line 146, in main sub_list, ind_names, dict = sub_ind(ip, virt) File "01_created_indication.py", line 60, in sub_ind sub.subscribe(dict['default_url'], dict['default_auth']) File "/data/users/daisy/cimtest/suites/libvirt-cim/lib/XenKvmLib/indication_tester.py", line 345, in subscribe "CreateInstance", auth_hdr) File "/data/users/daisy/cimtest/suites/libvirt-cim/lib/XenKvmLib/indication_tester.py", line 330, in __do_cimpost (resp.status, resp.reason)) Exception: Request Failed: 200 ERROR - None -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 03_reverse_errs.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 04_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- ElementCapabilities - 02_reverse.py: PASS -------------------------------------------------------------------- ElementCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 05_hostsystem_cap.py: PASS -------------------------------------------------------------------- ElementConforms - 01_forward.py: PASS -------------------------------------------------------------------- ElementConforms - 02_reverse.py: PASS -------------------------------------------------------------------- ElementConforms - 03_ectp_fwd_errs.py: PASS -------------------------------------------------------------------- ElementConforms - 04_ectp_rev_errs.py: PASS -------------------------------------------------------------------- ElementSettingData - 01_forward.py: PASS -------------------------------------------------------------------- ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 01_enum.py: PASS -------------------------------------------------------------------- HostSystem - 02_hostsystem_to_rasd.py: PASS -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: PASS -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 01_forward.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 02_reverse.py: PASS -------------------------------------------------------------------- HostedDependency - 01_forward.py: PASS -------------------------------------------------------------------- HostedDependency - 02_reverse.py: PASS -------------------------------------------------------------------- HostedDependency - 03_enabledstate.py: PASS -------------------------------------------------------------------- HostedDependency - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 01_forward.py: PASS -------------------------------------------------------------------- HostedResourcePool - 02_reverse.py: PASS -------------------------------------------------------------------- HostedResourcePool - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedService - 01_forward.py: PASS -------------------------------------------------------------------- HostedService - 02_reverse.py: PASS -------------------------------------------------------------------- HostedService - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedService - 04_reverse_errs.py: PASS -------------------------------------------------------------------- KVMRedirectionSAP - 01_enum_KVMredSAP.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: PASS -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: PASS -------------------------------------------------------------------- Memory - 01_memory.py: PASS -------------------------------------------------------------------- Memory - 02_defgetmem.py: PASS -------------------------------------------------------------------- Memory - 03_mem_gi_errs.py: PASS -------------------------------------------------------------------- NetworkPort - 01_netport.py: PASS -------------------------------------------------------------------- NetworkPort - 02_np_gi_errors.py: PASS -------------------------------------------------------------------- NetworkPort - 03_user_netport.py: PASS -------------------------------------------------------------------- Processor - 01_processor.py: PASS -------------------------------------------------------------------- Processor - 02_definesys_get_procs.py: PASS -------------------------------------------------------------------- Processor - 03_proc_gi_errs.py: PASS -------------------------------------------------------------------- Profile - 01_enum.py: PASS -------------------------------------------------------------------- Profile - 02_profile_to_elec.py: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- RASD - 05_disk_rasd_emu_type.py: PASS -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: PASS -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: PASS -------------------------------------------------------------------- RedirectionService - 03_RedirectionSAP_errs.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: PASS -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: PASS -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS -------------------------------------------------------------------- SystemDevice - 01_forward.py: PASS -------------------------------------------------------------------- SystemDevice - 02_reverse.py: PASS -------------------------------------------------------------------- SystemDevice - 03_fwderrs.py: PASS -------------------------------------------------------------------- VSSD - 01_enum.py: PASS -------------------------------------------------------------------- VSSD - 02_bootldr.py: SKIP -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 01_definesystem_name.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 02_destroysystem.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: XFAIL -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 14_define_sys_disk.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 15_mod_system_settings.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 16_removeresource.py: XFAIL ERROR - 0 RASD insts for domain/mouse:ps2 No such instance (no device domain/mouse:ps2) Bug:<00014> -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS --------------------------------------------------------------------

1 0

[PATCH] Fix key generation
by Kaitlin Rupert 19 Mar '09

19 Mar '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1237399611 25200 # Node ID 5f95e05cced6279241c9200333bc4d41f83c83d8 # Parent daccd46e12ccf2afce3295a41510d7e94ff48d7b Fix key generation Instead of setting up the ssh keys prior to each test run, the keys need to be setup before main.py is called. This fixes the issue where cimtest would complain if an id_rsa key wasn't already available. Now, if the key isn't available, it generates one. Otherwise, it uses the available key. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r daccd46e12cc -r 5f95e05cced6 runtests --- a/runtests Fri Mar 13 10:31:02 2009 -0700 +++ b/runtests Wed Mar 18 11:06:51 2009 -0700 @@ -22,6 +22,8 @@ import sys import os +sys.path.append('./lib') +from VirtLib.utils import setup_ssh_key SUITES_DIR = 'suites' MAIN_FILE = 'main.py' @@ -53,6 +55,8 @@ print "\t%s" % ", ".join(available_suites()) return 1 + setup_ssh_key() + suite = sys.argv[1] print "Starting test suite: %s" % suite diff -r daccd46e12cc -r 5f95e05cced6 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri Mar 13 10:31:02 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Mar 18 11:06:51 2009 -0700 @@ -134,9 +134,9 @@ try: from CimTest.Globals import logger, log_param log_param() - from VirtLib.utils import setup_ssh_key + #from VirtLib.utils import setup_ssh_key from XenKvmLib.test_doms import destroy_and_undefine_all - setup_ssh_key() + #setup_ssh_key() destroy_and_undefine_all(options.ip, options.virt) rc = f() except Exception, e:

3 3

[PATCH] [TEST] Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD
by yunguol＠cn.ibm.com 19 Mar '09

19 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237447329 25200 # Node ID 9f70dfab7a1e354ec6cfdc14d4f80f1a79cfdb41 # Parent a06ef66126e2c8636f0b2ae0d978d38192471e9d [TEST] Add branch to VSMS/14_define_sys_disk.py to fix Caption settings in DiskRASD Tested for Xen, XenFV, KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r a06ef66126e2 -r 9f70dfab7a1e suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Wed Mar 18 06:38:30 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Thu Mar 19 00:22:09 2009 -0700 @@ -36,11 +36,13 @@ from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.rasd import get_default_rasds from XenKvmLib.const import do_main, _image_dir, f9_changeset, \ - KVM_default_disk_dev, get_provider_version +Xen_default_disk_dev, XenFV_default_disk_dev, \ +KVM_default_disk_dev, get_provider_version from XenKvmLib.vxml import get_class from XenKvmLib.common_util import parse_instance_id from XenKvmLib.enumclass import EnumInstances +libvirt_cim_dasd_caption = 707 sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = 'rstest_disk_domain' @@ -66,9 +68,12 @@ for rasd in rasds: if rasd.classname == drasd_cn: - if disk_type != "" and rasd['Caption'] != disk_type: + curr_cim_rev, changeset = get_provider_version(virt, ip) + if disk_type != "" and rasd['Caption'] != disk_type and \ + curr_cim_rev >= libvirt_cim_dasd_caption: continue rasd['Address'] = addr + rasd['VirtualDevice'] = virt + '_default_disk_dev' curr_cim_rev, changeset = get_provider_version(virt, ip) if changeset == f9_changeset and virt == 'KVM': rasd['VirtualDevice'] = KVM_default_disk_dev

2 1

[PATCH 0 of 5] [TEST] Added new tc to verify remote live migration.
by Deepti B. Kalakeri 19 Mar '09

19 Mar '09

Verified with KVM. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>

1 5

[PATCH] [TEST] Fixing the run() fn of vxml.py
by Deepti B. Kalakeri 19 Mar '09

19 Mar '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1237383510 25200 # Node ID a06ef66126e2c8636f0b2ae0d978d38192471e9d # Parent daccd46e12ccf2afce3295a41510d7e94ff48d7b [TEST] Fixing the run() fn of vxml.py. Fixing run() fn of vxml.py to be able to run virsh commands on the remote machine. We need this for successful execution of the ssh remote commands like net-createa via virsh, otherwise the remote execution of the command fails when the file is not locally present on the remote machine. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r daccd46e12cc -r a06ef66126e2 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Mar 13 10:31:02 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Mar 18 06:38:30 2009 -0700 @@ -164,12 +164,29 @@ else: name = param + # We need to copy the xml files to remote machine for + # successful execution of the ssh remote commands like net-createa via virsh, + # otherwise the remote execution of the command fails when the + # file is not locally present on the remote machine. + if vcmd == 'define' or vcmd == 'create' or vcmd == 'net-create' or \ + vcmd == 'pool-create': + s, o = utils.copy_remote(ip, name, remote=name) + if s != 0: + logger.error("Failed to copy the tempxml file to execute '%s'"\ + " cmd on '%s'", vcmd, ip) + return 0 + cmd = 'virsh -c %s %s %s' % (self.vuri, vcmd, name) s, o = utils.run_remote(ip, cmd) - if vcmd == 'define' or vcmd == 'create': + if vcmd == 'define' or vcmd == 'create' or vcmd == 'net-create' \ + or vcmd == 'pool-create': # don't wait till gc does the ntf.close() ntf.close() + # Remove the tmp file copied to the remote machine + cmd = 'rm -rf %s' % name + utils.run_remote(ip, cmd) + return s == 0 class NetXML(Virsh, XMLClass):

3 3

[PATCH] [TEST] #4 Add tc to verify VSMS.RemoveResourceSettings() with correct resource
by yunguol＠cn.ibm.com 19 Mar '09

19 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237430532 25200 # Node ID 0f841c14cbc263d2a8180f158ea718eebfe8ce87 # Parent daccd46e12ccf2afce3295a41510d7e94ff48d7b [TEST] #4 Add tc to verify VSMS.RemoveResourceSettings() with correct resource Updates from 3 to 4: 1) Include SKIP and XFAIL_RC from import statement 2) Remove else in dev for loop 3) Rewrite raise Exception desc using percent instead of comma 4) Use status setting to call undefine() one time Updates from 2 to 3: 1) Capture the return of RemoveResourceSettings() and check for an error. 2) Verify InputRASD Updates from 1 to 2: Get RASD instances by SystemDevice and SettingsDefineState associaton Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r daccd46e12cc -r 0f841c14cbc2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py Wed Mar 18 19:42:12 2009 -0700 @@ -0,0 +1,115 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# Guolian Yun <yunguol(a)cn.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import sys +from XenKvmLib.vsms import get_vsms_class +from XenKvmLib.vxml import get_class +from XenKvmLib.classes import get_typed_class +from XenKvmLib.assoc import AssociatorNames +from CimTest.Globals import logger +from XenKvmLib.const import do_main, get_provider_version +from CimTest.ReturnCodes import FAIL, PASS, SKIP, XFAIL_RC + +libvirt_bug = '00014' +sup_types = ['Xen', 'KVM', 'XenFV'] +default_dom = 'domain' +rem_res_err_rev_start = 779 +rem_res_err_rev_end = 828 +nmac = '00:11:22:33:44:55' + +@do_main(sup_types) +def main(): + options = main.options + + if options.virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + cxml = get_class(options.virt)(default_dom, disk=nddev, mac=nmac) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + try: + # Get system devices through SystemDevice assocation + sd_classname = get_typed_class(options.virt, 'SystemDevice') + cs_classname = get_typed_class(options.virt, 'ComputerSystem') + + devs = AssociatorNames(options.ip, sd_classname, cs_classname, + Name=default_dom, CreationClassName=cs_classname) + + if len(devs) == 0: + raise Exception("No devices returned") + + # Get RASD instances through SettingsDefineState + sds_classname = get_typed_class(options.virt, 'SettingsDefineState') + mem = get_typed_class(options.virt, 'Memory') + proc = get_typed_class(options.virt, 'Processor') + dev_not_rem = [mem, proc] + + service = get_vsms_class(options.virt)(options.ip) + for dev in devs: + if dev['CreationClassName'] in dev_not_rem: + continue + ccn = dev['CreationClassName'] + sccn = dev['SystemCreationClassName'] + rasd = AssociatorNames(options.ip, sds_classname, ccn, + DeviceID = dev['DeviceID'], + CreationClassName = ccn, + SystemName = dev['SystemName'], + SystemCreationClassName = sccn) + if len(rasd) != 1: + raise Exception("%i RASD insts for %s" + % (len(rasd), dev['DeviceID'])) + # Invoke RemoveResourceSettings() to remove resource + ret = service.RemoveResourceSettings(ResourceSettings=[rasd[0]]) + if ret[0] != 0: + raise Exception("RemoveResourceSettings() returned %d " + + "removing %s" % (ret[0], rasd[0])) + except Exception, details: + logger.error(details) + cxml.undefine(options.ip) + input = get_typed_class(options.virt, 'PointingDevice') + if ccn == input: + return XFAIL_RC(libvirt_bug) + return FAIL + + cxml.dumpxml(options.ip) + device = cxml.get_value_xpath('/domain/@devices') + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + + if device == None: + status = PASS + elif device != None and curr_cim_rev >= rem_res_err_rev_start and\ + curr_cim_rev < rem_res_err_rev_end: + status = SKIP + else: + logger.error('The devices are not removed successfully') + status = FAIL + + cxml.undefine(options.ip) + return status + +if __name__ == "__main__": + sys.exit(main())

1 0

[PATCH] [TEST] #3 Add tc to verify VSMS.RemoveResourceSettings() with correct resource
by yunguol＠cn.ibm.com 18 Mar '09

18 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237342979 25200 # Node ID fc062835ef35568b7379edb2e99f173f7833d3a6 # Parent daccd46e12ccf2afce3295a41510d7e94ff48d7b [TEST] #3 Add tc to verify VSMS.RemoveResourceSettings() with correct resource Updates from 2 to 3: 1) Capture the return of RemoveResourceSettings() and check for an error. 2) Verify InputRASD Updates from 1 to 2: Get RASD instances by SystemDevice and SettingsDefineState associaton Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r daccd46e12cc -r fc062835ef35 suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py Tue Mar 17 19:22:59 2009 -0700 @@ -0,0 +1,112 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# Guolian Yun <yunguol(a)cn.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import sys +from XenKvmLib.vsms import get_vsms_class +from XenKvmLib.vxml import get_class +from XenKvmLib.classes import get_typed_class +from XenKvmLib.assoc import AssociatorNames +from CimTest.Globals import logger +from XenKvmLib.const import do_main, get_provider_version +from CimTest.ReturnCodes import FAIL, PASS + +sup_types = ['Xen', 'KVM', 'XenFV'] +default_dom = 'domain' +rem_res_err_rev_start = 779 +rem_res_err_rev_end = 828 +ntype = 'network' +nmac = '00:11:22:33:44:55' + +@do_main(sup_types) +def main(): + options = main.options + + if options.virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + cxml = get_class(options.virt)(default_dom, disk=nddev, mac=nmac) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + try: + # Get system devices through SystemDevice assocation + sd_classname = get_typed_class(options.virt, 'SystemDevice') + cs_classname = get_typed_class(options.virt, 'ComputerSystem') + + devs = AssociatorNames(options.ip, sd_classname, cs_classname, + Name=default_dom, CreationClassName=cs_classname) + + if len(devs) == 0: + raise Exception("No devices returned") + + # Get RASD instances through SettingsDefineState + sds_classname = get_typed_class(options.virt, 'SettingsDefineState') + mem = get_typed_class(options.virt, 'Memory') + proc = get_typed_class(options.virt, 'Processor') + dev_not_rem = [mem, proc] + + service = get_vsms_class(options.virt)(options.ip) + for dev in devs: + if dev['CreationClassName'] in dev_not_rem: + continue + else: + ccn = dev['CreationClassName'] + sccn = dev['SystemCreationClassName'] + rasd = AssociatorNames(options.ip, sds_classname, ccn, + DeviceID = dev['DeviceID'], + CreationClassName = ccn, + SystemName = dev['SystemName'], + SystemCreationClassName = sccn) + if len(rasd) != 1: + raise Exception("%i RASD insts for %s", len(rasd), dev.DeviceID) + # Invoke RemoveResourceSettings() to remove resource + ret = service.RemoveResourceSettings(ResourceSettings=[rasd[0]]) + if ret[0] != 0: + raise Exception("Remove %s error, please check", rasd[0]) + except Exception, details: + logger.error(details) + cxml.undefine(options.ip) + return FAIL + + cxml.dumpxml(options.ip) + device = cxml.get_value_xpath('/domain/@devices') + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + + if device == None: + return PASS + elif device != None and curr_cim_rev >= rem_res_err_rev_start and\ + curr_cim_rev < rem_res_err_rev_end: + return SKIP + else: + logger.error('The devices are not removed successfully') + cxml.undefine(options.ip) + return FAIL + + cxml.undefine(options.ip) + return PASS + +if __name__ == "__main__": + sys.exit(main())

3 2

[PATCH 0 of 4] [TEST][RFC] Added new tc to verify remote live migration.
by Deepti B. Kalakeri 18 Mar '09

18 Mar '09

Verified with KVM. The test case will not pass for KVM since the guest information needs to have emulator information without which the remote migration fails. The support to pass the emulator information via VirtualSystemMigrationSettingData is not yet available. As a workaround for verification of the tc. ------------------------------------------- 1) create a KVM VM which has the emulator information outside the tc on the comman line. 2) comment out the setup_guest() call, also comment the undefine and destroy lines at the end of the tc. 3) specify the name of the guest create in test_dom before calling local_remote_migrate(). Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>

3 10