- CIM - libvirt List Archives

[PATCH] [TEST] #2 Some VirtualSystemManagementService -t 02_destroysystem.py cleanup
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214945125 25200 # Node ID ea52dde5ac3e1b10d5aa59b101d91b8ffc5b127e # Parent cb09fbc0900ca656f629057742f19f1771fed4f8 [TEST] #2 Some VirtualSystemManagementService -t 02_destroysystem.py cleanup. Add checks to see if the define() / start() calls pass. Added cleanup_env() function to destroy()/undefine() guest in case of error. Ensure status is set to PASS only if the guest is not found in the domain list after the DestroySystem() call is made. Updated from 1 to 2: -Fix error message - if we are unable to start the guest, error message should say "Failed to start the dom: %s" Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r cb09fbc0900c -r ea52dde5ac3e suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Tue Jul 01 13:42:52 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Tue Jul 01 13:45:25 2008 -0700 @@ -35,47 +35,53 @@ sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] default_dom = 'test_domain' +def cleanup_env(ip, cxml): + cxml.destroy(ip) + cxml.undefine(ip) + @do_main(sup_types) def main(): options = main.options service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) - cxml.define(options.ip) - cxml.start(options.ip) + ret = cxml.define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + ret = cxml.start(options.ip) + if not ret: + logger.error("Failed to start the dom: %s", default_dom) + cleanup_env(options.ip, cxml) + return FAIL classname = get_typed_class(options.virt, 'ComputerSystem') cs_ref = CIMInstanceName(classname, keybindings = { 'Name':default_dom, 'CreationClassName':classname}) list_before = domain_list(options.ip, options.virt) - status = PASS - rc = -1 + if default_dom not in list_before: + logger.error("Domain not in domain list") + cleanup_env(options.ip, cxml) + return FAIL try: service.DestroySystem(AffectedSystem=cs_ref) - rc = 0 except Exception, details: logger.error('Unknow exception happened') logger.error(details) - status = FAIL + cleanup_env(options.ip, cxml) + return FAIL list_after = domain_list(options.ip, options.virt) - status = PASS - if default_dom not in list_before: - logger.error("Domain not started, check config") + if default_dom in list_after: + logger.error("Domain %s not destroyed: provider didn't return error" % \ + default_dom) + cleanup_env(options.ip, cxml) status = FAIL else: - destroyed = set(list_before) - set(list_after) - if len(destroyed) != 1: - logger.error("Destroyed multiple domains") - status = FAIL - elif default_dom not in destroyed: - logger.error("Wrong domain destroyed") - status = FAIL - - cxml.undefine(options.ip) + status = PASS return status

2 1

[PATCH] [TEST] #2 A few migration related fixes
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214942997 25200 # Node ID da0aebe9e441c2a0020fad9d063c489026eee2b2 # Parent 0c3bd5f782c4776719799ad5c74226c95e70092e [TEST] #2 A few migration related fixes. Fixes: -Remove destroy_and_undefine_domain() call from migrate_guest_to_host(). This call takes the domain name as a parameter, but migrate_guest_to_host() doesn't take the domain name So calling destroy_and_undefine_domain() resulted in an error. -Add a hack to get_typed_class() so it supports Virt_MigrationJob (which doesn't fit the typical <virt>_<basename> pattern. Updates from 1 to 2: -Improve error catching / reporting in start_guest_get_ref() Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 0c3bd5f782c4 -r da0aebe9e441 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py Tue Jul 01 13:09:57 2008 -0700 @@ -42,19 +42,26 @@ def start_guest_get_ref(ip, guest_name): try: xmlfile = testxml(guest_name) - define_test_domain(xmlfile, ip) + ret = define_test_domain(xmlfile, ip) + if not ret: + return FAIL, None - start_test_domain(guest_name, ip) + ret = start_test_domain(guest_name, ip) + if not ret: + return FAIL, None + time.sleep(10) except Exception: logger.error("Error creating domain %s" % guest_name) - destroy_and_undefine_domain(guest_name, options.ip) return FAIL, None classname = 'Xen_ComputerSystem' cs_ref = CIMInstanceName(classname, keybindings = { 'Name':guest_name, 'CreationClassName':classname}) + + if cs_ref is None: + return FAIL, None return PASS, cs_ref @@ -80,6 +87,7 @@ status, cs_ref = start_guest_get_ref(options.ip, dom_name) if status != PASS: + destroy_and_undefine_domain(guest_name, options.ip) return FAIL guest_name = cs_ref['Name'] @@ -90,10 +98,10 @@ return FAIL status, ret = migrate_guest_to_host(service, cs_ref, target_ip) - if status == FAIL: logger.error("MigrateVirtualSystemToHost: unexpected list length %s" % len(ret)) + destroy_and_undefine_domain(dom_name, options.ip) return status elif len(ret) == 2: id = ret[1]['Job'].keybindings['InstanceID'] @@ -102,7 +110,7 @@ guest_name, local_migrate) - destroy_and_undefine_domain(dom_name, options.ip) + destroy_and_undefine_domain(dom_name, options.ip) return status diff -r 0c3bd5f782c4 -r da0aebe9e441 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Tue Jul 01 13:09:57 2008 -0700 @@ -145,12 +145,11 @@ logger.info("Migrating guest with the following options:") logger.info("%s" % item) - status, ret = migrate_guest_to_host(service, cs_ref, target_ip, - item) - + status, ret = migrate_guest_to_host(service, cs_ref, target_ip, item) if status == FAIL: logger.error("MigrateVirtualSystemToHost: unexpected list length %s" % len(ret)) + destroy_and_undefine_domain(dom_name, options.ip) return status elif len(ret) == 2: id = ret[1]['Job'].keybindings['InstanceID'] diff -r 0c3bd5f782c4 -r da0aebe9e441 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Tue Jul 01 13:09:57 2008 -0700 @@ -23,7 +23,8 @@ def get_typed_class(virt, basename): if virt not in virt_types: - raise ValueError('Invalid class type') + if virt != "Virt" and basename != "MigrationJob": + raise ValueError('Invalid class type') if basename == None or basename == '': raise ValueError('Invalide class base name') diff -r 0c3bd5f782c4 -r da0aebe9e441 suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Tue Jul 01 13:09:57 2008 -0700 @@ -95,10 +95,10 @@ except Exception, details: logger.error("Error invoke method 'MigrateVirtualSystemToHost\'.") logger.error("%s", details) + return FAIL, ret if len(ret) == 0: logger.error("MigrateVirtualSystemToHost returns an empty list") - destroy_and_undefine_domain(test_dom, ip) return FAIL, ret return PASS, ret

2 1

[PATCH] Report failure to deliver indication
by Dan Smith 01 Jul '08

01 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1214941651 25200 # Node ID cb343a986592c25c487c53042ad889fa24ea9d97 # Parent e41428ac70e85d4cecc5fd0738680fc11de5e775 Report failure to deliver indication Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r e41428ac70e8 -r cb343a986592 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Tue Jul 01 12:47:21 2008 -0700 +++ b/src/Virt_ComputerSystemIndication.c Tue Jul 01 12:47:31 2008 -0700 @@ -240,8 +240,12 @@ CU_DEBUG("Delivering Indication: %s", CMGetCharPtr(CMObjectPathToString(ind_op, NULL))); - stdi_deliver(broker, ctx, args, ind); - CU_DEBUG("Delivered"); + s = stdi_deliver(broker, ctx, args, ind); + if (s.rc == CMPI_RC_OK) { + CU_DEBUG("Indication delivered"); + } else { + CU_DEBUG("Not delivered: %s", CMGetCharPtr(s.msg)); + } out: return ret;

2 1

[PATCH] Reduce the non-CIM cycle timer from 3 minutes to 1 minute
by Dan Smith 01 Jul '08

01 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1214941641 25200 # Node ID e41428ac70e85d4cecc5fd0738680fc11de5e775 # Parent 117ae7952d7264c64a3abbf236cf18758ae0200d Reduce the non-CIM cycle timer from 3 minutes to 1 minute Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 117ae7952d72 -r e41428ac70e8 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Tue Jul 01 12:47:21 2008 -0700 +++ b/src/Virt_ComputerSystemIndication.c Tue Jul 01 12:47:21 2008 -0700 @@ -56,7 +56,7 @@ static pthread_mutex_t lifecycle_mutex = PTHREAD_MUTEX_INITIALIZER; static bool lifecycle_enabled = 0; -#define WAIT_TIME 180 +#define WAIT_TIME 60 #define FAIL_WAIT_TIME 2 struct dom_xml {

2 1

[PATCH] For pause, reboot, and enable add support for guests in the NOSTATE state
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214428450 25200 # Node ID bd1ee412c6853d5fd005eca535b0b04446e08fb4 # Parent edf96787c23dc7a91a008916b4b00b22fc22703a For pause, reboot, and enable add support for guests in the NOSTATE state. It's possible that a XenFV guest might return no state instead of blocked or running. When xend schedules to guest to run, the guest needs qemu to run (to handle device emulation). If we get the state of the guest before qemu is done running its setup, libvirt reports no state. This should be a safe approach - we return an error if the guest is in some other state or if libvirt is unable to successfully change the state of the guest. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r edf96787c23d -r bd1ee412c685 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Jun 25 12:34:09 2008 -0700 +++ b/src/Virt_ComputerSystem.c Wed Jun 25 14:14:10 2008 -0700 @@ -733,6 +733,7 @@ switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: + case VIR_DOMAIN_NOSTATE: CU_DEBUG("Pause domain"); ret = virDomainSuspend(dom); break; @@ -758,6 +759,7 @@ switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: + case VIR_DOMAIN_NOSTATE: CU_DEBUG("Reboot domain"); ret = virDomainReboot(dom, 0); break; @@ -783,6 +785,7 @@ switch (info->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_BLOCKED: + case VIR_DOMAIN_NOSTATE: CU_DEBUG("Reset domain"); ret = domain_reset(dom); break;

3 3

[PATCH] [TEST] Fix VirtualSystemSettingDataComponent - 01_forward.py failure
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214856251 25200 # Node ID 5f49d1d08e8e7f9b905ef77d1a43e4b54917bd03 # Parent 7d3d5dcffad210d1da9f208ce1881f391a21ba9e [TEST] Fix VirtualSystemSettingDataComponent - 01_forward.py failure. Test was expecting one ProcRASD for each domain processor. It should expect onky one RASD. Also updated this test to use PASS/FAIL, removed global variables, and cleaned up indention. This test will need to be updated to support other XenFV, etc. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 7d3d5dcffad2 -r 5f49d1d08e8e suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Mon Jun 30 12:04:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Mon Jun 30 13:04:11 2008 -0700 @@ -58,6 +58,7 @@ from CimTest import Globals from XenKvmLib import assoc from CimTest.Globals import logger, do_main +from CimTest.ReturnCodes import FAIL, PASS sup_types = ['Xen'] @@ -67,35 +68,30 @@ test_disk = 'xvda' status = 0 VSType = "Xen" -vssd_names = [] -vssd_values = [] -RASD_cllist = [ - 'Xen_DiskResourceAllocationSettingData', \ - 'Xen_MemResourceAllocationSettingData', \ - 'Xen_NetResourceAllocationSettingData', \ - 'Xen_ProcResourceAllocationSettingData' - ] - def init_list(): """ Creating the lists that will be used for comparisons. """ - prop_list = [] - prop_list = ["%s/%s" % (test_dom, test_disk), \ - "%s/%s" % (test_dom, "mem"), \ - "%s/%s" % (test_dom, test_mac) - ] - proc_list = [] - for i in range(test_vcpus): - proc_list.append("%s/%s" % (test_dom, i)) - return prop_list, proc_list + + rlist = ['Xen_DiskResourceAllocationSettingData', + 'Xen_MemResourceAllocationSettingData', + 'Xen_NetResourceAllocationSettingData', + 'Xen_ProcResourceAllocationSettingData' + ] + + prop_list = {rlist[0] : "%s/%s" % (test_dom, test_disk), + rlist[1] : "%s/%s" % (test_dom, "mem"), + rlist[2] : "%s/%s" % (test_dom, test_mac), + rlist[3] : "%s/%s" % (test_dom, "proc") + } + + return prop_list def build_vssd_info(ip, vssd): """ Creating the vssd fileds lists that will be used for comparisons. """ - global vssd_names, vssd_values if vssd.Bootloader == "" or vssd.Caption == "" or \ vssd.InstanceID == "" or vssd.ElementName == "" or \ @@ -105,26 +101,17 @@ test_domain_function(test_dom, ip, "undefine") sys.exit(status) - vssd_names = [ - 'Bootloader', \ - 'Caption', \ - 'InstanceID', \ - 'ElementName', \ - 'VirtualSystemIdentifier', \ - 'VirtualSystemType', \ - ] - - vssd_values = [ - vssd.Bootloader, \ - vssd.Caption, \ - vssd.InstanceID, \ - vssd.ElementName, \ - vssd.VirtualSystemIdentifier, \ - vssd.VirtualSystemType, \ - ] + vssd_vals = {'Bootloader' : vssd.Bootloader, + 'Caption' : vssd.Caption, + 'InstanceID' : vssd.InstanceID, + 'ElementName' : vssd.ElementName, + 'VirtualSystemIdentifier' : vssd.VirtualSystemIdentifier, + 'VirtualSystemType' : vssd.VirtualSystemType + } + return vssd_vals -def assoc_values(ip, assoc_info, cn): +def assoc_values(ip, assoc_info, cn, an, vals): """ The association info of Xen_VirtualSystemSettingDataComponent with every RASDclass is @@ -132,36 +119,29 @@ Caption, InstanceID, ElementName, VirtualSystemIdentifier, VirtualSystemType, Bootloader """ - global status - global vssd_names, vssd_values try: if len(assoc_info) != 1: - Globals.logger.error("Xen_VirtualSystemSettingDataComponent \ -returned %i Resource objects for class '%s'", len(assoc_info),cn) - status = 1 - return status + Globals.logger.error("%s returned %i resource objects for '%s'" % \ + (an, len(assoc_info), cn)) + return FAIL - for idx in range(len(vssd_names)): - if assoc_info[0][vssd_names[idx]] != vssd_values[idx]: - Globals.logger.error("%s Mismatch", vssd_names[idx]) - Globals.logger.error("Returned %s instead of %s", \ - assoc_info[0][vssd_names[idx]], \ - vssd_fields[idx]) - status = 1 - if status != 0: - break + for prop, val in vals.iteritems(): + if assoc_info[0][prop] != val: + Globals.logger.error("%s mismatch: returned %s instead of %s" %\ + (prop, assoc_info[0][prop], val)) + return FAIL + + return PASS + except Exception, detail : logger.error("Exception in assoc_values function: %s" % detail) - status = 1 - test_domain_function(test_dom, ip, "undefine") - return status - + return FAIL @do_main(sup_types) def main(): options = main.options - global status + status = FAIL destroy_and_undefine_all(options.ip) test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \ @@ -171,9 +151,7 @@ ret = test_domain_function(test_xml, options.ip, cmd = "define") if not ret: logger.error("Failed to define the dom: %s", test_dom) - status = 1 - return status - + return FAIL instIdval = "%s:%s" % (VSType, test_dom) keyname = "InstanceID" @@ -183,48 +161,39 @@ vssd = enumclass.getInstance(options.ip, \ enumclass.Xen_VirtualSystemSettingData, \ key_list) - build_vssd_info(options.ip, vssd) + if vssd is None: + logger.error("VSSD instance for %s not found" % test_dom) + test_domain_function(test_dom, options.ip, "undefine") + return FAIL + + vssd_vals = build_vssd_info(options.ip, vssd) except Exception, detail : logger.error(Globals.CIM_ERROR_GETINSTANCE, \ - 'Xen_VirtualSystemSettingData') + 'Xen_VirtualSystemSettingData') logger.error("Exception : %s" % detail) test_domain_function(test_dom, options.ip, "undefine") - status = 1 - return status + return FAIL - prop_list, proc_list = init_list() + prop_list = init_list() try: - idx = 0 - # Looping through the RASD_cllist, call association - # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist - for rasd_cname in RASD_cllist: - if rasd_cname != 'Xen_ProcResourceAllocationSettingData': - assoc_info = assoc.Associators(options.ip, \ - 'Xen_VirtualSystemSettingDataComponent', \ - rasd_cname, \ - InstanceID = prop_list[idx]) - # Verify the association fields returned for particular rasd_cname. - assoc_values(options.ip, assoc_info, rasd_cname) - idx = idx + 1 - else: - # Xen_ProcResourceAllocationSettingData, we need to find - # association information for all the proc InstanceID and hence - # we loop from 0 to (test_vcpus - 1 ) - for index in range(len(proc_list)): - assoc_info = assoc.Associators(options.ip, \ - 'Xen_VirtualSystemSettingDataComponent', \ - rasd_cname, \ - InstanceID = prop_list[index]) + # Looping through the RASD_cllist, call association + # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist + an = 'Xen_VirtualSystemSettingDataComponent' + for rasd_cname, prop in prop_list.iteritems(): + assoc_info = assoc.Associators(options.ip, an, rasd_cname, + InstanceID = prop) # Verify the association fields returned for particular rasd_cname. - assoc_values(options.ip, assoc_info, rasd_cname) + status = assoc_values(options.ip, assoc_info, rasd_cname, an, + vssd_vals) + if status != PASS: + break except Exception, detail : - logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ - 'Xen_VirtualSystemSettingDataComponent') + logger.error(Globals.CIM_ERROR_ASSOCIATORS, an) logger.error("Exception : %s" % detail) - status = 1 + status = FAIL test_domain_function(test_dom, options.ip, "undefine") return status

2 2

[PATCH] [TEST] Some VirtualSystemManagementService -t 02_destroysystem.py cleanup
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214852675 25200 # Node ID 7d3d5dcffad210d1da9f208ce1881f391a21ba9e # Parent 692121d37b3aefafce0d6856d81468add629514d [TEST] Some VirtualSystemManagementService -t 02_destroysystem.py cleanup. Add checks to see if the define() / start() calls pass. Added cleanup_env() function to destroy()/undefine() guest in case of error. Ensure status is set to PASS only if the guest is not found in the domain list after the DestroySystem() call is made. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 692121d37b3a -r 7d3d5dcffad2 suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Jun 30 09:58:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Mon Jun 30 12:04:35 2008 -0700 @@ -35,47 +35,53 @@ sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] default_dom = 'test_domain' +def cleanup_env(ip, cxml): + cxml.destroy(ip) + cxml.undefine(ip) + @do_main(sup_types) def main(): options = main.options service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) - cxml.define(options.ip) - cxml.start(options.ip) + ret = cxml.define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + ret = cxml.start(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + cleanup_env(options.ip, cxml) + return FAIL classname = get_typed_class(options.virt, 'ComputerSystem') cs_ref = CIMInstanceName(classname, keybindings = { 'Name':default_dom, 'CreationClassName':classname}) list_before = domain_list(options.ip, options.virt) - status = PASS - rc = -1 + if default_dom not in list_before: + logger.error("Domain not in domain list") + cleanup_env(options.ip, cxml) + return FAIL try: service.DestroySystem(AffectedSystem=cs_ref) - rc = 0 except Exception, details: logger.error('Unknow exception happened') logger.error(details) - status = FAIL + cleanup_env(options.ip, cxml) + return FAIL list_after = domain_list(options.ip, options.virt) - status = PASS - if default_dom not in list_before: - logger.error("Domain not started, check config") + if default_dom in list_after: + logger.error("Domain %s not destroyed: provider didn't return error" % \ + default_dom) + cleanup_env(options.ip, cxml) status = FAIL else: - destroyed = set(list_before) - set(list_after) - if len(destroyed) != 1: - logger.error("Destroyed multiple domains") - status = FAIL - elif default_dom not in destroyed: - logger.error("Wrong domain destroyed") - status = FAIL - - cxml.undefine(options.ip) + status = PASS return status

2 2

Fw: [Fwd: [Libvirt-cim] [PATCH] [TEST] A few migration related fixes]
by Guo Lian Yun 01 Jul '08

01 Jul '08

----- Forwarded by Guo Lian Yun/China/IBM on 2008-07-01 10:29 ----- Guo Lian Yun/China/IBM 2008-07-01 10:24 To Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> cc Subject Re: [Fwd: [Libvirt-cim] [PATCH] [TEST] A few migration related fixes] Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> wrote on 2008-07-01 00:05:03: > Can I get a review of this patch? > > Thanks! > -- > Kaitlin Rupert > IBM Linux Technology Center > kaitlin(a)linux.vnet.ibm.com > > ----- Message from Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> on > Wed, 25 Jun 2008 14:18:23 -0700 ----- > > To: > > libvirt-cim(a)redhat.com > > Subject: > > [Libvirt-cim] [PATCH] [TEST] A few migration related fixes > > # HG changeset patch > # User Kaitlin Rupert <karupert(a)us.ibm.com> > # Date 1214423985 25200 > # Node ID ef376bdad2e186904b15cda1afd230d8056e8015 > # Parent 5c90c9a2fd567d7cf592932db189afbc8a4756f8 > [TEST] A few migration related fixes. > > Fixes: > -Remove destroy_and_undefine_domain() call from > migrate_guest_to_host(). This call takes the domain name as a > parameter, but migrate_guest_to_host() doesn't take the domain name > So calling destroy_and_undefine_domain() resulted in an error. > -Add a hack to get_typed_class() so it supports Virt_MigrationJob > (which doesn't fit the typical <virt>_<basename> pattern. > > Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> > > diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py > --- a/suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py > Thu Jun 19 10:35:59 2008 -0700 > +++ b/suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/01_migratable_host.py > Wed Jun 25 12:59:45 2008 -0700 > @@ -90,10 +90,10 @@ > return FAIL > > status, ret = migrate_guest_to_host(service, cs_ref, target_ip) > - > if status == FAIL: > logger.error("MigrateVirtualSystemToHost: unexpected list length %s" > % len(ret)) > + destroy_and_undefine_domain(dom_name, options.ip) > return status > elif len(ret) == 2: > id = ret[1]['Job'].keybindings['InstanceID'] > @@ -102,7 +102,7 @@ > guest_name, local_migrate) > > > - destroy_and_undefine_domain(dom_name, options.ip) > + destroy_and_undefine_domain(dom_name, options.ip) > > return status > Do you think we should also to call destroy_and_undefine_domain() below based on your patch? status, cs_ref = start_guest_get_ref(options.ip, dom_name) if status != PASS: + destroy_and_undefine_domain(dom_name, options.ip) return FAIL > diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py > --- a/suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py > Thu Jun 19 10:35:59 2008 -0700 > +++ b/suites/libvirt- > cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py > Wed Jun 25 12:59:45 2008 -0700 > @@ -145,12 +145,11 @@ > > logger.info("Migrating guest with the following options:") > logger.info("%s" % item) > - status, ret = migrate_guest_to_host(service, cs_ref, target_ip, > - item) > - > + status, ret = migrate_guest_to_host(service, cs_ref, target_ip, item) > if status == FAIL: > logger.error("MigrateVirtualSystemToHost: unexpected > list length %s" > % len(ret)) > + destroy_and_undefine_domain(dom_name, options.ip) > return status > elif len(ret) == 2: > id = ret[1]['Job'].keybindings['InstanceID'] > diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt- > cim/lib/XenKvmLib/classes.py > --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Thu Jun 19 10: > 35:59 2008 -0700 > +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Wed Jun 25 12: > 59:45 2008 -0700 > @@ -23,7 +23,8 @@ > > def get_typed_class(virt, basename): > if virt not in virt_types: > - raise ValueError('Invalid class type') > + if virt != "Virt" and basename != "MigrationJob": > + raise ValueError('Invalid class type') > > if basename == None or basename == '': > raise ValueError('Invalide class base name') > diff -r 5c90c9a2fd56 -r ef376bdad2e1 suites/libvirt- > cim/lib/XenKvmLib/vsmigrations.py > --- a/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Thu Jun 19 > 10:35:59 2008 -0700 > +++ b/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Wed Jun 25 > 12:59:45 2008 -0700 > @@ -95,10 +95,10 @@ > except Exception, details: > logger.error("Error invoke method 'MigrateVirtualSystemToHost\'.") > logger.error("%s", details) > + return FAIL, ret > > if len(ret) == 0: > logger.error("MigrateVirtualSystemToHost returns an empty list") > - destroy_and_undefine_domain(test_dom, ip) > return FAIL, ret > > return PASS, ret > > _______________________________________________ > Libvirt-cim mailing list > Libvirt-cim(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvirt-cim

2 1

[PATCH 0 of 2] [CU] Indication-related fixes
by Dan Smith 01 Jul '08

01 Jul '08

Changes detailed per patch

2 3

[PATCH] Fix CSI failure path
by Dan Smith 01 Jul '08

01 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1214857687 25200 # Node ID 02aaaea433146ad4f6dc5c63b34701bc46567fb4 # Parent f72441bf10fdd467d3f47d33e4bfb29537cc53e1 Fix CSI failure path Since connect_by_classname() can return NULL without it being an error condition, printing the status message is not valid unless you check the s.rc field. I don't think the message adds much here, since there is only one place that the message is filled out, and it's a static string. Instead, change the debug message to something useful to avoid the SEGV. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f72441bf10fd -r 02aaaea43314 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Mon Jun 30 13:12:21 2008 -0700 +++ b/src/Virt_ComputerSystemIndication.c Mon Jun 30 13:28:07 2008 -0700 @@ -339,7 +339,8 @@ conn = connect_by_classname(_BROKER, args->classname, &s); if (conn == NULL) { - CU_DEBUG("Failed to connect: %s", CMGetCharPtr(s.msg)); + CU_DEBUG("Unable to start lifecycle thread: " + "Failed to connect (cn: %s)", args->classname); goto out; }

2 1