- CIM - libvirt List Archives

[PATCH 0 of 2] Fix NULL attributes returned by VSMigrationService.
by Kaitlin Rupert 17 Dec '07

17 Dec '07

Get the values for the SystemName and SystemCreationClassName from the host instance and set accordingly.

3 6

[PATCH 0 of 3] #3 - SDC: Fixed type of returned instance and error code
by Heidi Eckhart 17 Dec '07

17 Dec '07

Patch 1: The returned RASD instances have been of the general classname ResourceAllocationSettingData instead of the type specific one, e.g. ProcResourceAllocationSettingData Patch 2: RASD to AllocationCapabilities should return NOT_SUPPORTED instead of OK Diff to #1: patch 1: fixed missing check for unknown resource type Diff to #2: - added helper function to RASD that translates the resource type into the classname (patch 1 of 3) - updated patch 2 (#1 before) to make use of the helper function - updated patch 3 (#2 before) to make use of RETURN_UNSUPPORTED macro

3 6

Failing query of AllocationCapabilities, GetInstance() does not return an instance
by Guo Lian Yun 14 Dec '07

14 Dec '07

The result of ein AllocationCapabilites is correct: wbemcli ein http://root:password@localhost:5988/root/virt:Xen_AllocationCapabilities localhost:5988/root/virt:Xen_AllocationCapabilities.InstanceID="ProcessorPool/0" localhost:5988/root/virt:Xen_AllocationCapabilities.InstanceID="MemoryPool/0" localhost:5988/root/virt:Xen_AllocationCapabilities.InstanceID="DiskPool/foo" localhost:5988/root/virt:Xen_AllocationCapabilities.InstanceID="NetworkPool/xenbr0" localhost:5988/root/virt:Xen_AllocationCapabilities.InstanceID="NetworkPool/virbr0" But failing qurey of gi AllocationCapabilities: wbemcli gi http://root:password@localhost:5988/root/virt:Xen_AllocationCapabilities.In…"ProcessorPool/0" * * wbemcli: Cim: (1) CIM_ERR_FAILED: A general error occurred that is not covered by a more specific error code: "Could not get ResourceType." * Below is part of Virt_AllocationCapabilities provider's code: static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, const CMPIObjectPath *reference, const char **properties) { return return_alloc_cap(reference, results, 0); } static CMPIStatus EnumInstanceNames(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, const CMPIObjectPath *reference) { return alloc_cap_instances(_BROKER, reference, results, true, NULL); } I think the causing issue it the same as Xen_EnabledLogicalElementCapabilities provider. Thanks! Best, Regards Daisy Guo Lian Yun E-mail: yunguol(a)cn.ibm.com IBM China Development Lab, Shanghai, China TEL: (86)-21-61008057

3 3

[PATCH 0 of 2] #2 - SDC: Fixed type of returned instance and error code
by Heidi Eckhart 14 Dec '07

14 Dec '07

Patch 1: The returned RASD instances have been of the general classname ResourceAllocationSettingData instead of the type specific one, e.g. ProcResourceAllocationSettingData Patch 2: RASD to AllocationCapabilities should return NOT_SUPPORTED instead of OK Diff to #1: patch 1: fixed missing check for unknown resource type

3 7

[PATCH] [CU] Merge do_ref() and do_assoc()
by Heidi Eckhart 14 Dec '07

14 Dec '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1197540659 -3600 # Node ID 0b30c3a70c3aa076d8aac5a6cf63af06413b056c # Parent b5847180d00719ff39f2d451d4e79d4369952ad5 [CU] Merge do_ref() and do_assoc() The two functions do_ref() and do_assoc() run through the same logic. The only difference are the returned instances. By configuring the do_assoc() function with an additional paramter (ref_rslt) to inidcate the type of the returned instance(s) - either reference(names) or associator(names) - the two functions can be merged. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r b5847180d007 -r 0b30c3a70c3a std_association.c --- a/std_association.c Fri Dec 07 17:15:07 2007 -0500 +++ b/std_association.c Thu Dec 13 11:10:59 2007 +0100 @@ -222,108 +222,111 @@ std_assoc_get_handler(const struct std_a return NULL; } +static CMPIStatus prepare_ref_return_list(struct std_assoc *handler, + struct std_assoc_info *info, + const CMPIObjectPath *ref, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + struct inst_list tmp_list; + int i; + + tmp_list = *list; + if (tmp_list.list == NULL) + return s; + + inst_list_init(list); + + for (i = 0; i < tmp_list.cur; i++) { + CMPIInstance *refinst; + + refinst = handler->make_ref(ref, tmp_list.list[i], info, handler); + if (refinst == NULL) + continue; + + inst_list_add(list, refinst); + } + + inst_list_free(&tmp_list); + return s; +} + +static CMPIStatus prepare_assoc_return_list(const CMPIBroker *broker, + struct std_assoc_info *info, + const CMPIObjectPath *ref, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + + if (list->list == NULL) + return s; + + s = filter_results(list, + NAMESPACE(ref), + info->result_class, + broker); + + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("filter_results did not return CMPI_RC_OK."); + return s; + } + + return s; +} + static CMPIStatus do_assoc(struct std_assoc_ctx *ctx, struct std_assoc_info *info, const CMPIResult *results, const CMPIObjectPath *ref, + bool ref_rslt, bool names_only) { CMPIStatus s = {CMPI_RC_OK, NULL}; struct inst_list list; struct std_assoc *handler; - inst_list_init(&list); - - CU_DEBUG("Getting handler..."); + CU_DEBUG("Getting handler ..."); handler = std_assoc_get_handler(ctx, info, ref); if (handler == NULL) { CU_DEBUG("No handler found."); - goto out; + return s; } CU_DEBUG("Getting handler succeeded."); - CU_DEBUG("Calling handler->handler..."); + inst_list_init(&list); + + CU_DEBUG("Calling handler ..."); s = handler->handler(ref, info, &list); - if (s.rc != CMPI_RC_OK) { CU_DEBUG("Handler did not return CMPI_RC_OK."); goto out; - } else { - CU_DEBUG("Handler returned CMPI_RC_OK."); - } - - if (list.list == NULL) { - CU_DEBUG("List is empty."); + } + CU_DEBUG("Handler returned CMPI_RC_OK."); + + /* References and ReferenceNames */ + if (ref_rslt) + s = prepare_ref_return_list(handler, + info, + ref, + &list); + /* Associators and AssociatorNames */ + else + s = prepare_assoc_return_list(ctx->brkr, + info, + ref, + &list); + + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Prepare return list did not return CMPI_RC_OK."); goto out; } - - s = filter_results(&list, - NAMESPACE(ref), - info->result_class, - ctx->brkr); - if (s.rc != CMPI_RC_OK) { - CU_DEBUG("filter_results did not return CMPI_RC_OK."); - goto out; - } - - if (list.list == NULL) { - CU_DEBUG("List is empty."); - goto out; - } else { - CU_DEBUG("Returned %u instance(s).", list.cur); - } + CU_DEBUG("Returned %u instance(s).", list.cur); if (names_only) cu_return_instance_names(results, &list); else cu_return_instances(results, &list); - out: - inst_list_free(&list); - - return s; -} - -static CMPIStatus do_ref(struct std_assoc_ctx *ctx, - struct std_assoc_info *info, - const CMPIResult *results, - const CMPIObjectPath *ref, - bool names_only) -{ - CMPIStatus s = {CMPI_RC_OK, NULL}; - struct inst_list list; - struct std_assoc *handler; - int i; - - inst_list_init(&list); - - CU_DEBUG("Getting handler..."); - handler = std_assoc_get_handler(ctx, info, ref); - if (handler == NULL) { - CU_DEBUG("No handler found."); - goto out; - } - CU_DEBUG("Getting handler succeeded."); - - CU_DEBUG("Calling handler->handler..."); - s = handler->handler(ref, info, &list); - if ((s.rc != CMPI_RC_OK) || (list.list == NULL)) - goto out; - - for (i = 0; i < list.cur; i++) { - CMPIInstance *refinst; - - refinst = handler->make_ref(ref, list.list[i], info, handler); - if (refinst == NULL) - continue; - - if (names_only) - cu_return_instance_name(results, refinst); - else - CMReturnInstance(results, refinst); - } - - CMSetStatus(&s, CMPI_RC_OK); out: inst_list_free(&list); @@ -359,6 +362,7 @@ CMPIStatus stda_AssociatorNames(CMPIAsso &info, results, reference, + false, true); } @@ -386,6 +390,7 @@ CMPIStatus stda_Associators(CMPIAssociat &info, results, reference, + false, false); } @@ -406,7 +411,12 @@ CMPIStatus stda_ReferenceNames(CMPIAssoc self->ft->miName, }; - return do_ref(self->hdl, &info, results, reference, true); + return do_assoc(self->hdl, + &info, + results, + reference, + true, + true); } CMPIStatus stda_References(CMPIAssociationMI *self, @@ -427,7 +437,12 @@ CMPIStatus stda_References(CMPIAssociati self->ft->miName, }; - return do_ref(self->hdl, &info, results, reference, false); + return do_assoc(self->hdl, + &info, + results, + reference, + true, + false); } /*

4 4

Failing query of gi of Xen_VirtualSystemMigrationCapabilities and Xen_VirtualSystemMigrationService in sfcb
by Guo Lian Yun 14 Dec '07

14 Dec '07

Hi, I can get excepted results by ein Xen_VirtualSystemMigrationCapabilities and Xen_VirtualSystemMigrationService in sfcb: wbemcli ein http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationCap… localhost:5988/root/virt:Xen_VirtualSystemMigrationCapabilities.InstanceID="MigrationCapabilities" wbemcli ein http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationSer… localhost:5988/root/virt:Xen_VirtualSystemMigrationService.SystemCreationClassName="",SystemName="",CreationClassName="Xen_VirtualSystemMigrationService",Name="MigrationService" But the query of gi of them are failing as followings: wbemcli gi http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationCap… "MigrationCapabilities" * * wbemcli: Http Exception: server returned nothing (no headers, no data) * wbemcli gi http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationSer… "Xen_VirtualSystemMigrationService",Name="MigrationService",SystemCreationClassName="",SystemName="" * * wbemcli: Cim: (1) CIM_ERR_FAILED: *** Provider Virt_VSMigrationService(17139) exiting due to a SIGSEGV signal * However, whatever ein or gi, the test results are correct in Pegasus, below is the test report: wbemcli ein http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationCap… localhost:5988/root/virt:Xen_VirtualSystemMigrationCapabilities.InstanceID="MigrationCapabilities" wbemcli ein http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigraktionSe… localhost:5988/root/virt:Xen_VirtualSystemMigrationService.CreationClassName="Xen_VirtualSystemMigrationService",Name="MigrationService",SystemCreationClassName="",SystemName="" wbemcli gi http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationCap… "MigrationCapabilities" localhost:5988/root/virt:Xen_VirtualSystemMigrationCapabilities.InstanceID="MigrationCapabilities" Caption,Description,InstanceID="MigrationCapabilities",ElementName,DestinationHostFormatsSupported,SynchronousMethodsSupported,AsynchronousMethodsSupported,CreationClassName="Xen_VirtualSystemMigrationCapabilities" wbemcli gi http://root:password@localhost:5988/root/virt:Xen_VirtualSystemMigrationSer… "Xen_VirtualSystemMigrationService",Name="MigrationService",SystemCreationClassName="",SystemName="" localhost:5988/root/virt:Xen_VirtualSystemMigrationService.CreationClassName="Xen_VirtualSystemMigrationService",Name="MigrationService",SystemCreationClassName="",SystemName="" Caption,Description,ElementName,InstallDate,OperationalStatus,StatusDescriptions,Status,HealthState,PrimaryStatus,DetailedStatus,OperatingStatus,CommunicationStatus,EnabledState=5,OtherEnabledState,RequestedState=12,EnabledDefault=2,TimeOfLastStateChange,AvailableRequestedStates,TransitioningToState=12,SystemCreationClassName,SystemName,CreationClassName="Xen_VirtualSystemMigrationService",Name="MigrationService",PrimaryOwnerName,PrimaryOwnerContact,StartMode,Started Kaitlin said the fix of NULL key value has been in her list. Does the failure related with the NULL value of some keys, then why it can be test successfully on Pegasus? Best, Regards Daisy Guo Lian Yun E-mail: yunguol(a)cn.ibm.com IBM China Development Lab, Shanghai, China TEL: (86)-21-61008057

1 0

[PATCH]
by Kaitlin Rupert 13 Dec '07

13 Dec '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1197410852 28800 # Node ID 8761c7b39ea87feb54f89e41e1a7044104ec9399 # Parent 6c3ca59055416d7bb07716d3a750800e6087878e #2 GetInstance() does not return an instance that matches the instanceID given. Updates - removed boolean and now use a string, get instanceID in GetInstance() call instead. Add a argument to return_ele_cap() that handles the GetInstance(). If this argument is set, get the InstanceID from the ref. In the loop that walks through the domains on the system, check to see if this id matches one of the names returned. If there is a match, create the instance and then exit from the loop. If no match is found, an error is returned. Failing query: wbemcli gi http://localhost:5988/root/virt:Xen_EnabledLogicalElementCapabilities.Insta…"kaitlin_test" localhost:5988/root/virt:Xen_EnabledLogicalElementCapabilities.InstanceID="kaitlin_test" Caption,Description,InstanceID="hd_domain",ElementName,ElementNameEditSupported=FALSE,MaxElementNameLen,RequestedStatesSupported=2,3,9,10,11,ElementNameMask,StateAwareness,CreationClassName="Xen_EnabledLogicalElementCapabilities" Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 6c3ca5905541 -r 8761c7b39ea8 src/Virt_EnabledLogicalElementCapabilities.c --- a/src/Virt_EnabledLogicalElementCapabilities.c Tue Dec 11 09:42:24 2007 -0800 +++ b/src/Virt_EnabledLogicalElementCapabilities.c Tue Dec 11 14:07:32 2007 -0800 @@ -21,6 +21,7 @@ */ #include <stdlib.h> #include <unistd.h> +#include <string.h> #include <cmpidt.h> #include <cmpift.h> @@ -135,7 +136,8 @@ CMPIStatus get_ele_cap(const CMPIBroker static CMPIStatus return_ele_cap(const CMPIObjectPath *ref, const CMPIResult *results, - int names_only) + int names_only, + const char *id) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst = NULL; @@ -162,6 +164,9 @@ static CMPIStatus return_ele_cap(const C goto end; } + if (id && (!STREQ(name, id))) + goto end; + s = get_ele_cap(_BROKER, ref, name, &inst); if (s.rc != CMPI_RC_OK) goto end; @@ -174,7 +179,7 @@ static CMPIStatus return_ele_cap(const C end: virDomainFree(list[i]); - if (s.rc != CMPI_RC_OK) + if ((s.rc != CMPI_RC_OK) || (id && (STREQ(name, id)))) goto out; } @@ -191,7 +196,7 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIResult *results, const CMPIObjectPath *reference) { - return return_ele_cap(reference, results, 1); + return return_ele_cap(reference, results, 1, NULL); } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -201,7 +206,7 @@ static CMPIStatus EnumInstances(CMPIInst const char **properties) { - return return_ele_cap(reference, results, 0); + return return_ele_cap(reference, results, 0, NULL); } static CMPIStatus GetInstance(CMPIInstanceMI *self, @@ -210,7 +215,17 @@ static CMPIStatus GetInstance(CMPIInstan const CMPIObjectPath *reference, const char **properties) { - return return_ele_cap(reference, results, 0); + CMPIStatus s = {CMPI_RC_OK, NULL}; + const char* id; + + if (cu_get_str_path(reference, "InstanceID", &id) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No InstanceID specified"); + return s; + } + + return return_ele_cap(reference, results, 0, id); } DEFAULT_CI();

3 3

[PATCH 0 of 2] SDC: Fixed type of returned instance and error code
by Heidi Eckhart 13 Dec '07

13 Dec '07

Patch 1: The returned RASD instances have been of the general classname ResourceAllocationSettingData instead of the type specific one, e.g. ProcResourceAllocationSettingData Patch 2: RASD to AllocationCapabilities should return NOT_SUPPORTED instead of OK

3 5

[PATCH] [CU] Merge do_ref() and do_assoc()
by Heidi Eckhart 13 Dec '07

13 Dec '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1197367712 -3600 # Node ID 8ef14daa017090e8473e1f958bc5e5e584032398 # Parent b5847180d00719ff39f2d451d4e79d4369952ad5 [CU] Merge do_ref() and do_assoc() The two functions do_ref() and do_assoc() run through the same logic. The only difference are the returned instances. By configuring the do_assoc() function with an additional paramter (ref_rslt) to inidcate the type of the returned instance(s) - either reference(names) or associator(names) - the two functions can be merged. Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r b5847180d007 -r 8ef14daa0170 std_association.c --- a/std_association.c Fri Dec 07 17:15:07 2007 -0500 +++ b/std_association.c Tue Dec 11 11:08:32 2007 +0100 @@ -226,21 +226,23 @@ static CMPIStatus do_assoc(struct std_as struct std_assoc_info *info, const CMPIResult *results, const CMPIObjectPath *ref, + bool ref_rslt, bool names_only) { CMPIStatus s = {CMPI_RC_OK, NULL}; struct inst_list list; struct std_assoc *handler; - - inst_list_init(&list); + int i; CU_DEBUG("Getting handler..."); handler = std_assoc_get_handler(ctx, info, ref); if (handler == NULL) { CU_DEBUG("No handler found."); - goto out; + return s; } CU_DEBUG("Getting handler succeeded."); + + inst_list_init(&list); CU_DEBUG("Calling handler->handler..."); s = handler->handler(ref, info, &list); @@ -257,73 +259,48 @@ static CMPIStatus do_assoc(struct std_as goto out; } - s = filter_results(&list, - NAMESPACE(ref), - info->result_class, - ctx->brkr); - if (s.rc != CMPI_RC_OK) { - CU_DEBUG("filter_results did not return CMPI_RC_OK."); - goto out; - } - - if (list.list == NULL) { - CU_DEBUG("List is empty."); - goto out; - } else { - CU_DEBUG("Returned %u instance(s).", list.cur); - } - - if (names_only) - cu_return_instance_names(results, &list); - else - cu_return_instances(results, &list); - - out: - inst_list_free(&list); - - return s; -} - -static CMPIStatus do_ref(struct std_assoc_ctx *ctx, - struct std_assoc_info *info, - const CMPIResult *results, - const CMPIObjectPath *ref, - bool names_only) -{ - CMPIStatus s = {CMPI_RC_OK, NULL}; - struct inst_list list; - struct std_assoc *handler; - int i; - - inst_list_init(&list); - - CU_DEBUG("Getting handler..."); - handler = std_assoc_get_handler(ctx, info, ref); - if (handler == NULL) { - CU_DEBUG("No handler found."); - goto out; - } - CU_DEBUG("Getting handler succeeded."); - - CU_DEBUG("Calling handler->handler..."); - s = handler->handler(ref, info, &list); - if ((s.rc != CMPI_RC_OK) || (list.list == NULL)) - goto out; - - for (i = 0; i < list.cur; i++) { - CMPIInstance *refinst; - - refinst = handler->make_ref(ref, list.list[i], info, handler); - if (refinst == NULL) - continue; - + /* Associators and AssociatorNames */ + if (!ref_rslt) { + s = filter_results(&list, + NAMESPACE(ref), + info->result_class, + ctx->brkr); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("filter_results did not return CMPI_RC_OK."); + goto out; + } + + if (list.list == NULL) { + CU_DEBUG("List is empty."); + goto out; + } else { + CU_DEBUG("Returned %u instance(s).", list.cur); + } + } + + /* References and ReferenceNames */ + if (ref_rslt) { + for (i = 0; i < list.cur; i++) { + CMPIInstance *refinst; + + refinst = handler->make_ref(ref, list.list[i], info, handler); + if (refinst == NULL) + continue; + + if (names_only) + cu_return_instance_name(results, refinst); + else + CMReturnInstance(results, refinst); + } + } + /* Associators and AssociatorNames */ + else { if (names_only) - cu_return_instance_name(results, refinst); + cu_return_instance_names(results, &list); else - CMReturnInstance(results, refinst); - } - - CMSetStatus(&s, CMPI_RC_OK); + cu_return_instances(results, &list); + } + out: inst_list_free(&list); @@ -359,6 +336,7 @@ CMPIStatus stda_AssociatorNames(CMPIAsso &info, results, reference, + false, true); } @@ -386,6 +364,7 @@ CMPIStatus stda_Associators(CMPIAssociat &info, results, reference, + false, false); } @@ -406,7 +385,12 @@ CMPIStatus stda_ReferenceNames(CMPIAssoc self->ft->miName, }; - return do_ref(self->hdl, &info, results, reference, true); + return do_assoc(self->hdl, + &info, + results, + reference, + true, + true); } CMPIStatus stda_References(CMPIAssociationMI *self, @@ -427,7 +411,12 @@ CMPIStatus stda_References(CMPIAssociati self->ft->miName, }; - return do_ref(self->hdl, &info, results, reference, false); + return do_assoc(self->hdl, + &info, + results, + reference, + true, + false); } /*

3 4

[PATCH] Fix VSMS.RemoveResources() to take references instead of EOs
by Dan Smith 12 Dec '07

12 Dec '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1197487329 28800 # Node ID 59eb8770d96a71707804f26aec48ae76531b005e # Parent b6c16e5a2a347b1e6a6fe314864865a9c6152532 Fix VSMS.RemoveResources() to take references instead of EOs This just adds a filter function that converts the references into instances. It could be more efficient, but I think that allowing all of the resource operations to remain largely identical (as they did before) is worth the small amount of overhead here. Also added REF2STR() macro to misc_util.h. I do this a lot, mostly while testing, but it seems valid to have such a macro so we can start printing out more useful error messages with ease. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r b6c16e5a2a34 -r 59eb8770d96a libxkutil/misc_util.h --- a/libxkutil/misc_util.h Wed Dec 12 09:42:09 2007 -0800 +++ b/libxkutil/misc_util.h Wed Dec 12 11:22:09 2007 -0800 @@ -129,6 +129,8 @@ CMPIInstance *make_reference(const CMPIB assoc); \ } +#define REF2STR(r) CMGetCharPtr(CMObjectPathToString(r, NULL)) + /* * Local Variables: * mode: C diff -r b6c16e5a2a34 -r 59eb8770d96a src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Dec 12 09:42:09 2007 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Wed Dec 12 11:22:09 2007 -0800 @@ -947,6 +947,59 @@ static CMPIStatus update_resource_settin return s; } +static CMPIStatus rasd_refs_to_insts(const CMPIContext *ctx, + const CMPIObjectPath *reference, + CMPIArray *arr, + struct inst_list *list) +{ + CMPIStatus s; + int i; + int c; + + c = CMGetArrayCount(arr, &s); + if (s.rc != CMPI_RC_OK) + return s; + + for (i = 0; i < c; i++) { + CMPIData d; + CMPIObjectPath *ref; + CMPIInstance *inst; + const char *id; + uint16_t type; + + d = CMGetArrayElementAt(arr, i, &s); + ref = d.value.ref; + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Unable to get ResourceSettings[%i]", i); + continue; + } + + if (cu_get_str_path(ref, "InstanceID", &id) != CMPI_RC_OK) { + CU_DEBUG("Unable to get InstanceID of `%s'", + REF2STR(ref)); + continue; + } + + if (rasd_type_from_classname(CLASSNAME(ref), &type) != + CMPI_RC_OK) { + CU_DEBUG("Unable to get type of `%s'", + REF2STR(ref)); + continue; + } + + inst = get_rasd_instance(ctx, reference, _BROKER, id, type); + if (inst != NULL) + inst_list_add(list, inst); + else + CU_DEBUG("Failed to get instance for `%s'", + REF2STR(ref)); + } + + CMSetStatus(&s, CMPI_RC_OK); + + return s; +} + static CMPIStatus add_resource_settings(CMPIMethodMI *self, const CMPIContext *context, const CMPIResult *results, @@ -974,7 +1027,32 @@ static CMPIStatus rm_resource_settings(C const CMPIArgs *argsin, CMPIArgs *argsout) { - return update_resource_settings(reference, argsin, resource_del); + /* The RemoveResources case is different from either Add or + * Modify, because it takes references instead of instances + */ + + CMPIArray *arr; + CMPIStatus s; + struct inst_list list; + + inst_list_init(&list); + + if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceSettings"); + goto out; + } + + s = rasd_refs_to_insts(context, reference, arr, &list); + if (s.rc != CMPI_RC_OK) + goto out; + + s = _update_resource_settings(reference, &list, resource_del); + out: + inst_list_free(&list); + + return s; } static struct method_handler DefineSystem = { @@ -1023,7 +1101,7 @@ static struct method_handler RemoveResou static struct method_handler RemoveResourceSettings = { .name = "RemoveResourceSettings", .handler = rm_resource_settings, - .args = {{"ResourceSettings", CMPI_stringA}, + .args = {{"ResourceSettings", CMPI_refA}, ARG_END } };

3 2