- CIM - libvirt List Archives

[PATCH] --confirm
by Eduardo Lima (Etrunko) 13 May '11

13 May '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1304971973 10800 # Node ID 845daca07eed6b26555f71a7c761ec945fdc644a # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 Configure: Check for libuuid This patch introduces a macro in acinclude.m4 to check for libuuid development files and fixes the build accordingly. Changes from v1: Added specific check for libuuid version < 1.41.2 Changes from v2: Respect 80 characters limit Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> diff -r 8b428df21c36 -r 845daca07eed acinclude.m4 --- a/acinclude.m4 Wed Apr 13 12:27:33 2011 -0700 +++ b/acinclude.m4 Mon May 09 17:12:53 2011 -0300 @@ -238,10 +238,32 @@ AC_DEFUN([CHECK_LIBVIRT], [ PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 0.3.2]) + AC_SUBST([LIBVIRT_CFLAGS]) + AC_SUBST([LIBVIRT_LIBS]) CPPFLAGS="$CPPFLAGS $LIBVIRT_CFLAGS" LDFLAGS="$LDFLAGS $LIBVIRT_LIBS" ]) +AC_DEFUN([CHECK_LIBUUID], + [ + PKG_CHECK_MODULES([LIBUUID], [uuid >= 1.41.2], + [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no]) + if test "$LIBUUID_FOUND" = "no" ; then + PKG_CHECK_MODULES([LIBUUID], [uuid], + [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no]) + if test "$LIBUUID_FOUND" = "no" ; then + AC_MSG_ERROR([libuuid development files required]) + else + LIBUUID_INCLUDEDIR=$(pkg-config --variable=includedir uuid) + LIBUUID_CFLAGS+=" -I$LIBUUID_INCLUDEDIR/uuid " + fi + fi + AC_SUBST([LIBUUID_CFLAGS]) + AC_SUBST([LIBUUID_LIBS]) + CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS" + LDFLAGS="$LDFLAGS $LIBUUID_LIBS" + ]) + # A convenience macro that spits out a fail message for a particular test # # AC_CHECK_FAIL($LIBNAME,$PACKAGE_SUGGEST,$URL,$EXTRA) diff -r 8b428df21c36 -r 845daca07eed configure.ac --- a/configure.ac Wed Apr 13 12:27:33 2011 -0700 +++ b/configure.ac Mon May 09 17:12:53 2011 -0300 @@ -148,10 +148,14 @@ # Check for presense of a CIM server (this macro is defined in acinclude.m4) CHECK_CIMSERVER +# Check pkg-config program +PKG_PROG_PKG_CONFIG + # Check for presence of libraries CHECK_LIBVIRT CHECK_LIBXML2 CHECK_LIBCU +CHECK_LIBUUID CFLAGS_STRICT="-Werror" diff -r 8b428df21c36 -r 845daca07eed libxkutil/Makefile.am --- a/libxkutil/Makefile.am Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/Makefile.am Mon May 09 17:12:53 2011 -0300 @@ -1,7 +1,6 @@ # Copyright IBM Corp. 2007 SUBDIRS = tests - CFLAGS += $(CFLAGS_STRICT) noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h \ @@ -9,14 +8,14 @@ lib_LTLIBRARIES = libxkutil.la -AM_LDFLAGS = -lvirt -luuid - libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \ xmlgen.c infostore.c pool_parsing.c +libxkutil_la_LIBADD = @LIBVIRT_LIBS@ \ + @LIBUUID_LIBS@ + noinst_PROGRAMS = xml_parse_test xml_parse_test_SOURCES = xml_parse_test.c -xml_parse_test_LDADD = -lvirt -xml_parse_test_LDFLAGS = libxkutil.la -xml_parse_test_DEPENDENCIES = libxkutil.la +xml_parse_test_LDADD = libxkutil.la \ + @LIBVIRT_LIBS@ diff -r 8b428df21c36 -r 845daca07eed libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/xmlgen.c Mon May 09 17:12:53 2011 -0300 @@ -22,7 +22,7 @@ #include <string.h> #include <stdlib.h> #include <inttypes.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libxml/tree.h> #include <libxml/xmlsave.h> diff -r 8b428df21c36 -r 845daca07eed src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Mon May 09 17:12:53 2011 -0300 @@ -26,7 +26,7 @@ #include <stdbool.h> #include <sys/vfs.h> #include <errno.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libvirt/libvirt.h> diff -r 8b428df21c36 -r 845daca07eed src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VSMigrationService.c Mon May 09 17:12:53 2011 -0300 @@ -29,7 +29,7 @@ #include <dirent.h> #include <errno.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libvirt/libvirt.h> diff -r 8b428df21c36 -r 845daca07eed src/Virt_VirtualSystemSnapshotService.c --- a/src/Virt_VirtualSystemSnapshotService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VirtualSystemSnapshotService.c Mon May 09 17:12:53 2011 -0300 @@ -24,7 +24,7 @@ #include <string.h> #include <stdbool.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <cmpidt.h> #include <cmpift.h>

1 0

reg: CIM Classes availability
by Mohan Sundar 13 May '11

13 May '11

Hi all, I am trying to manage KVM remotely through Libvirt & CIM. I have Libvirt-CIM Providers and OpenPegasus CIMOM to acheive the same. When i tried to get the below values , i could not find any CIM or Libvirt-CIM classes for it. 1. IPSubnet Mask of Host machine 2. DefaultIPGateway of Host machine 3. MACAddress of Guest machines 4. Os Details of Guest Machines [ I need to know the CIM class for achieving this as well as Libvirt API methods to achieve the same.] Thanks in advance Mohan Sundar ________________________________ The contents of this e-mail and any attachment(s) may contain confidential or privileged information for the intended recipient(s). Unintended recipients are prohibited from taking action on the basis of information in this e-mail and using or disseminating the information, and must notify the sender and delete it from their system. L&T Infotech will not accept responsibility or liability for the accuracy or completeness of, or the presence of any virus or disabling code in this e-mail" ______________________________________________________________________

2 1

[PATCH] (#2) Fix UUID in migration job lifecycle indications
by Chip Vincent 11 May '11

11 May '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1304034351 14400 # Node ID 2f8763c53407a186968adf1edc9a2f2a1adbc00e # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 (#2) Fix UUID in migration job lifecycle indications. Fixed the logic that fetches a VM UUID and adds it to the migration job's InstanceIdentifier property. Siged-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c +++ b/src/Virt_VSMigrationService.c @@ -812,15 +812,20 @@ CMPIInstance *ind = NULL; CMPIInstance *prev_inst = NULL; const char *pfx = NULL; + virConnectPtr conn = NULL; virDomainPtr dom = NULL; char uuid[VIR_UUID_STRING_BUFLEN]; CMPIDateTime *timestamp = NULL; + conn = connect_by_classname(_BROKER, job->ref_cn, s); + if(conn == NULL) + goto out; + ind_name = ind_type_to_name(ind_type); CU_DEBUG("Creating indication."); - pfx = pfx_from_conn(job->conn); + pfx = pfx_from_conn(conn); ind = get_typed_instance(broker, pfx, @@ -832,13 +837,15 @@ goto out; } - dom = virDomainLookupByName(job->conn, job->domain); - if(dom == NULL) { - CU_DEBUG("Failed to connect to domain %s", job->domain); + timestamp = CMNewDateTime(broker, s); + CMSetProperty(ind, "IndicationTime", + (CMPIValue *)&timestamp, CMPI_dateTime); + + dom = virDomainLookupByName(conn, job->domain); + if (dom == NULL) goto out; - } - if(virDomainGetUUIDString(dom, uuid) != 0) { + if (virDomainGetUUIDString(dom, uuid) != 0) { CU_DEBUG("Failed to get UUID from domain name"); goto out; } @@ -846,10 +853,6 @@ CMSetProperty(ind, "IndicationIdentifier", (CMPIValue *)uuid, CMPI_chars); - timestamp = CMNewDateTime(broker, s); - CMSetProperty(ind, "IndicationTime", - (CMPIValue *)&timestamp, CMPI_dateTime); - if (ind_type == MIG_MODIFIED) { /* Need to copy job inst before attaching as PreviousInstance because otherwise the changes we are about to make to job @@ -867,6 +870,7 @@ out: virDomainFree(dom); + virConnectClose(conn); return ind; }

2 1

[PATCH] [PATCH v2] Configure: Check for libuuid
by Eduardo Lima (Etrunko) 09 May '11

09 May '11

This patch introduces a macro in acinclude.m4 to check for libuuid development files and fixes the build accordingly. Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> --- acinclude.m4 | 19 +++++++++++++++++++ configure.ac | 4 ++++ libxkutil/Makefile.am | 11 +++++------ libxkutil/xmlgen.c | 2 +- src/Virt_SettingsDefineCapabilities.c | 2 +- src/Virt_VSMigrationService.c | 2 +- src/Virt_VirtualSystemSnapshotService.c | 2 +- 7 files changed, 32 insertions(+), 10 deletions(-) mode change 100755 => 100644 acinclude.m4 mode change 100755 => 100644 configure.ac mode change 100755 => 100644 libxkutil/Makefile.am mode change 100755 => 100644 libxkutil/xmlgen.c mode change 100755 => 100644 src/Virt_SettingsDefineCapabilities.c mode change 100755 => 100644 src/Virt_VSMigrationService.c mode change 100755 => 100644 src/Virt_VirtualSystemSnapshotService.c

2 2

[PATCH] Fix UUID in migration job lifecycle indications
by Chip Vincent 06 May '11

06 May '11

# HG changeset patch # User Chip Vincent <cvincent(a)us.ibm.com> # Date 1304034351 14400 # Node ID 454ce8f30a13881cc6f5206d8e8e6f42a2ff8621 # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 Fix UUID in migration job lifecycle indications. Fixed the logic that fetches a VM UUID and adds it to the migration job's InstanceIdentifier property. Siged-off-by: Chip Vincent <cvincent(a)us.ibm.com> diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c +++ b/src/Virt_VSMigrationService.c @@ -812,15 +812,20 @@ CMPIInstance *ind = NULL; CMPIInstance *prev_inst = NULL; const char *pfx = NULL; + virConnectPtr conn = NULL; virDomainPtr dom = NULL; char uuid[VIR_UUID_STRING_BUFLEN]; CMPIDateTime *timestamp = NULL; + conn = connect_by_classname(_BROKER, job->ref_cn, s); + if(conn == NULL) + goto out; + ind_name = ind_type_to_name(ind_type); CU_DEBUG("Creating indication."); - pfx = pfx_from_conn(job->conn); + pfx = pfx_from_conn(conn); ind = get_typed_instance(broker, pfx, @@ -832,13 +837,15 @@ goto out; } - dom = virDomainLookupByName(job->conn, job->domain); - if(dom == NULL) { - CU_DEBUG("Failed to connect to domain %s", job->domain); + timestamp = CMNewDateTime(broker, s); + CMSetProperty(ind, "IndicationTime", + (CMPIValue *)&timestamp, CMPI_dateTime); + + dom = virDomainLookupByName(conn, job->domain); + if (dom == NULL) goto out; - } - if(virDomainGetUUIDString(dom, uuid) != 0) { + if (virDomainGetUUIDString(dom, &uuid[0]) != 0) { CU_DEBUG("Failed to get UUID from domain name"); goto out; } @@ -846,10 +853,6 @@ CMSetProperty(ind, "IndicationIdentifier", (CMPIValue *)uuid, CMPI_chars); - timestamp = CMNewDateTime(broker, s); - CMSetProperty(ind, "IndicationTime", - (CMPIValue *)&timestamp, CMPI_dateTime); - if (ind_type == MIG_MODIFIED) { /* Need to copy job inst before attaching as PreviousInstance because otherwise the changes we are about to make to job @@ -867,6 +870,7 @@ out: virDomainFree(dom); + virConnectClose(conn); return ind; }

2 5

[PATCH] Configure: Check for libuuid
by Eduardo Lima (Etrunko) 04 May '11

04 May '11

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com> # Date 1304539509 10800 # Node ID 662adcc6b7d033ccfba6ce5471ab0c13e0f34235 # Parent 8b428df21c360d1eaedba7157b0dfd429d2db121 Configure: Check for libuuid This patch introduces a macro in acinclude.m4 to check for libuuid development files and fixes the build accordingly. diff -r 8b428df21c36 -r 662adcc6b7d0 acinclude.m4 --- a/acinclude.m4 Wed Apr 13 12:27:33 2011 -0700 +++ b/acinclude.m4 Wed May 04 17:05:09 2011 -0300 @@ -238,10 +238,24 @@ AC_DEFUN([CHECK_LIBVIRT], [ PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 0.3.2]) + AC_SUBST([LIBVIRT_CFLAGS]) + AC_SUBST([LIBVIRT_LIBS]) CPPFLAGS="$CPPFLAGS $LIBVIRT_CFLAGS" LDFLAGS="$LDFLAGS $LIBVIRT_LIBS" ]) +AC_DEFUN([CHECK_LIBUUID], + [ + PKG_CHECK_MODULES([LIBUUID], [uuid], [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no]) + if test "$LIBUUID_FOUND" = "no" ; then + AC_MSG_ERROR([libuuid development files required]) + fi + AC_SUBST([LIBUUID_CFLAGS]) + AC_SUBST([LIBUUID_LIBS]) + CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS" + LDFLAGS="$LDFLAGS $LIBUUID_LIBS" + ]) + # A convenience macro that spits out a fail message for a particular test # # AC_CHECK_FAIL($LIBNAME,$PACKAGE_SUGGEST,$URL,$EXTRA) diff -r 8b428df21c36 -r 662adcc6b7d0 configure.ac --- a/configure.ac Wed Apr 13 12:27:33 2011 -0700 +++ b/configure.ac Wed May 04 17:05:09 2011 -0300 @@ -148,10 +148,14 @@ # Check for presense of a CIM server (this macro is defined in acinclude.m4) CHECK_CIMSERVER +# Check pkg-config program +PKG_PROG_PKG_CONFIG + # Check for presence of libraries CHECK_LIBVIRT CHECK_LIBXML2 CHECK_LIBCU +CHECK_LIBUUID CFLAGS_STRICT="-Werror" diff -r 8b428df21c36 -r 662adcc6b7d0 libxkutil/Makefile.am --- a/libxkutil/Makefile.am Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/Makefile.am Wed May 04 17:05:09 2011 -0300 @@ -1,7 +1,6 @@ # Copyright IBM Corp. 2007 SUBDIRS = tests - CFLAGS += $(CFLAGS_STRICT) noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h \ @@ -9,14 +8,14 @@ lib_LTLIBRARIES = libxkutil.la -AM_LDFLAGS = -lvirt -luuid - libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \ xmlgen.c infostore.c pool_parsing.c +libxkutil_la_LIBADD = @LIBVIRT_LIBS@ \ + @LIBUUID_LIBS@ + noinst_PROGRAMS = xml_parse_test xml_parse_test_SOURCES = xml_parse_test.c -xml_parse_test_LDADD = -lvirt -xml_parse_test_LDFLAGS = libxkutil.la -xml_parse_test_DEPENDENCIES = libxkutil.la +xml_parse_test_LDADD = libxkutil.la \ + @LIBVIRT_LIBS@ diff -r 8b428df21c36 -r 662adcc6b7d0 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Apr 13 12:27:33 2011 -0700 +++ b/libxkutil/xmlgen.c Wed May 04 17:05:09 2011 -0300 @@ -22,7 +22,7 @@ #include <string.h> #include <stdlib.h> #include <inttypes.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libxml/tree.h> #include <libxml/xmlsave.h> diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Wed May 04 17:05:09 2011 -0300 @@ -26,7 +26,7 @@ #include <stdbool.h> #include <sys/vfs.h> #include <errno.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libvirt/libvirt.h> diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VSMigrationService.c Wed May 04 17:05:09 2011 -0300 @@ -29,7 +29,7 @@ #include <dirent.h> #include <errno.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <libvirt/libvirt.h> diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_VirtualSystemSnapshotService.c --- a/src/Virt_VirtualSystemSnapshotService.c Wed Apr 13 12:27:33 2011 -0700 +++ b/src/Virt_VirtualSystemSnapshotService.c Wed May 04 17:05:09 2011 -0300 @@ -24,7 +24,7 @@ #include <string.h> #include <stdbool.h> -#include <uuid/uuid.h> +#include <uuid.h> #include <cmpidt.h> #include <cmpift.h>

1 0

[PATCH] [TEST] Updating test case to remove check for "Reserved" value
by Sharad Mishra 03 May '11

03 May '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1302806505 25200 # Node ID 4c8e0c673d796ae7a5e17ee771d935e449b77bce # Parent 1872aaa2378208e3359c7a32d809d78102506797 [TEST] Updating test case to remove check for "Reserved" value. This test creates a DiskPool and gets its pool info. Then reads it again using association. There is a delay in reading the two values and at times it is seen the these values change by few bytes. This patch will check for all StoragePool attributes except "Reserved". Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 1872aaa23782 -r 4c8e0c673d79 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Thu Apr 14 10:34:37 2011 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Thu Apr 14 11:41:45 2011 -0700 @@ -99,7 +99,16 @@ elements = managed_ele_values[cn] for ele in elements: - if assoc_val.items() == ele.items(): + val1=assoc_val.items() + # "Reserved" is the second attribute. + # remove it. + del val1[1] + val2=ele.items() + # "Reserved" is the second attribute. + # remove it. + del val2[1] + # Now compare without "Reserved" + if val1 == val2: return PASS except Exception, details:

2 1

[PATCH] [TEST] New test to test DiskPool autostart
by Sharad Mishra 03 May '11

03 May '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1302802477 25200 # Node ID 1872aaa2378208e3359c7a32d809d78102506797 # Parent 327294d1f3df451ec317e670580e7c60619c8b02 [TEST] New test to test DiskPool autostart. Feature to Autostart DiskPool was added to libvirt-cim. This cimtest tests that feature. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 327294d1f3df -r 1872aaa23782 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/15_DiskPoolAutostart.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/15_DiskPoolAutostart.py Thu Apr 14 10:34:37 2011 -0700 @@ -0,0 +1,118 @@ +#!/usr/bin/python +# +# Copyright 2011 IBM Corp. +# +# Authors: +# Sharad Mishra<snmishra(a)us.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 +# +# -Date: 04.14.2011 + +import sys +from pywbem import cim_types +from CimTest.Globals import logger +from XenKvmLib.xm_virt_util import virsh_version +from CimTest.ReturnCodes import FAIL, PASS, SKIP +from XenKvmLib.const import do_main, platform_sup +from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import destroy_diskpool +from XenKvmLib.pool import create_pool, verify_pool, undefine_diskpool +from XenKvmLib.const import get_provider_version +from VirtLib import utils + +disk_pool_autostart_support=1087 + +def verify_autostart(server, key): + cmd = "virsh pool-info %s 2>/dev/null" % key + s, disk_xml = utils.run_remote(server, cmd) + if s != 0: + logger.error("Encountered error running command : %s", cmd) + return FAIL + + disk = disk_xml.translate(None, ' ') + val = disk.find("Autostart:yes") + if val == -1: + logger.error("Pool is NOT set to Autostart"); + return FAIL + + return PASS + + +@do_main(platform_sup) +def main(): + options = main.options + server = options.ip + virt = options.virt + + dp_types = { } + + libvirt_version = virsh_version(server, virt) + if libvirt_version < "0.4.1": + logger.info("Storage pool creation support is available in Libvirt " + "version >= 0.4.1 , hence skipping the test....") + return SKIP + + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < disk_pool_autostart_support: + logger.info("DiskPool Autostart support available in libvirt-cim" + " version >= %s, hence skipping this test...", + disk_pool_autostart_support) + return SKIP + + status = FAIL + pool_attr = None + key = 'DISK_POOL_DIR' + value = 1 + try: + logger.info("Verifying '%s'.....", key) + test_pool = key + pool_attr = { "Path" : "/var/lib/libvirt/images", + "Autostart" : cim_types.Uint16(1) } + + status = create_pool(server, virt, test_pool, pool_attr, + mode_type=value, pool_type= "DiskPool") + + if status != PASS: + raise Exception("Failed to create '%s' type diskpool '%s'" \ + % (key, test_pool)) + + status = verify_autostart(server, key) + if status != PASS: + destroy_diskpool(server, virt, test_pool) + undefine_diskpool(server, virt, test_pool) + raise Exception("Error in diskpool verification") + + status = destroy_diskpool(server, virt, test_pool) + if status != PASS: + raise Exception("Unable to destroy diskpool '%s'" \ + % test_pool) + + status = undefine_diskpool(server, virt, test_pool) + if status != PASS: + raise Exception("Unable to undefine diskpool '%s'" \ + % test_pool) + + status = PASS + + except Exception, details: + status = FAIL + logger.error("Exception details: %s", details) + + return status + +if __name__ == "__main__": + sys.exit(main())

2 1

[PATCH] Add support for StoragePool autostart
by Sharad Mishra 25 Apr '11

25 Apr '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1302722853 25200 # Node ID b1695aa081851829a25a8210bef8de0348c7b089 # Parent a521a11eeec4b41399ca954ab17b874a708eb4b3 Add support for StoragePool autostart. This patch adds support to set autostart on StoragePools Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r a521a11eeec4 -r b1695aa08185 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Wed Mar 23 09:32:46 2011 -0700 +++ b/libxkutil/pool_parsing.c Wed Apr 13 12:27:33 2011 -0700 @@ -241,6 +241,7 @@ const xmlChar *xpathstr = (xmlChar *)"/pool"; const char *name; + CU_DEBUG("Pool XML : %s", xml); len = strlen(xml) + 1; if ((xmldoc = xmlParseMemory(xml, len)) == NULL) @@ -277,11 +278,11 @@ return ret; } -int define_pool(virConnectPtr conn, const char *xml, int res_type) +int define_pool(virConnectPtr conn, const char *xml, struct virt_pool *pool) { int ret = 1; - if (res_type == CIM_RES_TYPE_NET) { + if (pool->type == CIM_RES_TYPE_NET) { virNetworkPtr ptr = virNetworkDefineXML(conn, xml); if (ptr == NULL) { CU_DEBUG("Unable to define virtual network"); @@ -297,7 +298,7 @@ } virNetworkFree(ptr); - } else if (res_type == CIM_RES_TYPE_DISK) { + } else if (pool->type == CIM_RES_TYPE_DISK) { #if VIR_USE_LIBVIRT_STORAGE virStoragePoolPtr ptr = virStoragePoolDefineXML(conn, xml, 0); if (ptr == NULL) { @@ -313,6 +314,11 @@ CU_DEBUG("Unable to undefine storage pool"); } + if (pool->pool_info.disk.autostart == 1) { + if (virStoragePoolSetAutostart(ptr, 1) != 0) + CU_DEBUG("Unable to set autostart for pool"); + } + virStoragePoolFree(ptr); #endif } diff -r a521a11eeec4 -r b1695aa08185 libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Wed Mar 23 09:32:46 2011 -0700 +++ b/libxkutil/pool_parsing.h Wed Apr 13 12:27:33 2011 -0700 @@ -53,6 +53,7 @@ char *adapter; char *port_name; char *node_name; + uint16_t autostart; }; struct virt_pool { @@ -89,7 +90,7 @@ int get_pool_from_xml(const char *xml, struct virt_pool *pool, int type); char *get_disk_pool_type(uint16_t type); -int define_pool(virConnectPtr conn, const char *xml, int res_type); +int define_pool(virConnectPtr conn, const char *xml, struct virt_pool *pool); int destroy_pool(virConnectPtr conn, const char *name, int res_type); char *create_resource(virConnectPtr conn, const char *pname, diff -r a521a11eeec4 -r b1695aa08185 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Wed Mar 23 09:32:46 2011 -0700 +++ b/schema/ResourceAllocationSettingData.mof Wed Apr 13 12:27:33 2011 -0700 @@ -350,6 +350,7 @@ Values {"Unknown", "Directory, File System, Network File System, " "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; + uint16 Autostart; string Path; string DevicePaths[]; string Host; @@ -369,6 +370,7 @@ Values {"Unknown", "Directory, File System, Network File System, " "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; + uint16 Autostart; string Path; string DevicePaths[]; string Host; @@ -388,6 +390,7 @@ Values {"Unknown", "Directory, File System, Network File System, " "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; + uint16 Autostart; string Path; string DevicePaths[]; string Host; diff -r a521a11eeec4 -r b1695aa08185 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Mar 23 09:32:46 2011 -0700 +++ b/src/Virt_DevicePool.c Wed Apr 13 12:27:33 2011 -0700 @@ -101,6 +101,8 @@ if (xml == NULL) return 0; + CU_DEBUG("pool xml is %s", xml); + *pool = malloc(sizeof(**pool)); if (*pool == NULL) { ret = 0; @@ -175,6 +177,8 @@ uint16_t type; struct virt_pool *pool_vals = NULL; const char *pool_str = NULL; + uint16_t autostart; + int start; pool = virStoragePoolLookupByName(conn, _pool->tag); if (pool == NULL) { @@ -215,6 +219,17 @@ CMPI_chars); } + if (virStoragePoolGetAutostart(pool, &start) == -1) { + CU_DEBUG("Failed to read if %s StoragePool is set for " + "Autostart", _pool->tag); + goto out; + } + + autostart = start; + + CMSetProperty(inst, "Autostart", + (CMPIValue *)&autostart, CMPI_uint16); + result = true; out: virStoragePoolFree(pool); diff -r a521a11eeec4 -r b1695aa08185 src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Wed Mar 23 09:32:46 2011 -0700 +++ b/src/Virt_ResourcePoolConfigurationService.c Wed Apr 13 12:27:33 2011 -0700 @@ -150,6 +150,7 @@ pool->pool_info.disk.adapter = NULL; pool->pool_info.disk.port_name = NULL; pool->pool_info.disk.node_name = NULL; + pool->pool_info.disk.autostart = 0; } static char *get_dev_paths(CMPIInstance *inst, @@ -289,6 +290,7 @@ const char *val = NULL; const char *msg = NULL; uint16_t type; + uint16_t autostart; if (cu_get_u16_prop(inst, "Type", &type) != CMPI_RC_OK) return "Missing `Type' property"; @@ -326,6 +328,14 @@ pool->pool_info.disk.path = strdup(val); + if (cu_get_u16_prop(inst, "Autostart", &autostart) != CMPI_RC_OK) { + CU_DEBUG("Failed to get Autostart, defaulting " + "to no autostart"); + autostart = 0; + } + + pool->pool_info.disk.autostart = autostart; + out: return msg; @@ -440,7 +450,7 @@ static CMPIInstance *connect_and_create(char *xml, const CMPIObjectPath *ref, const char *id, - int res_type, + struct virt_pool *pool, CMPIStatus *s) { virConnectPtr conn; @@ -452,7 +462,7 @@ return NULL; } - if (define_pool(conn, xml, res_type) == 0) { + if (define_pool(conn, xml, pool) == 0) { virt_set_status(_BROKER, s, CMPI_RC_ERR_FAILED, conn, @@ -544,7 +554,7 @@ CU_DEBUG("Pool XML:\n%s", xml); - inst = connect_and_create(xml, reference, full_id, pool->type, &s); + inst = connect_and_create(xml, reference, full_id, pool, &s); if (s.rc != CMPI_RC_OK) goto out; diff -r a521a11eeec4 -r b1695aa08185 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Mar 23 09:32:46 2011 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Wed Apr 13 12:27:33 2011 -0700 @@ -1521,19 +1521,24 @@ DISK_POOL_SCSI}; int pool_types = 7; int i; + uint16_t autostart; switch (template_type) { case SDC_RASD_MIN: id = "Minimum"; + autostart = 0; break; case SDC_RASD_MAX: id = "Maximum"; + autostart = 1; break; case SDC_RASD_INC: id = "Increment"; + autostart = 1; break; case SDC_RASD_DEF: id = "Default"; + autostart = 0; break; default: cu_statusf(_BROKER, &s, @@ -1633,6 +1638,8 @@ CMSetProperty(inst, "Type", (CMPIValue *)&type[i], CMPI_uint16); CMSetProperty(inst, "Path", (CMPIValue *)path, CMPI_chars); + CMSetProperty(inst, "Autostart", (CMPIValue *)&autostart, + CMPI_uint16); inst_list_add(list, inst); }

2 1

[PATCH] [TEST] Conditionally fail this test if QEMU command 'device_add' fails
by Sharad Mishra 08 Apr '11

08 Apr '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1301946359 25200 # Node ID 96ef3d9cdb65d32f54fce85d5c154cd84466ea24 # Parent 4d2dc8ffbd280bf988c7fa9c9bc08d87785dec72 [TEST] Conditionally fail this test if QEMU command 'device_add' fails. This test will fail if hotplugging is not supported. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 4d2dc8ffbd28 -r 96ef3d9cdb65 suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py Mon Apr 04 12:42:52 2011 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py Mon Apr 04 12:45:59 2011 -0700 @@ -28,7 +28,7 @@ from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main -from CimTest.ReturnCodes import FAIL, PASS +from CimTest.ReturnCodes import FAIL, PASS, XFAIL from XenKvmLib import vsms_util sup_types = ['Xen', 'KVM', 'XenFV'] @@ -72,7 +72,7 @@ status = vsms_util.add_disk_res(options.ip, service, cxml, vssd_ref, dasd, disk_attr) if status != PASS: - return FAIL + return XFAIL dasd = vsms.get_dasd_class(options.virt)(dev='vdc', instanceid='rstest_domain/vda', source='/home/rss.iso',

2 1