# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1248121657 25200 # Node ID 20fbdf23ea06819cb2d6193273497bee9b3eb8a2 # Parent 5eefe23b2be112a925b834931897e61b97d2cd06 (#2) Add code to be able to parse an existing storage pool's XML This is needed in order to determine the storage pool type. For the upcoming image creation support, only directory type pools will be supported initially. Updates: -Remove duplicate parsing of "dir" node -Add implementation for building device_paths array Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r 5eefe23b2be1 -r 20fbdf23ea06 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Mon Jul 20 13:53:31 2009 -0700 +++ b/libxkutil/pool_parsing.c Mon Jul 20 13:27:37 2009 -0700 @@ -31,6 +31,7 @@ #include <libcmpiutil/libcmpiutil.h> #include "pool_parsing.h" +#include "device_parsing.h" #include "../src/svpc_types.h" /* @@ -86,6 +87,169 @@ *pool = NULL; } +static int parse_disk_target(xmlNode *node, struct disk_pool *pool) +{ + xmlNode *child; + + for (child = node->children; child != NULL; child = child->next) { + if (XSTREQ(child->name, "path")) { + STRPROP(pool, path, child); + break; + } + } + + return 1; +} + +static int parse_disk_source(xmlNode *node, struct disk_pool *pool) +{ + xmlNode *child; + char **dev_paths = NULL; + unsigned ct = 0; + + for (child = node->children; child != NULL; child = child->next) { + if (XSTREQ(child->name, "device")) { + char **tmp = NULL; + + tmp = realloc(dev_paths, sizeof(char *) * (ct + 1)); + if (tmp == NULL) { + CU_DEBUG("Could not alloc space for dev path"); + continue; + } + dev_paths = tmp; + + dev_paths[ct] = get_attr_value(child, "path"); + ct++; + } else if (XSTREQ(child->name, "host")) { + pool->host = get_attr_value(child, "name"); + if (pool->host == NULL) + goto err; + } else if (XSTREQ(child->name, "dir")) { + pool->src_dir = get_attr_value(child, "path"); + if (pool->src_dir == NULL) + goto err; + } else if (XSTREQ(child->name, "adapter")) { + pool->adapter = get_attr_value(child, "name"); + pool->port_name = get_attr_value(child, "wwpn"); + pool->node_name = get_attr_value(child, "wwnn"); + } + } + + pool->device_paths_ct = ct; + pool->device_paths = dev_paths; + + err: + + return 1; +} + +static const char *parse_disk_pool(xmlNodeSet *nsv, struct disk_pool *pool) +{ + xmlNode **nodes = nsv->nodeTab; + xmlNode *child; + const char *type_str; + const char *name; + int type = 0; + + type_str = get_attr_value(nodes[0], "type"); + + if (STREQC(type_str, "dir")) + type = DISK_POOL_DIR; + else if (STREQC(type_str, "fs")) + type = DISK_POOL_FS; + else if (STREQC(type_str, "netfs")) + type = DISK_POOL_NETFS; + else if (STREQC(type_str, "disk")) + type = DISK_POOL_DISK; + else if (STREQC(type_str, "iscsi")) + type = DISK_POOL_ISCSI; + else if (STREQC(type_str, "logical")) + type = DISK_POOL_LOGICAL; + else if (STREQC(type_str, "scsi")) + type = DISK_POOL_SCSI; + else + type = DISK_POOL_UNKNOWN; + + pool->pool_type = type; + + for (child = nodes[0]->children; child != NULL; child = child->next) { + if (XSTREQ(child->name, "name")) { + name = get_node_content(child); + } else if (XSTREQ(child->name, "target")) + parse_disk_target(child, pool); + else if (XSTREQ(child->name, "source")) + parse_disk_source(child, pool); + } + + return name; +} + +int get_pool_from_xml(const char *xml, struct virt_pool *pool, int type) +{ + int len; + int ret = 0; + xmlDoc *xmldoc; + xmlXPathContext *xpathctx; + xmlXPathObject *xpathobj; + const xmlChar *xpathstr = (xmlChar *)"/pool"; + const char *name; + + len = strlen(xml) + 1; + + if ((xmldoc = xmlParseMemory(xml, len)) == NULL) + goto err1; + + if ((xpathctx = xmlXPathNewContext(xmldoc)) == NULL) + goto err2; + + if ((xpathobj = xmlXPathEvalExpression(xpathstr, xpathctx)) == NULL) + goto err3; + + /* FIXME: Add support for parsing network pools */ + if (type == CIM_RES_TYPE_NET) { + ret = 0; + goto err1; + } + + memset(pool, 0, sizeof(*pool)); + + pool->type = CIM_RES_TYPE_DISK; + name = parse_disk_pool(xpathobj->nodesetval, + &(pool)->pool_info.disk); + if (name == NULL) + ret = 0; + + pool->id = strdup(name); + + xmlXPathFreeObject(xpathobj); + err3: + xmlXPathFreeContext(xpathctx); + err2: + xmlFreeDoc(xmldoc); + err1: + return ret; +} + +int get_disk_pool(virStoragePoolPtr poolptr, struct virt_pool **pool) +{ + char *xml; + int ret; + + xml = virStoragePoolGetXMLDesc(poolptr, 0); + if (xml == NULL) + return 0; + + *pool = malloc(sizeof(**pool)); + if (*pool == NULL) + return 0; + + ret = get_pool_from_xml(xml, *pool, CIM_RES_TYPE_DISK); + + free(xml); + + return ret; +} + int define_pool(virConnectPtr conn, const char *xml, int res_type) { int ret = 1; diff -r 5eefe23b2be1 -r 20fbdf23ea06 libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Mon Jul 20 13:53:31 2009 -0700 +++ b/libxkutil/pool_parsing.h Mon Jul 20 13:27:37 2009 -0700 @@ -66,6 +66,9 @@ void cleanup_virt_pool(struct virt_pool **pool); +int get_pool_from_xml(const char *xml, struct virt_pool *pool, int type); +int get_disk_pool(virStoragePoolPtr poolptr, struct virt_pool **pool); + int define_pool(virConnectPtr conn, const char *xml, int res_type); int destroy_pool(virConnectPtr conn, const char *name, int res_type);

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com&gt; # Date 1248121657 25200 # Node ID 53e7156f47ea93b6866a9908a456741086ce0473 # Parent d55e89f660825c2ad5df60151707ead225d07e85 Expose template RASDs that can be used for defining new storage volumes Also: -Change volume_template() to avail_volume_template() to distinguish from template RASDs that represent existing storage volumes in a pool vs the template RASDs that are used for creating a new storage volume within a given pool -Change disk_dev_or_pool_template() to disk_res_template() since it now handles more than existing storage volumes and disk pool templates. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com&gt; diff -r d55e89f66082 -r 53e7156f47ea src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon Jul 20 13:27:37 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Mon Jul 20 13:27:37 2009 -0700 @@ -71,6 +71,7 @@ #define DEVICE_RASD 0 #define POOL_RASD 1 +#define NEW_VOL_RASD 2 static bool system_has_vt(virConnectPtr conn) { @@ -280,6 +281,10 @@ ret = rasd_classname_from_type(resource_type, &base); else if (rasd_type == POOL_RASD) ret = pool_rasd_classname_from_type(resource_type, &base); + else if (rasd_type == NEW_VOL_RASD) { + base = "StorageVolumeResourceAllocationSettingData"; + ret = 0; + } if (ret != CMPI_RC_OK) { cu_statusf(_BROKER, s, @@ -1023,10 +1028,76 @@ } #if VIR_USE_LIBVIRT_STORAGE -static CMPIStatus volume_template(const CMPIObjectPath *ref, - int template_type, - virStorageVolPtr volume_ptr, - struct inst_list *list) +static CMPIStatus new_volume_template(const CMPIObjectPath *ref, + int template_type, + virStoragePoolPtr poolptr, + struct inst_list *list) +{ + const char *id; + CMPIStatus s = {CMPI_RC_OK, NULL}; + int ret = 0; + struct virt_pool *pool = NULL; + CMPIInstance *inst = NULL; + int type = 0; + const char *path; + + switch(template_type) { + case SDC_RASD_MIN: + id = "New Storage Volume Minimum"; + break; + case SDC_RASD_MAX: + id = "New Storage Volume Maximum"; + break; + case SDC_RASD_INC: + id = "New Storage Volume Increment"; + break; + case SDC_RASD_DEF: + id = "New Storage Volume Default"; + break; + default: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type"); + goto out; + } + + ret = get_disk_pool(poolptr, &pool); + if (ret == 1) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_FAILED, + virStoragePoolGetConnect(poolptr), + "Error getting referenced configuration"); + goto out; + } + + type = pool->pool_info.disk.pool_type; + if (type != DISK_POOL_DIR) { + CU_DEBUG("Image creation for this pool type is not supported"); + goto out; + } + + inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_IMAGE, NEW_VOL_RASD); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; + + CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); + CMSetProperty(inst, "Type", (CMPIValue *)&type, CMPI_uint16); + + path = "/var/lib/libvirt/images/"; + CMSetProperty(inst, "Path", (CMPIValue *)path, CMPI_chars); + + inst_list_add(list, inst); + + out: + cleanup_virt_pool(&pool); + + return s; +} + +static CMPIStatus avail_volume_template(const CMPIObjectPath *ref, + int template_type, + virStorageVolPtr volume_ptr, + struct inst_list *list) { char *pfx = NULL; const char *id; @@ -1163,6 +1234,10 @@ goto out; } + s = new_volume_template(ref, template_type, poolptr, list); + if (s.rc != CMPI_RC_OK) + goto out; + if ((numvols = virStoragePoolNumOfVolumes(poolptr)) == -1) { virt_set_status(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -1206,7 +1281,7 @@ goto out; } - s = volume_template(ref, template_type, volptr, list); + s = avail_volume_template(ref, template_type, volptr, list); virStorageVolFree(volptr); @@ -1388,9 +1463,9 @@ return s; } -static CMPIStatus disk_dev_or_pool_template(const CMPIObjectPath *ref, - int template_type, - struct inst_list *list) +static CMPIStatus disk_res_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst; @@ -1421,7 +1496,7 @@ if (val) s = disk_pool_template(ref, template_type, list); - else + else s = disk_template(ref, template_type, list); out: @@ -1648,7 +1723,7 @@ else if (type == CIM_RES_TYPE_NET) s = net_dev_or_pool_template(ref, i, list); else if (type == CIM_RES_TYPE_DISK) - s = disk_dev_or_pool_template(ref, i, list); + s = disk_res_template(ref, i, list); else if (type == CIM_RES_TYPE_GRAPHICS) s = graphics_template(ref, i, list); else if (type == CIM_RES_TYPE_INPUT)