# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1194471308 28800 # Node ID 5959f8f0e5e87540fb7da0bc5a0365388112452b # Parent 404c4803b1b542676c4d283226a7cc3b7f3ab58d Add association results filtering. This adds result filtering so that an association only returns instances that match the result class specified during the query. Such an example is the following: HostedService needs to return VSMS and RPCS instances when queried using CIM_ManagedElement as the result class. However, if CIM_VSMS is specified as the result class, then only the VSMS instance needs to be returned. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 404c4803b1b5 -r 5959f8f0e5e8 std_association.c --- a/std_association.c Fri Nov 02 15:29:38 2007 -0700 +++ b/std_association.c Wed Nov 07 13:35:08 2007 -0800 @@ -47,6 +47,17 @@ void set_reference(struct std_assoc *ass (CMPIValue *)&target, CMPI_ref); } +static bool match_op(const CMPIBroker *broker, + CMPIObjectPath *op, + const char *filter_class) +{ + if ((filter_class == NULL) || + CMClassPathIsA(broker, op, filter_class, NULL)) + return true; + else + return false; +} + static bool match_class(const CMPIBroker *broker, const char *ns, const char *test_class, @@ -58,10 +69,55 @@ static bool match_class(const CMPIBroker if ((test_class == NULL) || (comp_class == NULL) || - CMClassPathIsA(broker, rop, comp_class, NULL)) + match_op(broker, rop, comp_class)) return true; else return false; +} + +static CMPIStatus filter_results(struct inst_list *list, + char *ns, + const char *filter_class, + const CMPIBroker *broker) +{ + struct inst_list result_list; + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIObjectPath *op; + int i, c = 0; + + inst_list_init(&result_list); + + for (i = 0; list->list[i] != NULL; i++) { + op = CMGetObjectPath(list->list[i], &s); + if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) + goto out; + + s = CMSetNameSpace(op, ns); + if (s.rc != CMPI_RC_OK) + goto out; + + if (!match_op(broker, op, filter_class)) + continue; + + inst_list_add(&result_list, list->list[i]); + c++; + } + + inst_list_free(list); + if (list->list != NULL) { + CU_DEBUG("\tinst_list_free failed.\n"); + goto out; + } + + inst_list_init(list); + + for (i = 0; i <= c; i++) + inst_list_add(list, result_list.list[i]); + +out: + inst_list_free(&result_list); + + return s; } static struct std_assoc * @@ -142,6 +198,20 @@ static CMPIStatus do_assoc(struct std_as goto out; } else { CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); + } + + if (list.list == NULL) { + CU_DEBUG("\tlist is empty.\n"); + goto out; + } + + s = filter_results(&list, + NAMESPACE(ref), + info->result_class, + ctx->brkr); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n"); + goto out; } if (list.list == NULL) {