September 2009 - CIM - libvirt List Archives

[PATCH] [TEST] Add timestamps to main.py to calculate run time of tests
by Kaitlin Rupert 06 Oct '09

06 Oct '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1252022738 25200 # Node ID 2d852ba88fd24102ec988145e464a13f5faae5c0 # Parent db3af9cb2c9affb0a32a8ea3a2c23648c5efe91e [TEST] Add timestamps to main.py to calculate run time of tests These changes allow the user to specify the --print-exec-time flag, which will print the execution time of each test. If this flag isn't specified, the total run time of the test is still printed. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r db3af9cb2c9a -r 2d852ba88fd2 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Thu Sep 03 13:03:52 2009 -0700 +++ b/suites/libvirt-cim/main.py Thu Sep 03 17:05:38 2009 -0700 @@ -22,6 +22,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +from time import time from optparse import OptionParser import os import sys @@ -64,6 +65,9 @@ help="Duplicate the output to stderr") parser.add_option("--report", dest="report", help="Send report using mail info: --report=<recipient addr>") +parser.add_option("--print-exec-time", action="store_true", + dest="print_exec_time", + help="Print execution time of each test") TEST_SUITE = 'cimtest' CIMTEST_RCFILE = '%s/.cimtestrc' % os.environ['HOME'] @@ -146,6 +150,27 @@ return PASS +def print_exec_time(testsuite, exec_time): + + #Convert run time from seconds to hours + tmp = exec_time / (60 * 60) + h = int(tmp) + + #Subtract out hours and convert remainder to minutes + tmp = (tmp - h) * 60 + m = int(tmp) + + #Subtract out minutes and convert remainder to seconds + tmp = (tmp - m) * 60 + s = int(tmp) + + #Subtract out seconds and convert remainder to milliseconds + tmp = (tmp - s) * 1000 + msec = int(tmp) + + testsuite.debug(" Execution time: %sh %smin %ssec %smsec" % + (h, m, s, msec)) + def main(): (options, args) = parser.parse_args() to_addr = None @@ -213,6 +238,8 @@ print "\nTesting " + options.virt + " hypervisor" + test_run_time_total = 0 + for test in test_list: testsuite.debug(div) t_path = os.path.join(TEST_SUITE, test['group']) @@ -222,13 +249,25 @@ options.virt, dbg, options.t_url) cmd = cdto + ' && ' + ' ' + run + start_time = time() status, output = commands.getstatusoutput(cmd) + end_time = time() os_status = os.WEXITSTATUS(status) testsuite.print_results(test['group'], test['test'], os_status, output) + exec_time = end_time - start_time + test_run_time_total = test_run_time_total + exec_time + + if options.print_exec_time: + print_exec_time(testsuite, exec_time) + testsuite.debug("%s\n" % div) + testsuite.debug("Total test execution: ") + print_exec_time(testsuite, test_run_time_total) + testsuite.debug("\n") + testsuite.finish() status = cleanup_env(options.ip, options.virt)

2 4

[PATCH] Cleanup _get_rasds() in Virt_RASD.c
by Jim Fehlig 24 Sep '09

24 Sep '09

# HG changeset patch # User Jim Fehlig <jfehlig(a)novell.com> # Date 1253641563 21600 # Node ID 81b6cd4ae355024303a8459817b4f15339d17111 # Parent 7c5106b0b092147c521ef1f462b9a41a44a313f8 Cleanup _get_rasds() in Virt_RASD.c I received a bug report about a memory leak in _get_rasds(). While fixing the leak, I took the opportunity to do some other tidying in this function. Signed-off-by: Jim Fehlig <jfehlig(a)novell.com> diff -r 7c5106b0b092 -r 81b6cd4ae355 src/Virt_RASD.c --- a/src/Virt_RASD.c Wed Sep 16 11:49:21 2009 -0700 +++ b/src/Virt_RASD.c Tue Sep 22 11:46:03 2009 -0600 @@ -664,6 +664,7 @@ int count; int i; struct virt_device *devs = NULL; + const char *host = NULL; count = get_devices(dom, &devs, type); if (count <= 0) @@ -672,8 +673,13 @@ /* Bit hackish, but for proc we need to cut list down to one. */ if (type == CIM_RES_TYPE_PROC) { struct virt_device *tmp_dev = NULL; - tmp_dev = calloc(1, sizeof(*tmp_dev)); tmp_dev = virt_device_dup(&devs[count - 1]); + if (tmp_dev == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to allocate memory for proc RASD"); + goto out; + } tmp_dev->id = strdup("proc"); @@ -685,15 +691,16 @@ count = 1; } + host = virDomainGetName(dom); + if (host == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to get domain name"); + goto out; + } + for (i = 0; i < count; i++) { CMPIInstance *dev = NULL; - const char *host = NULL; - - host = virDomainGetName(dom); - if (host == NULL) { - cleanup_virt_device(&devs[i]); - continue; - } dev = rasd_from_vdev(broker, &devs[i],

2 1

[PATCH] [TEST] #2 Add new tc RASDIndications/01_guest_states_rasd_ind.py
by Deepti B. Kalakeri 23 Sep '09

23 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253654207 25200 # Node ID faf86189f60a2b7e5321996540c390c0598929c9 # Parent f5c62f54d1204d38ce15e48d269d3e887da69937 [TEST] #2 Add new tc RASDIndications/01_guest_states_rasd_ind.py Patch 2: -------- 1) Checked for RASDIndication support in libvirt-cim 2) Included support for XenFV To verify the Add|Deleted RASDIndication for the guest. Tested with Xen and current sources on RHEL5.3 and KVM with F10. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5c62f54d120 -r faf86189f60a suites/libvirt-cim/cimtest/RASDIndications/01_guest_states_rasd_ind.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASDIndications/01_guest_states_rasd_ind.py Tue Sep 22 14:16:47 2009 -0700 @@ -0,0 +1,164 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# This testcase is used to verify the Created|Deleted +# RASD Indications for a guest. +# +# Date : 21-09-2009 +# + +import sys +from signal import SIGKILL +from socket import gethostname +from os import kill, fork, _exit +from XenKvmLib.vxml import get_class +from XenKvmLib.xm_virt_util import active_domain_list +from CimTest.Globals import logger +from XenKvmLib.const import do_main, CIM_ENABLE, CIM_DISABLE, \ + get_provider_version +from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.common_util import poll_for_state_change +from XenKvmLib.indications import sub_ind, handle_request, poll_for_ind + +sup_types = ['KVM', 'Xen', 'XenFV'] +libvirt_guest_rasd_indication_rev = 980 + +def create_guest(test_dom, ip, virt, cxml, ind_name): + try: + ret = cxml.cim_define(ip) + if not ret: + raise Exception("Failed to define domain %s" % test_dom) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_DISABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_DISABLE)) + + ret = cxml.cim_start(ip) + if ret: + raise Exception("Failed to start the domain '%s'" % test_dom) + cxml.undefine(ip) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_ENABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_ENABLE)) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL, cxml + + return PASS, cxml + +def gen_indication(test_dom, s_sysname, virt, cxml, ind_name): + status = FAIL + try: + active_doms = active_domain_list(s_sysname, virt) + if test_dom not in active_doms: + status, cxml = create_guest(test_dom, s_sysname, virt, cxml, ind_name) + if status != PASS: + raise Exception("Error setting up the guest '%s'" % test_dom) + + if ind_name == "delete": + ret = cxml.cim_destroy(s_sysname) + if not ret: + raise Exception("Failed to destroy domain '%s'" % test_dom) + + except Exception, details: + logger.error("Exception details :%s", details) + return FAIL, cxml + + return PASS, cxml + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = options.ip + + cim_rev, changeset = get_provider_version(virt, s_sysname) + if cim_rev < libvirt_guest_rasd_indication_rev: + logger.info("Support for Guest Resource Indications is available in " + "Libvirt-CIM rev '%s'", libvirt_guest_rasd_indication_rev) + return SKIP + + status = FAIL + test_dom = 'VM_' + gethostname() + ind_names = { + 'create' : 'ResourceAllocationSettingDataCreatedIndication', + 'delete' : 'ResourceAllocationSettingDataDeletedIndication' + } + + virt_xml = get_class(virt) + cxml = virt_xml(test_dom) + sub_list, ind_names, dict = sub_ind(s_sysname, virt, ind_names) + for ind in ind_names.keys(): + sub = sub_list[ind] + ind_name = ind_names[ind] + logger.info("\n Verifying '%s' indications ....", ind_name) + + try: + pid = fork() + if pid == 0: + status = handle_request(sub, ind_name, dict, + len(ind_names.keys())) + if status != PASS: + _exit(1) + _exit(0) + else: + try: + status, cxml = gen_indication(test_dom, s_sysname, + virt, cxml, ind) + if status != PASS: + raise Exception("Unable to generate indication") + + status = poll_for_ind(pid, ind_name) + except Exception, details: + kill(pid, SIGKILL) + raise Exception(details) + + except Exception, details: + logger.error("Exception: %s", details) + status = FAIL + + if status != PASS: + break + + #Make sure all subscriptions are really unsubscribed + for ind, sub in sub_list.iteritems(): + sub.unsubscribe(dict['default_auth']) + logger.info("Cancelling subscription for %s", ind_names[ind]) + + active_doms = active_domain_list(s_sysname, virt) + if test_dom in active_doms: + ret = cxml.cim_destroy(s_sysname) + if not ret: + logger.error("Failed to Destroy the domain") + return FAIL + + return status +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] [TEST] #2 [TEST] Add new tc RASDIndications/02_guest_add_mod_rem_rasd_ind.py
by Deepti B. Kalakeri 23 Sep '09

23 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253655145 25200 # Node ID 215cbc24f8f95f95543a24ecc7e3b1d80594ecdd # Parent faf86189f60a2b7e5321996540c390c0598929c9 [TEST] #2 [TEST] Add new tc RASDIndications/02_guest_add_mod_rem_rasd_ind.py Patch 2: -------- 1) Checked for RASDIndication support in libvirt-cim 2) Included support for XenFV 3) Removed cim_start() fromt the testcase 4) Undefined the guest at the end of the test. To verify the Add|Modify|Deleted RASDIndication for the guest. Tested with Xen and current sources on RHEL5.3 and with KVM on F10. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r faf86189f60a -r 215cbc24f8f9 suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Tue Sep 22 14:32:25 2009 -0700 @@ -0,0 +1,225 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# This testcase is used to verify the Created|Modified|Deleted +# RASD Indications for a guest. +# +# Date : 21-09-2009 +# + +import sys +from signal import SIGKILL +from XenKvmLib import vsms +from XenKvmLib import vsms_util +from XenKvmLib.classes import get_typed_class +from XenKvmLib.enumclass import EnumNames +from socket import gethostname +from os import kill, fork, _exit +from XenKvmLib.vxml import get_class +from CimTest.Globals import logger +from XenKvmLib.const import do_main, CIM_DISABLE, get_provider_version +from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.common_util import poll_for_state_change +from XenKvmLib.indications import sub_ind, handle_request, poll_for_ind + +sup_types = ['KVM', 'Xen', 'XenFV'] +libvirt_guest_rasd_indication_rev = 980 + +nmem = 256 +nmac = '00:11:22:33:44:55' + +def create_guest(test_dom, ip, virt, cxml): + try: + ret = cxml.cim_define(ip) + if not ret: + raise Exception("Failed to define domain %s" % test_dom) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_DISABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_DISABLE)) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL, cxml + + return PASS, cxml + + +def get_rasd_rec(virt, cn, s_sysname, inst_id): + classname = get_typed_class(virt, cn) + recs = EnumNames(s_sysname, classname) + rasd = None + for rasd_rec in recs: + ret_pool = rasd_rec['InstanceID'] + if ret_pool == inst_id: + rasd = rasd_rec + break + + return rasd + +def gen_indication(test_dom, s_sysname, virt, cxml, service, ind_name, + rasd=None, nmem_disk=None): + status = FAIL + try: + + if ind_name == "add": + cn = 'VirtualSystemSettingData' + inst_id = '%s:%s' % (virt, test_dom) + classname = get_typed_class(virt, cn) + vssd_ref = get_rasd_rec(virt, cn, s_sysname, inst_id) + + if vssd_ref == None: + raise Exception("Failed to get vssd_ref for '%s'" % test_dom) + + status = vsms_util.add_disk_res(s_sysname, service, cxml, + vssd_ref, rasd, nmem_disk) + + elif ind_name == "modify": + status = vsms_util.mod_mem_res(s_sysname, service, cxml, + rasd, nmem_disk) + + elif ind_name == 'delete': + cn = 'GraphicsResourceAllocationSettingData' + inst_id = '%s/%s' % (test_dom, "graphics") + classname = get_typed_class(virt, cn) + nrasd = get_rasd_rec(virt, cn, s_sysname, inst_id) + + if nrasd == None: + raise Exception("Failed to get nrasd for '%s'" % test_dom) + + res = service.RemoveResourceSettings(ResourceSettings=[nrasd]) + status = res[0] + + except Exception, details: + logger.error("Exception details :%s", details) + return FAIL + + return status + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = options.ip + + cim_rev, changeset = get_provider_version(virt, s_sysname) + if cim_rev < libvirt_guest_rasd_indication_rev: + logger.info("Support for Guest Resource Indications is available in " + "Libvirt-CIM rev '%s'", libvirt_guest_rasd_indication_rev) + return SKIP + + status = FAIL + test_dom = 'VM_' + gethostname() + ind_names = { + 'add' : 'ResourceAllocationSettingDataCreatedIndication', + 'modify' : 'ResourceAllocationSettingDataModifiedIndication', + 'delete' : 'ResourceAllocationSettingDataDeletedIndication' + } + + sub_list, ind_names, dict = sub_ind(s_sysname, virt, ind_names) + virt_xml = get_class(virt) + cxml = virt_xml(test_dom, mac=nmac) + service = vsms.get_vsms_class(options.virt)(options.ip) + ndpath = cxml.secondary_disk_path + + if virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + disk_attr = { 'nddev' : nddev, + 'src_path' : ndpath + } + dasd = vsms.get_dasd_class(options.virt)(dev=nddev, + source=cxml.secondary_disk_path, + name=test_dom) + masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=test_dom) + rasd_info = { 'add' : [dasd, disk_attr], + 'modify' : [masd, nmem] + } + + status, cxml = create_guest(test_dom, s_sysname, virt, cxml) + if status != PASS: + logger.error("Error setting up the guest '%s'" % test_dom) + return FAIL + + for ind in ind_names.keys(): + sub = sub_list[ind] + ind_name = ind_names[ind] + logger.info("\n Verifying '%s' indications ....", ind_name) + + try: + pid = fork() + if pid == 0: + status = handle_request(sub, ind_name, dict, + len(ind_names.keys())) + if status != PASS: + _exit(1) + + _exit(0) + else: + try: + if ind != 'delete': + rasd = rasd_info[ind][0] + val = rasd_info[ind][1] + status = gen_indication(test_dom, s_sysname, + virt, cxml, service, + ind, rasd, val) + else: + status = gen_indication(test_dom, s_sysname, + virt, cxml, service, + ind) + if status != PASS: + raise Exception("Unable to generate indication") + + status = poll_for_ind(pid, ind_name) + if status != PASS: + raise Exception("Poll for indication Failed") + + except Exception, details: + kill(pid, SIGKILL) + raise Exception(details) + + except Exception, details: + logger.error("Exception: %s", details) + status = FAIL + + if status != PASS: + break + + #Make sure all subscriptions are really unsubscribed + for ind, sub in sub_list.iteritems(): + sub.unsubscribe(dict['default_auth']) + logger.info("Cancelling subscription for %s", ind_names[ind]) + + ret = cxml.undefine(s_sysname) + if not ret: + logger.error("Failed to undefine the domain '%s'", test_dom) + return FAIL + + return status +if __name__ == "__main__": + sys.exit(main()) +

3 2

[PATCH] [TEST] Add new tc RASDIndications/02_guest_add_mod_rem_rasd_ind.py
by Deepti B. Kalakeri 23 Sep '09

23 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253558705 25200 # Node ID 20f8f3d7e3ef6d943e3bbab928f8c9e5108262c6 # Parent 7b7fa4294f3602db5aca1d5958ebfd6dc849ef46 [TEST] Add new tc RASDIndications/02_guest_add_mod_rem_rasd_ind.py To verify the Add|Modify|Deleted RASDIndication for the guest. Tested with Xen and current sources on RHEL5.3. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 7b7fa4294f36 -r 20f8f3d7e3ef suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Mon Sep 21 11:45:05 2009 -0700 @@ -0,0 +1,229 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# This testcase is used to verify the Created|Modified|Deleted +# RASD Indications for a guest. +# +# Date : 21-09-2009 +# + +import sys +from signal import SIGKILL +from XenKvmLib import vsms +from XenKvmLib import vsms_util +from XenKvmLib.classes import get_typed_class +from XenKvmLib.enumclass import EnumNames +from socket import gethostname +from os import kill, fork, _exit +from XenKvmLib.vxml import get_class +from CimTest.Globals import logger +from XenKvmLib.const import do_main, CIM_DISABLE, CIM_ENABLE +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import poll_for_state_change +from XenKvmLib.indications import sub_ind, handle_request, poll_for_ind + +sup_types = ['KVM', 'Xen'] + +nmem = 256 +nmac = '00:11:22:33:44:55' + +def create_guest(test_dom, ip, virt, cxml): + try: + ret = cxml.cim_define(ip) + if not ret: + raise Exception("Failed to define domain %s" % test_dom) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_DISABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_DISABLE)) + + ret = cxml.cim_start(ip) + if ret: + raise Exception("Failed to start the domain '%s'" % test_dom) + cxml.undefine(ip) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_ENABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_ENABLE)) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL, cxml + + return PASS, cxml + + +def get_rasd_rec(virt, cn, s_sysname, inst_id): + classname = get_typed_class(virt, cn) + recs = EnumNames(s_sysname, classname) + rasd = None + for rasd_rec in recs: + ret_pool = rasd_rec['InstanceID'] + if ret_pool == inst_id: + rasd = rasd_rec + break + + return rasd + +def gen_indication(test_dom, s_sysname, virt, cxml, service, ind_name, + rasd=None, nmem_disk=None): + status = FAIL + try: + + if ind_name == "add": + cn = 'VirtualSystemSettingData' + inst_id = '%s:%s' % (virt, test_dom) + classname = get_typed_class(virt, cn) + vssd_ref = get_rasd_rec(virt, cn, s_sysname, inst_id) + + if vssd_ref == None: + raise Exception("Failed to get vssd_ref for '%s'" % test_dom) + + status = vsms_util.add_disk_res(s_sysname, service, cxml, + vssd_ref, rasd, nmem_disk) + + elif ind_name == "modify": + status = vsms_util.mod_mem_res(s_sysname, service, cxml, + rasd, nmem_disk) + + elif ind_name == 'delete': + cn = 'GraphicsResourceAllocationSettingData' + inst_id = '%s/%s' % (test_dom, "graphics") + classname = get_typed_class(virt, cn) + nrasd = get_rasd_rec(virt, cn, s_sysname, inst_id) + + if nrasd == None: + raise Exception("Failed to get nrasd for '%s'" % test_dom) + + res = service.RemoveResourceSettings(ResourceSettings=[nrasd]) + status = res[0] + + except Exception, details: + logger.error("Exception details :%s", details) + return FAIL + + return status + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = options.ip + + status = FAIL + test_dom = 'VM_' + gethostname() + ind_names = { + 'add' : 'ResourceAllocationSettingDataCreatedIndication', + 'modify' : 'ResourceAllocationSettingDataModifiedIndication', + 'delete' : 'ResourceAllocationSettingDataDeletedIndication' + } + + sub_list, ind_names, dict = sub_ind(s_sysname, virt, ind_names) + virt_xml = get_class(virt) + cxml = virt_xml(test_dom, mac=nmac) + service = vsms.get_vsms_class(options.virt)(options.ip) + ndpath = cxml.secondary_disk_path + + if virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + disk_attr = { 'nddev' : nddev, + 'src_path' : ndpath + } + dasd = vsms.get_dasd_class(options.virt)(dev=nddev, + source=cxml.secondary_disk_path, + name=test_dom) + masd = vsms.get_masd_class(options.virt)(megabytes=nmem, name=test_dom) + rasd_info = { 'add' : [dasd, disk_attr], + 'modify' : [masd, nmem] + } + + status, cxml = create_guest(test_dom, s_sysname, virt, cxml) + if status != PASS: + logger.error("Error setting up the guest '%s'" % test_dom) + return FAIL + + for ind in ind_names.keys(): + sub = sub_list[ind] + ind_name = ind_names[ind] + logger.info("\n Verifying '%s' indications ....", ind_name) + + try: + pid = fork() + if pid == 0: + status = handle_request(sub, ind_name, dict, + len(ind_names.keys())) + if status != PASS: + _exit(1) + + _exit(0) + else: + try: + if ind != 'delete': + rasd = rasd_info[ind][0] + val = rasd_info[ind][1] + status = gen_indication(test_dom, s_sysname, + virt, cxml, service, + ind, rasd, val) + else: + status = gen_indication(test_dom, s_sysname, + virt, cxml, service, + ind) + if status != PASS: + raise Exception("Unable to generate indication") + + status = poll_for_ind(pid, ind_name) + if status != PASS: + raise Exception("Poll for indication Failed") + + except Exception, details: + kill(pid, SIGKILL) + raise Exception(details) + + except Exception, details: + logger.error("Exception: %s", details) + status = FAIL + + if status != PASS: + break + + #Make sure all subscriptions are really unsubscribed + for ind, sub in sub_list.iteritems(): + sub.unsubscribe(dict['default_auth']) + logger.info("Cancelling subscription for %s", ind_names[ind]) + + ret = cxml.cim_destroy(s_sysname) + if not ret: + logger.error("Failed to destroy the domain '%s'", test_dom) + return FAIL + + return status +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] [TEST] Add new tc RASDIndications/01_guest_states_rasd_ind.py
by Deepti B. Kalakeri 23 Sep '09

23 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253558547 25200 # Node ID 7b7fa4294f3602db5aca1d5958ebfd6dc849ef46 # Parent f5c62f54d1204d38ce15e48d269d3e887da69937 [TEST] Add new tc RASDIndications/01_guest_states_rasd_ind.py To verify the Add|Deleted RASDIndication for the guest. Tested with Xen and current sources on RHEL5.3. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5c62f54d120 -r 7b7fa4294f36 suites/libvirt-cim/cimtest/RASDIndications/01_guest_states_rasd_ind.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/RASDIndications/01_guest_states_rasd_ind.py Mon Sep 21 11:42:27 2009 -0700 @@ -0,0 +1,157 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# This testcase is used to verify the Created|Deleted +# RASD Indications for a guest. +# +# Date : 21-09-2009 +# + +import sys +from signal import SIGKILL +from socket import gethostname +from os import kill, fork, _exit +from XenKvmLib.vxml import get_class +from XenKvmLib.xm_virt_util import active_domain_list +from CimTest.Globals import logger +from XenKvmLib.const import do_main, CIM_ENABLE, CIM_DISABLE +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import poll_for_state_change +from XenKvmLib.indications import sub_ind, handle_request, poll_for_ind + +sup_types = ['KVM', 'Xen'] + +def create_guest(test_dom, ip, virt, cxml, ind_name): + try: + ret = cxml.cim_define(ip) + if not ret: + raise Exception("Failed to define domain %s" % test_dom) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_DISABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_DISABLE)) + + ret = cxml.cim_start(ip) + if ret: + raise Exception("Failed to start the domain '%s'" % test_dom) + cxml.undefine(ip) + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + CIM_ENABLE) + if status != PASS: + raise Exception("Dom '%s' not in expected state '%s'" \ + % (test_dom, CIM_ENABLE)) + + except Exception, details: + logger.error("Exception details: %s", details) + return FAIL, cxml + + return PASS, cxml + +def gen_indication(test_dom, s_sysname, virt, cxml, ind_name): + status = FAIL + try: + active_doms = active_domain_list(s_sysname, virt) + if test_dom not in active_doms: + status, cxml = create_guest(test_dom, s_sysname, virt, cxml, ind_name) + if status != PASS: + raise Exception("Error setting up the guest '%s'" % test_dom) + + if ind_name == "delete": + ret = cxml.cim_destroy(s_sysname) + if not ret: + raise Exception("Failed to destroy domain '%s'" % test_dom) + + except Exception, details: + logger.error("Exception details :%s", details) + return FAIL, cxml + + return PASS, cxml + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = options.ip + + status = FAIL + test_dom = 'VM_' + gethostname() + ind_names = { + 'create' : 'ResourceAllocationSettingDataCreatedIndication', + 'delete' : 'ResourceAllocationSettingDataDeletedIndication' + } + + virt_xml = get_class(virt) + cxml = virt_xml(test_dom) + sub_list, ind_names, dict = sub_ind(s_sysname, virt, ind_names) + for ind in ind_names.keys(): + sub = sub_list[ind] + ind_name = ind_names[ind] + logger.info("\n Verifying '%s' indications ....", ind_name) + + try: + pid = fork() + if pid == 0: + status = handle_request(sub, ind_name, dict, + len(ind_names.keys())) + if status != PASS: + _exit(1) + _exit(0) + else: + try: + status, cxml = gen_indication(test_dom, s_sysname, + virt, cxml, ind) + if status != PASS: + kill(pid, SIGKILL) + raise Exception("Unable to generate indication") + + status = poll_for_ind(pid, ind_name) + except Exception, details: + kill(pid, SIGKILL) + raise Exception(details) + + except Exception, details: + logger.error("Exception: %s", details) + status = FAIL + + if status != PASS: + break + + #Make sure all subscriptions are really unsubscribed + for ind, sub in sub_list.iteritems(): + sub.unsubscribe(dict['default_auth']) + logger.info("Cancelling subscription for %s", ind_names[ind]) + + active_doms = active_domain_list(s_sysname, virt) + if test_dom in active_doms: + ret = cxml.cim_destroy(s_sysname) + if not ret: + logger.error("Failed to Destroy the domain") + return FAIL + + return status +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] This patch replaces get_previous_instance function with get_rasd_by_name()
by Sharad Mishra 22 Sep '09

22 Sep '09

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1253292817 25200 # Node ID f916b221ea7e21b091d36ef841eb3bde1813798d # Parent fc50acd35fe7f344e296441a88a00f42a7636ad6 This patch replaces get_previous_instance function with get_rasd_by_name(). Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r fc50acd35fe7 -r f916b221ea7e src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Sep 16 11:49:21 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Sep 18 09:53:37 2009 -0700 @@ -2185,49 +2185,6 @@ return s; } -static CMPIInstance *get_previous_instance(struct domain *dominfo, - const CMPIObjectPath *ref, - uint16_t type, - const char *devid) -{ - CMPIStatus s; - const char *props[] = {NULL}; - const char *inst_id; - struct inst_list list; - CMPIInstance *prev_inst = NULL; - int i, ret; - - inst_list_init(&list); - s = enum_rasds(_BROKER, ref, dominfo->name, type, props, &list); - if (s.rc != CMPI_RC_OK) { - CU_DEBUG("Failed to enumerate rasd"); - goto out; - } - - for(i = 0; i < list.cur; i++) { - prev_inst = list.list[i]; - ret = cu_get_str_prop(prev_inst, - "InstanceID", - &inst_id); - - if (ret != CMPI_RC_OK) { - CU_DEBUG("Cannot get InstanceID ... ignoring"); - continue; - } - - if (STREQ(inst_id, get_fq_devid(dominfo->name, (char *)devid))) - break; - } - - if (prev_inst == NULL) - CU_DEBUG("PreviousInstance is NULL"); - - out: - inst_list_free(&list); - - return prev_inst; -} - static CMPIStatus _update_resources_for(const CMPIContext *context, const CMPIObjectPath *ref, virDomainPtr dom, @@ -2276,7 +2233,24 @@ } else { indication = strdup(RASD_IND_MODIFIED); - prev_inst = get_previous_instance(dominfo, ref, type, devid); + char *dummy_name = NULL; + + if (asprintf(&dummy_name, "%s/%s",dominfo->name, devid) == -1) { + CU_DEBUG("Unable to set name"); + goto out; + } + s = get_rasd_by_name(_BROKER, + ref, + dummy_name, + type, + NULL, + &prev_inst); + free(dummy_name); + + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to get Previous Instance"); + goto out; + } } s = func(dominfo, rasd, type, devid, NAMESPACE(ref));

2 2

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

18 Sep '09

1 5

[PATCH] [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py
by Deepti B. Kalakeri 17 Sep '09

17 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253185946 14400 # Node ID 72616c6b52fe29ec35acd0f3c262b6c4247135ef # Parent 26357e57d207c3437a06a0730e99c942111901f3 [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py 1) Adding vol_delete() to xm_virt_util.py to delete a volume of a pool. 2) Updating RPCS/10_create_storagevolume.py to include vol_delete. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 26357e57d207 -r 72616c6b52fe suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Thu Sep 17 07:12:26 2009 -0400 @@ -38,7 +38,7 @@ from XenKvmLib import rpcs_service from XenKvmLib.assoc import Associators from XenKvmLib.enumclass import GetInstance, EnumNames -from XenKvmLib.xm_virt_util import virsh_version, vol_list +from XenKvmLib.xm_virt_util import virsh_version, vol_list, vol_delete from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.common_util import destroy_diskpool from XenKvmLib.pool import create_pool, undefine_diskpool, DIR_POOL @@ -129,9 +129,22 @@ return PASS -def cleanup_pool_vol(server, virt, pool_name, clean_vol, exp_vol_path): +def cleanup_pool_vol(server, virt, pool_name, clean_pool, vol_path): + status = res = FAIL + ret = None try: - if clean_vol == True: + ret = vol_delete(server, virt, vol_name, pool_name) + if ret == None: + logger.error("Failed to delete the volume '%s'", vol_name) + + if os.path.exists(vol_path): + cmd = "rm -rf %s" % vol_path + res, out = utils.run_remote(server, cmd) + if res != 0: + logger.error("'%s' was not removed, please remove it " + "manually", vol_path) + + if clean_pool == True: status = destroy_diskpool(server, virt, pool_name) if status != PASS: raise Exception("Unable to destroy diskpool '%s'" % pool_name) @@ -140,16 +153,18 @@ if status != PASS: raise Exception("Unable to undefine diskpool '%s'" \ % pool_name) + + except Exception, details: logger.error("Exception details: %s", details) + status = FAIL + + if (ret == None and res != PASS) or (clean_pool == True and status != PASS): + logger.error("Failed to clean the env.....") return FAIL - - if os.path.exists(exp_vol_path): - cmd = "rm -rf %s" % exp_vol_path - ret, out = utils.run_remote(server, cmd) - if ret != 0: - logger.info("'%s' was not removed, please remove it manually", - exp_vol_path) + else: + logger.info("DEBUG PAssed ") + return PASS @do_main(platform_sup) @@ -211,18 +226,19 @@ found = verify_vol(server, virt, pool_name, exp_vol_path, found) stovol_status = verify_sto_vol_rasd(virt, server, dp_inst_id, exp_vol_path) + + ret = cleanup_pool_vol(server, virt, pool_name, + clean_pool, exp_vol_path) + if res[0] == PASS and found == 1 and \ + ret == PASS and stovol_status == PASS: + status = PASS + else: + return FAIL except Exception, details: logger.error("Exception details: %s", details) status = FAIL - ret = cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - if res[0] == PASS and found == 1 and \ - ret == PASS and stovol_status == PASS: - status = PASS - else: - return FAIL return status if __name__ == "__main__": diff -r 26357e57d207 -r 72616c6b52fe suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Thu Sep 17 07:12:26 2009 -0400 @@ -238,9 +238,9 @@ return names def vol_list(server, virt="KVM", pool_name=None): - """ Function to list the volumes part of a pool""" + """ Function to list the volumes of a pool""" - cmd = " virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ + cmd = "virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ % (virt2uri(virt), pool_name) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -248,6 +248,18 @@ return out +def vol_delete(server, virt="KVM", vol_name=None, pool_name=None): + """ Function to delete the volume of a pool""" + + cmd = "virsh -c %s vol-delete %s --pool %s"\ + % (virt2uri(virt), vol_name, pool_name) + ret, out = utils.run_remote(server, cmd) + if ret != 0: + return None + + return out + + def virsh_vcpuinfo(server, dom, virt="Xen"): cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (virt2uri(virt), dom)

2 1

[PATCH] [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py
by Deepti B. Kalakeri 17 Sep '09

17 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253186627 14400 # Node ID 0387cadda7d381253e2645a0bd9ff8bfd9990fa6 # Parent 26357e57d207c3437a06a0730e99c942111901f3 [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py 1) Adding vol_delete() to xm_virt_util.py to delete a volume of a pool. 2) Updating RPCS/10_create_storagevolume.py to include vol_delete. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 26357e57d207 -r 0387cadda7d3 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Thu Sep 17 07:23:47 2009 -0400 @@ -38,7 +38,7 @@ from XenKvmLib import rpcs_service from XenKvmLib.assoc import Associators from XenKvmLib.enumclass import GetInstance, EnumNames -from XenKvmLib.xm_virt_util import virsh_version, vol_list +from XenKvmLib.xm_virt_util import virsh_version, vol_list, vol_delete from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.common_util import destroy_diskpool from XenKvmLib.pool import create_pool, undefine_diskpool, DIR_POOL @@ -129,9 +129,22 @@ return PASS -def cleanup_pool_vol(server, virt, pool_name, clean_vol, exp_vol_path): +def cleanup_pool_vol(server, virt, pool_name, clean_pool, vol_path): + status = res = FAIL + ret = None try: - if clean_vol == True: + ret = vol_delete(server, virt, vol_name, pool_name) + if ret == None: + logger.error("Failed to delete the volume '%s'", vol_name) + + if os.path.exists(vol_path): + cmd = "rm -rf %s" % vol_path + res, out = utils.run_remote(server, cmd) + if res != 0: + logger.error("'%s' was not removed, please remove it " + "manually", vol_path) + + if clean_pool == True: status = destroy_diskpool(server, virt, pool_name) if status != PASS: raise Exception("Unable to destroy diskpool '%s'" % pool_name) @@ -140,16 +153,16 @@ if status != PASS: raise Exception("Unable to undefine diskpool '%s'" \ % pool_name) + + except Exception, details: logger.error("Exception details: %s", details) + status = FAIL + + if (ret == None and res != PASS) or (clean_pool == True and status != PASS): + logger.error("Failed to clean the env.....") return FAIL - - if os.path.exists(exp_vol_path): - cmd = "rm -rf %s" % exp_vol_path - ret, out = utils.run_remote(server, cmd) - if ret != 0: - logger.info("'%s' was not removed, please remove it manually", - exp_vol_path) + return PASS @do_main(platform_sup) @@ -211,18 +224,19 @@ found = verify_vol(server, virt, pool_name, exp_vol_path, found) stovol_status = verify_sto_vol_rasd(virt, server, dp_inst_id, exp_vol_path) + + ret = cleanup_pool_vol(server, virt, pool_name, + clean_pool, exp_vol_path) + if res[0] == PASS and found == 1 and \ + ret == PASS and stovol_status == PASS: + status = PASS + else: + return FAIL except Exception, details: logger.error("Exception details: %s", details) status = FAIL - ret = cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - if res[0] == PASS and found == 1 and \ - ret == PASS and stovol_status == PASS: - status = PASS - else: - return FAIL return status if __name__ == "__main__": diff -r 26357e57d207 -r 0387cadda7d3 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Thu Sep 17 07:23:47 2009 -0400 @@ -238,9 +238,9 @@ return names def vol_list(server, virt="KVM", pool_name=None): - """ Function to list the volumes part of a pool""" + """ Function to list the volumes of a pool""" - cmd = " virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ + cmd = "virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ % (virt2uri(virt), pool_name) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -248,6 +248,18 @@ return out +def vol_delete(server, virt="KVM", vol_name=None, pool_name=None): + """ Function to delete the volume of a pool""" + + cmd = "virsh -c %s vol-delete %s --pool %s"\ + % (virt2uri(virt), vol_name, pool_name) + ret, out = utils.run_remote(server, cmd) + if ret != 0: + return None + + return out + + def virsh_vcpuinfo(server, dom, virt="Xen"): cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (virt2uri(virt), dom)

1 0

[PATCH] [TEST] [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py
by Deepti B. Kalakeri 17 Sep '09

17 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253182950 14400 # Node ID 5158d71836cdd6127473221731f203c3af221b21 # Parent 26357e57d207c3437a06a0730e99c942111901f3 [TEST] [TEST] Adding vol_delete and modifying RPCS/10_create_storagevolume.py 1) Adding vol_delete() to xm_virt_util.py to delete a volume of a pool. 2) Updating RPCS/10_create_storagevolume.py to include vol_delete. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 26357e57d207 -r 5158d71836cd suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Thu Sep 17 06:22:30 2009 -0400 @@ -38,7 +38,7 @@ from XenKvmLib import rpcs_service from XenKvmLib.assoc import Associators from XenKvmLib.enumclass import GetInstance, EnumNames -from XenKvmLib.xm_virt_util import virsh_version, vol_list +from XenKvmLib.xm_virt_util import virsh_version, vol_list, vol_delete from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.common_util import destroy_diskpool from XenKvmLib.pool import create_pool, undefine_diskpool, DIR_POOL @@ -129,9 +129,14 @@ return PASS -def cleanup_pool_vol(server, virt, pool_name, clean_vol, exp_vol_path): +def cleanup_pool_vol(server, virt, pool_name, clean_pool, exp_vol_path): + status = FAIL try: - if clean_vol == True: + ret = vol_delete(server, virt, vol_name, pool_name) + if ret == None: + logger.error("Failed to delete the volume '%s'", vol_name) + + if clean_pool == True: status = destroy_diskpool(server, virt, pool_name) if status != PASS: raise Exception("Unable to destroy diskpool '%s'" % pool_name) @@ -140,16 +145,21 @@ if status != PASS: raise Exception("Unable to undefine diskpool '%s'" \ % pool_name) + + if os.path.exists(exp_vol_path): + cmd = "rm -rf %s" % exp_vol_path + res, out = utils.run_remote(server, cmd) + if res != 0: + raise Exception("'%s' was not removed, please remove it "\ + "manually", exp_vol_path) + except Exception, details: logger.error("Exception details: %s", details) + status = FAIL + + if ret == None or (clean_pool == True and status != PASS): return FAIL - - if os.path.exists(exp_vol_path): - cmd = "rm -rf %s" % exp_vol_path - ret, out = utils.run_remote(server, cmd) - if ret != 0: - logger.info("'%s' was not removed, please remove it manually", - exp_vol_path) + return PASS @do_main(platform_sup) @@ -211,18 +221,18 @@ found = verify_vol(server, virt, pool_name, exp_vol_path, found) stovol_status = verify_sto_vol_rasd(virt, server, dp_inst_id, exp_vol_path) + + ret = cleanup_pool_vol(server, virt, pool_name, + clean_pool, exp_vol_path) + if res[0] == PASS and found == 1 and \ + ret == PASS and stovol_status == PASS: + status = PASS + else: + return FAIL except Exception, details: logger.error("Exception details: %s", details) status = FAIL - - ret = cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - if res[0] == PASS and found == 1 and \ - ret == PASS and stovol_status == PASS: - status = PASS - else: - return FAIL return status if __name__ == "__main__": diff -r 26357e57d207 -r 5158d71836cd suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Sep 16 09:03:39 2009 -0400 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Thu Sep 17 06:22:30 2009 -0400 @@ -238,9 +238,9 @@ return names def vol_list(server, virt="KVM", pool_name=None): - """ Function to list the volumes part of a pool""" + """ Function to list the volumes of a pool""" - cmd = " virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ + cmd = "virsh -c %s vol-list %s | sed -e '1,2 d' -e '$ d'" \ % (virt2uri(virt), pool_name) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -248,6 +248,18 @@ return out +def vol_delete(server, virt="KVM", vol_name=None, pool_name=None): + """ Function to delete the volume of a pool""" + + cmd = "virsh -c %s vol-delete %s --pool %s"\ + % (virt2uri(virt), vol_name, pool_name) + ret, out = utils.run_remote(server, cmd) + if ret != 0: + return None + + return out + + def virsh_vcpuinfo(server, dom, virt="Xen"): cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (virt2uri(virt), dom)

2 1

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

17 Sep '09

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

2 7

[PATCH] [TEST] Updating RPCS/10_create_storagevolume.py
by Deepti B. Kalakeri 17 Sep '09

17 Sep '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1253097826 14400 # Node ID 0a64f90aabb5dd63ac2ab677981a939b2fcf5eeb # Parent 9e08670a3c3749738a65fec7f2faa4c2b68a7092 [TEST] Updating RPCS/10_create_storagevolume.py Updating RPCS/10_create_storagevolume.py to create and use its own dir pool for StorageVol. If we try to use the default_pool_name then this will cause regression in the further tests which refer to the /tmp/cimtest-vol.img as all the information regarding this will get cleared only when the pool under which it is created it destoyed. Tested with KVM and current sources on SLES11. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 9e08670a3c37 -r 0a64f90aabb5 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Thu Sep 10 09:32:01 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Wed Sep 16 06:43:46 2009 -0400 @@ -31,8 +31,7 @@ from VirtLib import utils from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS, SKIP -from XenKvmLib.const import do_main, platform_sup, default_pool_name, \ - get_provider_version +from XenKvmLib.const import do_main, platform_sup, get_provider_version from XenKvmLib.vsms import RASD_TYPE_STOREVOL from XenKvmLib.rasd import libvirt_rasd_storagepool_changes from XenKvmLib import rpcs_service @@ -129,17 +128,15 @@ return PASS -def cleanup_pool_vol(server, virt, pool_name, clean_vol, exp_vol_path): +def cleanup_pool_vol(server, virt, pool_name, exp_vol_path): try: - if clean_vol == True: - status = destroy_diskpool(server, virt, pool_name) + status = destroy_diskpool(server, virt, pool_name) + if status != PASS: + raise Exception("Unable to destroy diskpool '%s'" % pool_name) + else: + status = undefine_diskpool(server, virt, pool_name) if status != PASS: - raise Exception("Unable to destroy diskpool '%s'" % pool_name) - else: - status = undefine_diskpool(server, virt, pool_name) - if status != PASS: - raise Exception("Unable to undefine diskpool '%s'" \ - % pool_name) + raise Exception("Unable to undefine diskpool '%s'" % pool_name) except Exception, details: logger.error("Exception details: %s", details) return FAIL @@ -177,18 +174,13 @@ status = FAIL res = [FAIL] found = 0 - clean_pool=True try: - if pool_type == DIR_POOL: - pool_name = default_pool_name - clean_pool=False - else: - status = create_pool(server, virt, pool_name, pool_attr, - mode_type=pool_type, pool_type="DiskPool") + status = create_pool(server, virt, pool_name, pool_attr, + mode_type=pool_type, pool_type="DiskPool") - if status != PASS: - logger.error("Failed to create pool '%s'", pool_name) - return status + if status != PASS: + logger.error("Failed to create pool '%s'", pool_name) + return status dp_inst_id = "%s/%s" % (dp_cn, pool_name) stovol_settings = get_stovol_settings(server, virt, @@ -211,18 +203,18 @@ found = verify_vol(server, virt, pool_name, exp_vol_path, found) stovol_status = verify_sto_vol_rasd(virt, server, dp_inst_id, exp_vol_path) + + ret = cleanup_pool_vol(server, virt, pool_name, exp_vol_path) + if res[0] == PASS and found == 1 and \ + ret == PASS and stovol_status == PASS: + status = PASS + else: + return FAIL except Exception, details: logger.error("Exception details: %s", details) status = FAIL - ret = cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - if res[0] == PASS and found == 1 and \ - ret == PASS and stovol_status == PASS: - status = PASS - else: - return FAIL return status if __name__ == "__main__":

2 1

[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

[PATCH] Fixed Storage Volume RASD template path
by Richard Maciel 12 Sep '09

12 Sep '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1252693562 10800 # Node ID 53acca5af901b37e1818c161ca00ff3b937b910c # Parent 697757e558c1f6fde30288d762fd86a4dabdc8f8 Fixed Storage Volume RASD template path Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 697757e558c1 -r 53acca5af901 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Fri Sep 04 14:12:46 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Fri Sep 11 15:26:02 2009 -0300 @@ -1089,7 +1089,7 @@ name = "tmp.img"; CMSetProperty(inst, "VolumeName", (CMPIValue *)name, CMPI_chars); - path = "/var/lib/libvirt/images/"; + path = pool->pool_info.disk.path; CMSetProperty(inst, "Path", (CMPIValue *)path, CMPI_chars); alloc = 0;

1 0

[PATCH 0 of 6] Add support for resource indication provider.
by Sharad Mishra 12 Sep '09

12 Sep '09

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

3 2