# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1195588594 18000 # Node ID 2e1dc075f0a9996bfdd2f437928d261081c1f9d6 # Parent 97e1dd20b2d02b5b542ec830093954f265ae844f Add get_all_pools to Virt_DevicePool, which gets every pool it can find, per Dan's suggestion. Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com> diff -r 97e1dd20b2d0 -r 2e1dc075f0a9 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Tue Nov 20 06:41:27 2007 -0800 +++ b/src/Virt_DevicePool.c Tue Nov 20 14:56:34 2007 -0500 @@ -624,6 +624,28 @@ CMPIInstance *get_pool_by_id(const CMPIB return inst; } +CMPIStatus get_all_pools(const CMPIBroker *broker, + virConnectPtr conn, + const char *ns, + struct inst_list *list) +{ + int i; + CMPIStatus s = {CMPI_RC_OK}; + + for (i = 0; device_pool_names[i]; i++) { + s = get_pool_by_type(broker, + conn, + device_pool_names[i], + ns, + list); + if (s.rc != CMPI_RC_OK) + goto out; + } + + out: + return s; +} + static void __return_pool(const CMPIResult *results, struct inst_list *list, bool name_only) diff -r 97e1dd20b2d0 -r 2e1dc075f0a9 src/Virt_DevicePool.h --- a/src/Virt_DevicePool.h Tue Nov 20 06:41:27 2007 -0800 +++ b/src/Virt_DevicePool.h Tue Nov 20 14:56:34 2007 -0500 @@ -55,6 +55,18 @@ char *pool_member_of(const CMPIBroker *b uint16_t type, const char *id); +/** + * Get all device pools on the system for the given connection + * + * @param broker The current Broker + * @param conn The libvirt connection to use + * @param ns Namespace for the pools + * @param list Return instances in this struct + */ +CMPIStatus get_all_pools(const CMPIBroker *broker, + virConnectPtr conn, + const char *ns, + struct inst_list *list); #endif /*

# HG changeset patch # User Jay Gagnon <grendel@linux.vnet.ibm.com> # Date 1195588594 18000 # Node ID 5c397cd8e30335d08fd0cdf5716856619164a6f4 # Parent 2e1dc075f0a9996bfdd2f437928d261081c1f9d6 Fix AllocationCapabilities to make EnumInstances and EnumInstanceNames work. This should include all the suggestions from the first iteration. Signed-off-by: Jay Gagnon <grendel@linux.vnet.ibm.com> diff -r 2e1dc075f0a9 -r 5c397cd8e303 src/Makefile.am --- a/src/Makefile.am Tue Nov 20 14:56:34 2007 -0500 +++ b/src/Makefile.am Tue Nov 20 14:56:34 2007 -0500 @@ -91,9 +91,9 @@ libVirt_ElementCapabilities_la_LIBADD = -lVirt_ComputerSystem \ -lVirt_HostSystem -libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la +libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c -libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD +libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD -lVirt_DevicePool libVirt_SettingsDefineCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c diff -r 2e1dc075f0a9 -r 5c397cd8e303 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Tue Nov 20 14:56:34 2007 -0500 +++ b/src/Virt_AllocationCapabilities.c Tue Nov 20 14:56:34 2007 -0500 @@ -32,6 +32,7 @@ #include "Virt_AllocationCapabilities.h" #include "Virt_RASD.h" +#include "Virt_DevicePool.h" const static CMPIBroker *_BROKER; @@ -85,6 +86,100 @@ static CMPIStatus return_alloc_cap(const else CMReturnInstance(results, inst); out: + return s; +} + +static CMPIStatus ac_from_pool(const CMPIBroker *broker, + const CMPIObjectPath *ref, + CMPIInstance *pool, + CMPIInstance **alloc_cap) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + *alloc_cap = get_typed_instance(broker, + CLASSNAME(ref), + "AllocationCapabilities", + NAMESPACE(ref)); + if (*alloc_cap == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not get alloc_cap instance"); + goto out; + } + + s = cu_copy_prop(broker, pool, *alloc_cap, "InstanceID", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + + s = cu_copy_prop(broker, pool, *alloc_cap, "ResourceType", NULL); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error copying InstanceID"); + goto out; + } + out: + return s; +} + +static CMPIStatus alloc_cap_instances(const CMPIBroker *broker, + const CMPIObjectPath *ref, + const CMPIResult *results, + bool names_only, + const char **properties) +{ + int i; + virConnectPtr conn; + CMPIInstance *alloc_cap_inst; + struct inst_list alloc_cap_list; + struct inst_list device_pool_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + CU_DEBUG("In alloc_cap_instances()"); + + inst_list_init(&device_pool_list); + inst_list_init(&alloc_cap_list); + + if (!provider_is_responsible(broker, ref, &s)) + goto out; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Could not connect to hypervisor"); + goto out; + } + + s = get_all_pools(broker, conn, NAMESPACE(ref), &device_pool_list); + if (s.rc != CMPI_RC_OK) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Error fetching device pools"); + goto out; + } + + for (i = 0; i < device_pool_list.cur; i++) { + s = ac_from_pool(broker, ref, + device_pool_list.list[i], + &alloc_cap_inst); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(&alloc_cap_list, alloc_cap_inst); + } + + if (names_only) + cu_return_instance_names(results, &alloc_cap_list); + else + cu_return_instances(results, &alloc_cap_list); + + out: + inst_list_free(&alloc_cap_list); + inst_list_free(&device_pool_list); return s; } @@ -97,8 +192,23 @@ static CMPIStatus GetInstance(CMPIInstan return return_alloc_cap(reference, results, 0); } -DEFAULT_EI(); -DEFAULT_EIN(); +static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference) +{ + return alloc_cap_instances(_BROKER, reference, results, true, NULL); +} + +static CMPIStatus EnumInstances(CMPIInstanceMI *self, + const CMPIContext *context, + const CMPIResult *results, + const CMPIObjectPath *reference, + const char **properties) +{ + return alloc_cap_instances(_BROKER, reference, results, false, properties); +} + DEFAULT_CI(); DEFAULT_MI(); DEFAULT_DI();