July 2008 - CIM - libvirt List Archives

[PATCH] {#2) Add state transition poll to DestroySystem() call
by Kaitlin Rupert 02 Jul '08

02 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1215027772 25200 # Node ID 4d99e7ac6e39a1f077b5476fdb3ad01e32c5fe13 # Parent 35d00def6476eb4e21b3a26837682362917f9915 {#2) Add state transition poll to DestroySystem() call. Updates from 1 to 2: -Remove polling loop -Move indications trigger to where the status is set (no need to duplicate the call). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 35d00def6476 -r 4d99e7ac6e39 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Jul 02 08:57:04 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Jul 02 12:42:52 2008 -0700 @@ -858,11 +858,17 @@ infostore_delete(virConnectGetType(conn), dom_name); virDomainDestroy(dom); /* Okay for this to fail */ + + dom = virDomainLookupByName(conn, dom_name); + if (dom == NULL) { + CU_DEBUG("Domain successfully destroyed"); + rc = IM_RC_OK; + goto error; + } + if (virDomainUndefine(dom) == 0) { + CU_DEBUG("Domain successfully destroyed and undefined"); rc = IM_RC_OK; - trigger_indication(context, - "ComputerSystemDeletedIndication", - reference); } error: @@ -874,8 +880,12 @@ cu_statusf(_BROKER, &status, CMPI_RC_ERR_FAILED, "Unable to retrieve domain name."); - else if (rc == IM_RC_OK) + else if (rc == IM_RC_OK) { status = (CMPIStatus){CMPI_RC_OK, NULL}; + trigger_indication(context, + "ComputerSystemDeletedIndication", + reference); + } virDomainFree(dom); virConnectClose(conn);

1 0

[PATCH] Add state transition poll to DestroySystem() call
by Kaitlin Rupert 02 Jul '08

02 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214850941 25200 # Node ID 98e6e7b6160be701c4124cb04eef9c893fdfaa1d # Parent b123b6b1fb08c3ab956f1c33801e743e082192b9 Add state transition poll to DestroySystem() call. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r b123b6b1fb08 -r 98e6e7b6160b src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Jun 27 08:59:09 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Jun 30 11:35:41 2008 -0700 @@ -56,6 +56,7 @@ #define DEFAULT_MAC_PREFIX "00:16:3e" #define DEFAULT_XEN_WEIGHT 1024 +#define STATE_TRANSITION_TIMEOUT 120 const static CMPIBroker *_BROKER; @@ -832,6 +833,8 @@ CMPIObjectPath *sys; virConnectPtr conn = NULL; virDomainPtr dom = NULL; + virDomainInfo info; + int i; conn = connect_by_classname(_BROKER, CLASSNAME(reference), @@ -858,6 +861,34 @@ infostore_delete(virConnectGetType(conn), dom_name); virDomainDestroy(dom); /* Okay for this to fail */ + + for (i = 0; i < STATE_TRANSITION_TIMEOUT; i++) { + if ((i % 30) == 0) { + CU_DEBUG("Polling for destroy completion..."); + } + + dom = virDomainLookupByName(conn, dom_name); + if (dom == NULL) { + CU_DEBUG("Domain successfully destroyed"); + rc = IM_RC_OK; + trigger_indication(context, + "ComputerSystemDeletedIndication", + NAMESPACE(reference)); + goto error; + } + + if (virDomainGetInfo(dom, &info) != 0) { + CU_DEBUG("Unable to get domain current state"); + rc = IM_RC_SYS_NOT_FOUND; + goto error; + } + + if (info.state == VIR_DOMAIN_SHUTOFF) + break; + + sleep(1); + } + if (virDomainUndefine(dom) == 0) { rc = IM_RC_OK; trigger_indication(context,

2 2

[PATCH] (#2) Set SourceInstance{Host, ModelPath} in migration indications
by Dan Smith 02 Jul '08

02 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1215014224 25200 # Node ID 35d00def6476eb4e21b3a26837682362917f9915 # Parent cb343a986592c25c487c53042ad889fa24ea9d97 (#2) Set SourceInstance{Host,ModelPath} in migration indications This is a total hack at the moment, because we don't persist any platform details in the job (since only Xen is supported at the moment). When we do, this can be cleaned up. However, it works for now and would be good to get in place. Changes: - Add SourceInstanceModelPath as well Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r cb343a986592 -r 35d00def6476 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Jul 01 12:47:31 2008 -0700 +++ b/src/Virt_VSMigrationService.c Wed Jul 02 08:57:04 2008 -0700 @@ -712,12 +712,47 @@ { char *type; CMPIStatus s; + CMPIObjectPath *ref; const char *ind_name = NULL; + const char *host = NULL; + const char *ccname = NULL; if (ind == NULL) return false; ind_name = ind_type_to_name(ind_type); + + /* FIXME: This is a hack until we un-Xenify this provider */ + ref = CMNewObjectPath(_BROKER, ns, "Xen_Foo", &s); + if ((ref == NULL) || (s.rc != CMPI_RC_OK)) { + CU_DEBUG("Failed to get job reference"); + } else { + s = get_host_system_properties(&host, &ccname, ref, _BROKER); + if (s.rc == CMPI_RC_OK) { + CMSetProperty(ind, "SourceInstanceHost", + (CMPIValue *)host, CMPI_chars); + } else { + CU_DEBUG("Unable to get HostSystem properties"); + } + } + + /* FIXME: This should be merged with above once the job path is + * properly typed + */ + ref = CMGetObjectPath(inst, &s); + if ((ref == NULL) || (s.rc != CMPI_RC_OK)) { + CU_DEBUG("Failed to get job reference"); + } else { + CMPIString *str; + + str = CMObjectPathToString(ref, &s); + if ((str == NULL) || (s.rc != CMPI_RC_OK)) { + CU_DEBUG("Failed to get path string"); + } else { + CMSetProperty(ind, "SourceInstanceModelPath", + (CMPIValue *)&str, CMPI_string); + } + } CU_DEBUG("Setting SourceInstance"); CMSetProperty(ind, "SourceInstance",

2 1

[PATCH] Add SourceInstance{Host,ModelPath} to CSI
by Dan Smith 02 Jul '08

02 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1215014236 25200 # Node ID 5f084775a1757e92dc02eb950a30565c6dbb75a4 # Parent 35d00def6476eb4e21b3a26837682362917f9915 Add SourceInstance{Host,ModelPath} to CSI Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 35d00def6476 -r 5f084775a175 src/Makefile.am --- a/src/Makefile.am Wed Jul 02 08:57:04 2008 -0700 +++ b/src/Makefile.am Wed Jul 02 08:57:16 2008 -0700 @@ -69,9 +69,9 @@ libVirt_ComputerSystem_la_SOURCES = Virt_ComputerSystem.c libVirt_Device_la_SOURCES = Virt_Device.c -libVirt_ComputerSystemIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la +libVirt_ComputerSystemIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_ComputerSystemIndication_la_SOURCES = Virt_ComputerSystemIndication.c -libVirt_ComputerSystemIndication_la_LIBADD = -lVirt_ComputerSystem -lpthread -lrt +libVirt_ComputerSystemIndication_la_LIBADD = -lVirt_ComputerSystem -lVirt_HostSystem -lpthread -lrt libVirt_ComputerSystemMigrationIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemMigrationIndication_la_SOURCES = Virt_ComputerSystemMigrationIndication.c diff -r 35d00def6476 -r 5f084775a175 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Wed Jul 02 08:57:04 2008 -0700 +++ b/src/Virt_ComputerSystemIndication.c Wed Jul 02 08:57:16 2008 -0700 @@ -42,6 +42,7 @@ #include "Virt_ComputerSystem.h" #include "Virt_ComputerSystemIndication.h" +#include "Virt_HostSystem.h" static const CMPIBroker *_BROKER; @@ -184,6 +185,33 @@ return ret; } +static void set_source_inst_props(const CMPIBroker *broker, + CMPIObjectPath *ref, + CMPIInstance *ind) +{ + const char *host; + const char *hostccn; + CMPIStatus s; + CMPIString *str; + + str = CMObjectPathToString(ref, &s); + if ((str == NULL) || (s.rc != CMPI_RC_OK)) { + CU_DEBUG("Unable to get path string"); + } else { + CMSetProperty(ind, "SourceInstanceModelPath", + (CMPIValue *)&str, CMPI_string); + } + + s = get_host_system_properties(&host, &hostccn, ref, broker); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Unable to get host properties (%s): %s", + CLASSNAME(ref), CMGetCharPtr(s.msg)); + } else { + CMSetProperty(ind, "SourceInstanceHost", + (CMPIValue *)host, CMPI_chars); + } +} + static bool _do_indication(const CMPIBroker *broker, const CMPIContext *ctx, CMPIInstance *affected_inst, @@ -217,17 +245,21 @@ if (s.rc != CMPI_RC_OK) { CU_DEBUG("Failed to get ind_op. Error: '%s'", s.msg); ret = false; + goto out; } + CMSetNameSpace(ind_op, args->ns); + + affected_op = CMGetObjectPath(affected_inst, &s); + if (s.rc != CMPI_RC_OK) { + ret = false; + CU_DEBUG("problem getting affected_op: '%s'", s.msg); + goto out; + } + CMSetNameSpace(affected_op, args->ns); switch (ind_type) { case CS_CREATED: case CS_DELETED: - affected_op = CMGetObjectPath(affected_inst, &s); - if (s.rc != CMPI_RC_OK) { - ret = false; - CU_DEBUG("problem getting affected_op: '%s'", s.msg); - goto out; - } CMSetProperty(ind, "AffectedSystem", (CMPIValue *)&affected_op, CMPI_ref); break; @@ -236,6 +268,8 @@ (CMPIValue *)&affected_inst, CMPI_instance); break; } + + set_source_inst_props(broker, affected_op, ind); CU_DEBUG("Delivering Indication: %s", CMGetCharPtr(CMObjectPathToString(ind_op, NULL)));

1 0

[PATCH] Set the SourceInstanceHost property in migration indications
by Dan Smith 02 Jul '08

02 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1214947245 25200 # Node ID 4565972096b56353938ea30813b6c780e8488e65 # Parent cb343a986592c25c487c53042ad889fa24ea9d97 Set the SourceInstanceHost property in migration indications This is a total hack at the moment, because we don't persist any platform details in the job (since only Xen is supported at the moment). When we do, this can be cleaned up. However, it works for now and would be good to get in place. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r cb343a986592 -r 4565972096b5 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Jul 01 12:47:31 2008 -0700 +++ b/src/Virt_VSMigrationService.c Tue Jul 01 14:20:45 2008 -0700 @@ -712,12 +712,29 @@ { char *type; CMPIStatus s; + CMPIObjectPath *ref; const char *ind_name = NULL; + const char *host = NULL; + const char *ccname = NULL; if (ind == NULL) return false; ind_name = ind_type_to_name(ind_type); + + /* FIXME: This is a hack until we un-Xenify this provider */ + ref = CMNewObjectPath(_BROKER, ns, "Xen_Foo", &s); + if (s.rc == CMPI_RC_OK) { + s = get_host_system_properties(&host, &ccname, ref, _BROKER); + if (s.rc == CMPI_RC_OK) { + CMSetProperty(ind, "SourceInstanceHost", + (CMPIValue *)host, CMPI_chars); + } else { + CU_DEBUG("Unable to get HostSystem properties"); + } + } else { + CU_DEBUG("Failed to get job reference"); + } CU_DEBUG("Setting SourceInstance"); CMSetProperty(ind, "SourceInstance",

2 1

[PATCH 0 of 2] [TEST] Indications related fixes.
by Kaitlin Rupert 02 Jul '08

02 Jul '08

The first patch is a mirror of a change that was may in the libcmpiutil indication_tester.py. The second patch fixes a false positive situation. See commit log for details.

2 3

CimTest Report for KVM on F9 02-07-2008
by Deepti B Kalakeri 02 Jul '08

02 Jul '08

======================================================================== CIM Test Report for KVM on F9 with latest libvirt-cim and libcmpiutil ======================================================================== Distro : Fedora 9 Beta Kernel : 2.6.25-0.121.rc5.git4.fc9 Libvirt : libvirt-0.4.2-1.fc9.x86_64 CIMOM : pegasus PyWBEM : pywbem-0.6 CIM Schema : cimv216Experimental LibCMPIutil : 79 LibVirtCIM : 624 CIMTEST : 235 ======================================================= PASS : 108 FAIL : 0 XFAIL : 4 SKIP : 18 ----------------- Total : 130 ======================================================= Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing KVM hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: SKIP ERROR - System has defined domains; unable to run ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful Bug:<00002> ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: SKIP ComputerSystem - 27_define_suspend_errs.py: SKIP ComputerSystem - 32_start_reboot.py: SKIP ComputerSystem - 33_suspend_reboot.py: SKIP ComputerSystem - 35_start_reset.py: SKIP ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Exception: Attributes were not set as expected for domain: 'test_domain' Bug:<00002> ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree ElementCapabilities - 03_forward_errs.py: PASS libvir: QEMU error : Domain not found 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: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.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 default-kvm-dimage.2NDHostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run 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: XFAIL Bug: 00004 ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') Bug:<00004> 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: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_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 libvir: Network error : invalid network pointer in virNetworkFree libvir: QEMU error : Network not found: no network with matching name libvir: Network error : invalid network pointer in virNetworkFree 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 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 libvir: Domain error : invalid domain pointer in virDomainFree libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree 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: PASS 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 VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP 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

2 1

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

02 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214945951 25200 # Node ID 5872801b69296bac39b1b5060e6de2643471f290 # Parent ea52dde5ac3e1b10d5aa59b101d91b8ffc5b127e [TEST] #2 Fix VirtualSystemSettingDataComponent - 01_forward.py failure. Test was expecting one ProcRASD for each domain processor. It should expect only 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. Updates from 1 to 2: -Fix build_vssd_info() to return FAIL in case of error, not call sys.exit(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ea52dde5ac3e -r 5872801b6929 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Tue Jul 01 13:45:25 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Tue Jul 01 13:59: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,64 +68,49 @@ 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 \ vssd.VirtualSystemIdentifier == "" or vssd.VirtualSystemType == "": logger.error("One of the required VSSD details seems to be empty") - status = 1 test_domain_function(test_dom, ip, "undefine") - sys.exit(status) + return FAIL - 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 +118,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 +150,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 +160,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 1

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

02 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 02 Jul '08

02 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 02 Jul '08

02 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 02 Jul '08

02 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

[PATCH] Remove explicit "Xen" from VSMS indication trigger
by Dan Smith 01 Jul '08

01 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1214856741 25200 # Node ID f72441bf10fdd467d3f47d33e4bfb29537cc53e1 # Parent 834563d8520b1876d99bf579cc3319b1dfa09795 Remove explicit "Xen" from VSMS indication trigger Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 834563d8520b -r f72441bf10fd src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Jun 30 12:02:43 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Jun 30 13:12:21 2008 -0700 @@ -774,14 +774,14 @@ static bool trigger_indication(const CMPIContext *context, const char *base_type, - const char *ns) + const CMPIObjectPath *ref) { char *type; CMPIStatus s; - type = get_typed_class("Xen", base_type); + type = get_typed_class(CLASSNAME(ref), base_type); - s = stdi_trigger_indication(_BROKER, context, type, ns); + s = stdi_trigger_indication(_BROKER, context, type, NAMESPACE(ref)); free(type); @@ -814,7 +814,7 @@ trigger_indication(context, "ComputerSystemCreatedIndication", - NAMESPACE(reference)); + reference); out: return s; } @@ -862,7 +862,7 @@ rc = IM_RC_OK; trigger_indication(context, "ComputerSystemDeletedIndication", - NAMESPACE(reference)); + reference); } error: @@ -936,7 +936,7 @@ if (s.rc == CMPI_RC_OK) { trigger_indication(context, "ComputerSystemModifiedIndication", - NAMESPACE(ref)); + ref); } out:

2 1

[PATCH 0 of 3] Indications for state changes
by Dan Smith 01 Jul '08

01 Jul '08

This set: - Makes domain state an explicit factor in the dom_changed() determination for CSI - Makes CS trigger CSI on state change to avoid waiting for the loop - Fixes up registration of KVM_ and LXC_ CSI variants

2 4

[PATCH] [TEST] Fixing the ComputerSystem tc's
by Deepti B. Kalakeri 01 Jul '08

01 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1214830309 25200 # Node ID 197ecb3db922d841a2cdfbcdec5a4bf149dddc83 # Parent 0c3bd5f782c4776719799ad5c74226c95e70092e [TEST] Fixing the ComputerSystem tc's. Updated the tc to report XFAIL since the tc are failing as the requested_state property is not being set appropriately. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Jun 30 05:51:49 2008 -0700 @@ -52,7 +52,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 SUSPND_STATE = 9 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -106,8 +109,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Jun 30 05:51:49 2008 -0700 @@ -51,7 +51,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 REBOOT_STATE = 10 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -60,13 +61,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -105,8 +108,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Jun 30 05:51:49 2008 -0700 @@ -54,7 +54,8 @@ SUSPND_STATE = 9 SUSPND_STATE = 9 REBOOT_STATE = 10 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -63,13 +64,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -109,8 +112,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r 197ecb3db922 suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Jun 30 05:51:49 2008 -0700 @@ -52,7 +52,8 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 RESET_STATE = 11 -bug = "00001" +bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +62,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -106,8 +109,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail:

3 2

[PATCH] [TEST] #2 Fixing the ComputerSystem tc's
by Deepti B. Kalakeri 01 Jul '08

01 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1214892426 25200 # Node ID cc7716fa4252235924577a0e9bb16c89fc55870b # Parent 0c3bd5f782c4776719799ad5c74226c95e70092e [TEST] #2 Fixing the ComputerSystem tc's. Changes: ------- Patch 2: ------- 1) Removed the bug no 00001. 2) Removed the XFAIL_RC associated with bug 00001. Patch 1: -------- Updated the tc to report XFAIL since the tc are failing as the requested_state property is not being set appropriately. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 0c3bd5f782c4 -r cc7716fa4252 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Mon Jun 30 23:07:06 2008 -0700 @@ -52,7 +52,7 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 SUSPND_STATE = 9 -bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +61,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -97,7 +99,6 @@ def main(): if status != PASS: logger.error("Unable to %s dom %s using \ RequestedStateChange()", action, default_dom) - status = XFAIL_RC(bug) break # FIX ME @@ -106,8 +107,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r cc7716fa4252 suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/32_start_reboot.py Mon Jun 30 23:07:06 2008 -0700 @@ -51,7 +51,7 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 REBOOT_STATE = 10 -bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -60,13 +60,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -96,7 +98,6 @@ def main(): if status != PASS: logger.error("Unable to %s dom %s using \ RequestedStateChange()", action, default_dom) - status = XFAIL_RC(bug) break # FIX ME @@ -105,8 +106,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r cc7716fa4252 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Mon Jun 30 23:07:06 2008 -0700 @@ -54,7 +54,7 @@ SUSPND_STATE = 9 SUSPND_STATE = 9 REBOOT_STATE = 10 -bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -63,13 +63,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -100,7 +102,6 @@ def main(): if status != PASS: logger.error("Unable to %s dom %s using \ RequestedStateChange()", action, default_dom) - status = XFAIL_RC(bug) break # FIX ME @@ -109,8 +110,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail: diff -r 0c3bd5f782c4 -r cc7716fa4252 suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Fri Jun 27 09:57:11 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/35_start_reset.py Mon Jun 30 23:07:06 2008 -0700 @@ -52,7 +52,7 @@ ACTIVE_STATE = 2 ACTIVE_STATE = 2 RESET_STATE = 11 -bug = "00001" +bug_req_state = "00002" default_dom = 'test_domain' TIME = "00000000000000.000000:000" @@ -61,13 +61,15 @@ def check_attributes(domain_name, ip, en if rc != 0: return rc if cs.RequestedState != rq_state: - logger.error("RequestedState should be %d not %d", \ + logger.error("RequestedState should be %d not %d", rq_state, cs.RequestedState) - return FAIL + return XFAIL_RC(bug_req_state) + if cs.EnabledState != en_state: - logger.error("EnabledState should be %d not %d", \ + logger.error("EnabledState should be %d not %d", en_state, cs.EnabledState) return FAIL + return PASS @do_main(sup_types) @@ -97,7 +99,6 @@ def main(): if status != PASS: logger.error("Unable to %s dom %s using \ RequestedStateChange()", action, default_dom) - status = XFAIL_RC(bug) break # FIX ME @@ -106,8 +107,8 @@ RequestedStateChange()", action, default status = check_attributes(default_dom, options.ip, en_state, rq_state, options.virt) if status != PASS: - logger.error("Attributes for dom %s not set as expected.", \ - default_dom) + logger.error("Attributes for dom %s not set as expected.", + default_dom) break except Exception, detail:

1 0

[PATCH] [TEST] Fix HostSystem - 04_hs_to_EAPF.py to verify proper mem val
by Kaitlin Rupert 01 Jul '08

01 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1214845116 25200 # Node ID 692121d37b3aefafce0d6856d81468add629514d # Parent 450c5a235e0c95d7be7ef4a967fcb30d2f2abb9c [TEST] Fix HostSystem - 04_hs_to_EAPF.py to verify proper mem val The memory value used for NumberOfBlocks needs to be multiplied by 1024, since the memory value supplied when the guest is created is multiplied by 1024. Also removed an extraneous print statement. Removed some functions that were no longer being used. Also fixed some line length issues. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 450c5a235e0c -r 692121d37b3a suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Mon Jun 30 09:27:42 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Mon Jun 30 09:58:36 2008 -0700 @@ -76,8 +76,9 @@ def setup_env(server): destroy_and_undefine_all(server) - test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, server = server) + test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, + vcpus = test_vcpus, mac = test_mac, + disk = test_disk, server = server) if bridge == None: logger.error("Unable to find virtual bridge") return SKIP @@ -100,14 +101,6 @@ def print_err(err, detail, cn): logger.error(err % cn) logger.error("Exception: %s", detail) - -def field_err(assoc_info, field_list, fieldname): - logger.error("%s Mismatch", fieldname) - logger.error("Returned %s instead of %s", assoc_info[fieldname], field_list[fieldname]) - -def spec_err(fieldvalue, field_list, fieldname): - logger.error("%s Mismatch", fieldname) - logger.error("Returned %s instead of %s", fieldvalue, field_list[fieldname]) def pool_init_list(pool_assoc): """ @@ -142,14 +135,13 @@ 'SystemName' : test_dom, 'CreationClassName' : "Xen_Memory", 'DeviceID' : "%s/%s" % (test_dom, "mem"), - 'NumberOfBlocks' : test_mem + 'NumberOfBlocks' : test_mem * 1024 } eaf_values = { "Xen_Processor" : proc, "Xen_LogicalDisk" : disk, "Xen_NetworkPort" : net, "Xen_Memory" : mem } - print eaf_values return eaf_values def get_inst_for_dom(assoc_val): @@ -171,7 +163,8 @@ CreationClassName=cn, Name = hostname) if len(assoc_info) < 1: - logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn)) + logger.error("%s returned %i %s objects" % (an, + len(assoc_info), qcn)) status = FAIL except Exception, detail: @@ -186,7 +179,8 @@ def check_len(an, assoc_list_info, qcn, exp_len): if len(assoc_list_info) != exp_len: - logger.error("%s returned %i %s objects" % (an, len(assoc_list_info), qcn)) + logger.error("%s returned %i %s objects" % (an, + len(assoc_list_info), qcn)) return FAIL return PASS

2 1