- CIM - libvirt List Archives

[PATCH] [TEST] Adding verification for DestroySystem() of the domain
by Deepti B. Kalakeri 17 Sep '09

17 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1252590021 14400 # Node ID 53b05fc42fbc04ce45eea4a09ad84881fbcf6d3e # Parent 30196cc506c07d81642c94a01fc65b34421c0714 [TEST] Adding verification for DestroySystem() of the domain. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 30196cc506c0 -r 53b05fc42fbc suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Wed Sep 02 05:11:16 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Thu Sep 10 09:40:21 2009 -0400 @@ -27,8 +27,9 @@ from VirtLib import utils from XenKvmLib.xm_virt_util import domain_list, active_domain_list from XenKvmLib import vsms, vxml +from XenKvmLib.common_util import poll_for_state_change from XenKvmLib.classes import get_typed_class -from XenKvmLib.const import do_main +from XenKvmLib.const import do_main, CIM_DISABLE from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL @@ -45,44 +46,49 @@ service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) - ret = cxml.cim_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) - if default_dom not in list_before: - logger.error("Domain not in domain list") - cleanup_env(options.ip, cxml) - return FAIL + try: + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + ret = cxml.cim_start(options.ip) + if ret: + logger.error("Failed to start the dom: %s", default_dom) + cxml.undefine(options.ip) + return FAIL + + list_before = domain_list(options.ip, options.virt) + if default_dom not in list_before: + raise Exception("Domain not in domain list") - try: - service.DestroySystem(AffectedSystem=cs_ref) + ret = cxml.cim_destroy(options.ip) + if not ret: + raise Exception("Failed to destroy dom '%s'" % default_dom) + + list_after = domain_list(options.ip, options.virt) + + if default_dom in list_after: + raise Exception("Domain '%s' not destroyed: provider didn't " \ + "return error" % default_dom) + + status, dom_cs = poll_for_state_change(options.ip, options.virt, + default_dom, CIM_DISABLE) + if status != PASS: + raise Exception("RequestedState for dom '%s' is not '%s'"\ + % (default_dom, CIM_DISABLE)) + + ret = cxml.undefine(options.ip) + if not ret: + logger.error("Failed to undefine domain '%s'", default_dom) + return FAIL + except Exception, details: - logger.error('Unknow exception happened') logger.error(details) cleanup_env(options.ip, cxml) return FAIL - list_after = domain_list(options.ip, options.virt) - - 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: - status = PASS - return status

3 8

[PATCH] Patch to fix property value for PreviousInstance
by Sharad Mishra 17 Sep '09

17 Sep '09

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1253126961 25200 # Node ID fc50acd35fe7f344e296441a88a00f42a7636ad6 # Parent 335b5e307df79e4e4cfdfc15d13424c759da8b53 Patch to fix property value for PreviousInstance. When resource(s) are modified, "PreviousInstance" is set with the original instance. This property was incorrectly being set. This patch moves the code block to get this property before the instance in modified. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 335b5e307df7 -r fc50acd35fe7 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Sep 15 09:19:18 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Sep 16 11:49:21 2009 -0700 @@ -2268,6 +2268,17 @@ goto out; } + if (func == &resource_add) { + indication = strdup(RASD_IND_CREATED); + } + else if (func == &resource_del) { + indication = strdup(RASD_IND_DELETED); + } + else { + indication = strdup(RASD_IND_MODIFIED); + prev_inst = get_previous_instance(dominfo, ref, type, devid); + } + s = func(dominfo, rasd, type, devid, NAMESPACE(ref)); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Resource transform function failed"); @@ -2279,17 +2290,6 @@ CU_DEBUG("New XML:\n%s", xml); connect_and_create(xml, ref, &s); - if (func == &resource_add) { - indication = strdup(RASD_IND_CREATED); - } - else if (func == &resource_del) { - indication = strdup(RASD_IND_DELETED); - } - else { - indication = strdup(RASD_IND_MODIFIED); - prev_inst = get_previous_instance(dominfo, ref, type, devid); - } - if (inst_list_add(&list, rasd) == 0) { CU_DEBUG("Unable to add RASD instance to the list\n"); goto out;

1 0

[PATCH] [TEST] #2 Adding verification for DestroySystem() of the domain
by Deepti B. Kalakeri 16 Sep '09

16 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253106219 14400 # Node ID a53276163e6a79ecc9c0d103bac4a256c2a0d031 # Parent 7d3c17e1c691b46c8b770f09ddad72f0d839f5aa [TEST] #2 Adding verification for DestroySystem() of the domain. Patch 2: -------- 1) Removed unnecessary import stmts 2) removed the undefine() call after the DestroySystem() call 3) Improved the log messages 4) Put a online description to the test case Tested with KVM and current sources on SLES11 and F11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 7d3c17e1c691 -r a53276163e6a suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Wed Sep 16 08:58:46 2009 -0400 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Wed Sep 16 09:03:39 2009 -0400 @@ -5,6 +5,7 @@ # Authors: # Guolian Yun <yunguol(a)cn.ibm.com> # Zhengang Li <lizg(a)cn.ibm.com> +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -20,13 +21,13 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Test case to verify DestroySystem() of VSMS provider. +# +# import sys -import pywbem -from pywbem.cim_obj import CIMInstanceName -from VirtLib import utils from XenKvmLib.xm_virt_util import domain_list, active_domain_list -from XenKvmLib import vsms, vxml +from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main from CimTest.Globals import logger @@ -43,47 +44,48 @@ def main(): options = main.options - service = vsms.get_vsms_class(options.virt)(options.ip) cxml = vxml.get_class(options.virt)(default_dom) - ret = cxml.cim_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) + + try: + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the domain '%s'", default_dom) + return FAIL + + defined_domains = domain_list(options.ip, options.virt) + if default_dom not in defined_domains: + logger.error("Failed to find defined domain '%s'", default_dom) + return FAIL + + ret = cxml.cim_start(options.ip) + if ret: + logger.error("Failed to start the domain '%s'", default_dom) + cxml.undefine(options.ip) + return FAIL + + list_before = active_domain_list(options.ip, options.virt) + if default_dom not in list_before: + raise Exception("Domain '%s' is not in active domain list" \ + % default_dom) + + ret = cxml.cim_destroy(options.ip) + if not ret: + raise Exception("Failed to destroy domain '%s'" % default_dom) + + list_after = domain_list(options.ip, options.virt) + if default_dom in list_after: + raise Exception("DestroySystem() failed to destroy domain '%s'.." \ + "Provider did not return any error" % default_dom) + else: + logger.info("DestroySystem() successfully destroyed and undefined"\ + " domain '%s'", default_dom) + + except Exception, details: + logger.error("Exception details: %s", details) 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) - 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) - except Exception, details: - logger.error('Unknow exception happened') - logger.error(details) - cleanup_env(options.ip, cxml) - return FAIL - - list_after = domain_list(options.ip, options.virt) - - 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: - status = PASS - - return status + return PASS if __name__ == "__main__":

1 0

[PATCH 0 of 5] [TEST] #2 Added tc to verify StorageVol deletion and creation/deletion errors
by Deepti B. Kalakeri 16 Sep '09

16 Sep '09

Please base this patch on the patch "Modifying common_util.py for netnfs"

2 6

[PATCH 0 of 6] (#2) Add resource indication feature.
by Sharad Mishra 16 Sep '09

16 Sep '09

This patch adds feature to raise indications when resource(s) are added/deleted or modified. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com>

1 6

[PATCH 0 of 3] [TEST] Added new tc to verify RPCS DeleteResourceInPool()
by Deepti B. Kalakeri 16 Sep '09

16 Sep '09

This patchset is dependent on the "Added new tc to verify RPCS error values." changes The patches should be applied on top of "Added new tc to verify RPCS error values" pathces

3 9

Live move b/w RHEL 5.3 hosts fail through libvirt-cim - xm migrate --live works
by Subba Rao, Sandeep M (STSD) 16 Sep '09

16 Sep '09

Hi, I'm trying to perform a live move of a domU using libvirt-cim. The hosts are RHEL 5.3 hosts with the following: [root@RHEL53Xen1 tmp]# rpm -q tog-pegasus tog-pegasus-2.7.0-2.el5 [root@RHEL53Xen1 tmp]# rpm -q libvirt-cim libvirt-cim-0.5.1-4.el5 [root@RHEL53Xen1 tmp]# rpm -q sblim-cmpi-base sblim-cmpi-base-1.5.5-31.el5 [root@RHEL53Xen1 tmp]# cat /etc/Pegasus/cimserver_planned.conf | grep repositoryIsDefaultInstanceProvider repositoryIsDefaultInstanceProvider=true [root@RHEL53Xen1 tmp]# The destination host is also an RHEL 5.3 with similar configuration. So, I enabled the libvirt cim log on the source host and following is a excerpt from the log file. The log shows the operation failed. I'm I missing something here. Any help is much appreciated. infostore.c(88): Path is /etc/libvirt/cim/Xen_Domain-0 misc_util.c(199): URI of connection is: xen:/// misc_util.c(199): URI of connection is: xen:/// device_parsing.c(257): Disk node: disk infostore.c(88): Path is /etc/libvirt/cim/Xen_Copy_RHELVM3 misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// instance_util.c(127): Number of keys: 1 instance_util.c(140): Comparing key 0: `InstanceID' std_invokemethod.c(279): Method `MigrateVirtualSystemToHost' execution attempted std_invokemethod.c(230): Method parameter `ComputerSystem' validated type 0x1100 std_invokemethod.c(230): Method parameter `DestinationHost' validated type 0x1600 std_invokemethod.c(215): No optional parameter supplied for `MigrationSettingData' std_invokemethod.c(230): Method parameter `MigrationSettingData' validated type 0x1000 std_invokemethod.c(303): Executing handler for method `MigrateVirtualSystemToHost' misc_util.c(72): Connecting to libvirt with uri `xen' Virt_VSMigrationService.c(102): Using default values for MigrationSettingData param Virt_VSMigrationService.c(1351): Prepared migration job a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3 Virt_VSMigrationService.c(1283): Creating instance: root/virt:Virt_MigrationJob.InstanceID="a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3" Virt_VSMigrationService.c(783): Creating indication. misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// Virt_VSMigrationService.c(757): Setting SourceInstance std_indication.c(70): Indications disabled for this provider std_invokemethod.c(305): Method `MigrateVirtualSystemToHost' returned 0 Virt_VSMigrationService.c(1184): Migration Job a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3 started Virt_VSMigrationService.c(833): MigrationJob ref: root/virt:Virt_MigrationJob.InstanceID="a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3" Virt_VSMigrationService.c(783): Creating indication. Virt_VSMigrationService.c(806): Setting PreviousInstance Virt_VSMigrationService.c(896): Modifying job a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3 (4:Running) misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// Virt_VSMigrationService.c(757): Setting SourceInstance std_indication.c(70): Indications disabled for this provider misc_util.c(72): Connecting to libvirt with uri `xen' Virt_VSMigrationService.c(1135): Live migration Virt_VSMigrationService.c(937): Migrating Copy_RHELVM3 Virt_VSMigrationService.c(940): Migration failed Virt_VSMigrationService.c(833): MigrationJob ref: root/virt:Virt_MigrationJob.InstanceID="a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3" Virt_VSMigrationService.c(783): Creating indication. misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// Virt_VSMigrationService.c(757): Setting SourceInstance std_indication.c(70): Indications disabled for this provider Virt_VSMigrationService.c(1189): Migration Job a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3 finished: 1 Virt_VSMigrationService.c(833): MigrationJob ref: root/virt:Virt_MigrationJob.InstanceID="a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3" Virt_VSMigrationService.c(783): Creating indication. Virt_VSMigrationService.c(806): Setting PreviousInstance Virt_VSMigrationService.c(896): Modifying job a92bb2ac-7dcf-4d74-bc47-4afa6e2047b3 (7:Migration Failed) misc_util.c(72): Connecting to libvirt with uri `xen' misc_util.c(199): URI of connection is: xen:/// Thanks, Sandeep

2 1

[PATCH 0 of 5] [TEST] Added tc to verify StorageVol deletion and creation/deletion errors
by Deepti B. Kalakeri 15 Sep '09

15 Sep '09

Please base this patch on the patch "Modifying common_util.py for netnfs"

3 8

[PATCH 0 of 6] Add a new resource indication provider.
by Sharad Mishra 15 Sep '09

15 Sep '09

This provider will raise resource indication whenever resource(s) are created, deleted or modified. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com>

3 9

[PATCH] [TEST] Modifying common_util.py for netnfs
by Deepti B. Kalakeri 12 Sep '09

12 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1252697570 25200 # Node ID 083b2af038f14bf24b9117e048ae836b638ad711 # Parent 53b05fc42fbc04ce45eea4a09ad84881fbcf6d3e [TEST] Modifying common_util.py for netnfs. Modifying common_util.py to use existing nfs setup if configuring the new one fails. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 53b05fc42fbc -r 083b2af038f1 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Thu Sep 10 09:40:21 2009 -0400 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Fri Sep 11 12:32:50 2009 -0700 @@ -66,13 +66,13 @@ if rev >= libvirt_netfs_pool_support and \ pool_type == dp_types['DISK_POOL_NETFS']: - status , src_mnt_dir, dir_mnt_dir = nfs_netfs_setup(server) + status , host_addr, src_mnt_dir, dir_mnt_dir = nfs_netfs_setup(server) if status != PASS: logger.error("Failed to get pool_attr for NETFS diskpool type") - return FAIL, pool_attr + return status, pool_attr + pool_attr['Host'] = host_addr pool_attr['SourceDirectory'] = src_mnt_dir - pool_attr['Host'] = server pool_attr['Path'] = dir_mnt_dir return PASS, pool_attr @@ -103,6 +103,7 @@ return SKIP status = FAIL + pool_attr = None # For now the test case support only the creation of # dir type disk pool, netfs later change to fs and disk pooltypes etc for key, value in dp_types.iteritems(): @@ -147,7 +148,7 @@ logger.error("Exception details: %s", details) if key == 'DISK_POOL_NETFS': netfs_cleanup(server, pool_attr) - return status + return FAIL return status diff -r 53b05fc42fbc -r 083b2af038f1 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu Sep 10 09:40:21 2009 -0400 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Sep 11 12:32:50 2009 -0700 @@ -25,6 +25,8 @@ import random from time import sleep from tempfile import mkdtemp +from commands import getstatusoutput +from socket import gethostbyaddr from distutils.file_util import move_file from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * @@ -517,20 +519,50 @@ return PASS -def clean_temp_files(server, src_dir_for_mnt, dest_dir_to_mnt): - cmd = "rm -rf %s %s" % (src_dir_for_mnt, dest_dir_to_mnt) +def check_existing_nfs(): + host_addr = src_dir = None + s, o = getstatusoutput("mount") + lines = o.splitlines() + for line in lines: + if "nfs" == line.split()[-2]: + addr, src_dir = line.split()[0].split(":") + host_addr = gethostbyaddr(addr)[0] + + return host_addr, src_dir + +def clean_temp_files(server, src_dir_for_mnt, dest_dir_to_mnt, cmd): rc, out = utils.run_remote(server, cmd) if rc != PASS: logger.error("Please delete %s %s if present on %s", src_dir_for_mnt, dest_dir_to_mnt, server) +def check_haddr_is_localhost(server, host_addr): + # This function is required to determine if setup a new nfs + # setup or using an old one. + new_nfs_server_setup = False + local_addr = gethostbyaddr(server) + if host_addr in local_addr: + new_nfs_server_setup = True + + return new_nfs_server_setup def netfs_cleanup(server, pool_attr): - src_dir = os.path.basename(pool_attr['SourceDirectory']) + src_dir = pool_attr['SourceDirectory'] dst_dir = pool_attr['Path'] + host_addr = pool_attr['Host'] + + # Determine if we are using existing nfs setup or configured a new one + new_nfs_server_setup = check_haddr_is_localhost(server, host_addr) + if new_nfs_server_setup == False: + cmd = "rm -rf %s " % (dst_dir) + else: + cmd = "rm -rf %s %s" % (src_dir, dst_dir) # Remove the temp dir created . - clean_temp_files(server, src_dir, dst_dir) + clean_temp_files(server, src_dir, dst_dir, cmd) + + if new_nfs_server_setup == False: + return # Restore the original exports file. if os.path.exists(back_exports_file): @@ -544,9 +576,8 @@ if rc != PASS: logger.error("Could not restart NFS server on '%s'" % server) -def netfs_config(server, nfs_server_bin): +def netfs_config(server, nfs_server_bin, dest_dir_to_mnt): src_dir_for_mnt = mkdtemp() - dest_dir_to_mnt = mkdtemp() try: # Backup the original exports file. @@ -572,23 +603,32 @@ except Exception, detail: logger.error("Exception details : %s", detail) - clean_temp_files(server, src_dir_for_mnt, dest_dir_to_mnt) - return FAIL, None, None + cmd = "rm -rf %s %s " % (src_dir_for_mnt,dest_dir_to_mnt) + clean_temp_files(server, src_dir_for_mnt, dest_dir_to_mnt, cmd) + return SKIP, None - return PASS, src_dir_for_mnt, dest_dir_to_mnt + return PASS, src_dir_for_mnt def nfs_netfs_setup(server): nfs_server_bin = get_nfs_bin(server) + dest_dir = mkdtemp() + # Before going ahead verify that nfs server is available on machine.. ret = nfs_config(server, nfs_server_bin) if ret != PASS: logger.error("Failed to configure NFS on '%s'", server) - return FAIL, None, None - - ret, src_dir, destr_dir = netfs_config(server, nfs_server_bin) - if ret != PASS: - logger.error("Failed to configure netfs on '%s'", server) - return FAIL, None, None - - return PASS, src_dir, destr_dir + logger.info("Trying to look for nfs mounted dir on '%s'...", server) + server, src_dir = check_existing_nfs() + if server == None or src_dir == None: + logger.error("No nfs mount information on '%s' ", server) + return SKIP, None, None, None + else: + return PASS, server, src_dir, dest_dir + else: + ret, src_dir = netfs_config(server, nfs_server_bin, dest_dir) + if ret != PASS: + logger.error("Failed to configure netfs on '%s'", server) + return ret, None, None, None + + return PASS, server, src_dir, dest_dir

1 0