[PATCH 0 of 3] #2 - Complete list of implemented DMTF's Profiles and add ReferencedProfile association
This patch set - RegisteredProfile lists now all by this provider package implemented DMTF Profiles - add association ReferencedProfile for conformance to Profile Registration Profile (this association shows the relations between the different profiles) - fix ECTP seg fault caused by changes in profile.h Diff to patch set 1: - reoragnized prof_to_prof() into smaller functions
# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1205488997 -3600 # Node ID be69ef2880db3d8410f5db7acb39587a26bfdd9d # Parent 59f38ff0007af1489c4946672f6caa5b5fe196ce RegisteredProfile: add instances for each implemented profile The following DMTF Profiles are implemented by the libvirt-cim provider package: - DSP1042 System Virtualization 1.0.0 - DSP1045 Memory Resource Virtualization 1.0.0 - DSP1057 Virtual System 1.0.0 - DSP1059 Generic Device Resource Virtualization 1.0.0 - DSP1081 Virtual System Migration 0.8.1 Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 59f38ff0007a -r be69ef2880db src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Fri Mar 14 11:03:15 2008 +0100 +++ b/src/Virt_ElementConformsToProfile.c Fri Mar 14 11:03:17 2008 +0100 @@ -58,6 +58,9 @@ static CMPIStatus elem_instances(const C CMPIEnumeration *en = NULL; CMPIData data ; char *classname; + + if (profile->scoping_class == NULL) + return s; classname = get_typed_class(pfx_from_conn(conn), profile->scoping_class); diff -r 59f38ff0007a -r be69ef2880db src/profiles.h --- a/src/profiles.h Fri Mar 14 11:03:15 2008 +0100 +++ b/src/profiles.h Fri Mar 14 11:03:17 2008 +0100 @@ -32,6 +32,16 @@ struct reg_prof { char *other_reg_org; char *ad_type_descriptions; char *scoping_class; + struct reg_prof *scoping_profile; +}; + +struct reg_prof VirtualSystem = { + .reg_org = 2, + .reg_id = "CIM:DSP1057-VirtualSystem-1.0.0a", + .reg_name = "Virtual System Profile", + .reg_version = "1.0.0a", + .scoping_class = "ComputerSystem", + .scoping_profile = NULL }; struct reg_prof SystemVirtualization = { @@ -39,22 +49,44 @@ struct reg_prof SystemVirtualization = { .reg_id = "CIM:DSP1042-SystemVirtualization-1.0.0", .reg_name = "System Virtualization", .reg_version = "1.0.0", - .scoping_class = "HostSystem" + .scoping_class = "HostSystem", + .scoping_profile = &VirtualSystem }; -struct reg_prof VirtualSystem = { +struct reg_prof GenericDeviceResourceVirtualization = { .reg_org = 2, - .reg_id = "CIM:DSP1057-VirtualSystem-1.0.0a", - .reg_name = "Virtual System Profile", - .reg_version = "1.0.0a", - .scoping_class = "ComputerSystem" + .reg_id = "CIM:DSP1059-GenericDeviceResourceVirtualization-1.0.0", + .reg_name = "Generic Device Resource Virtualization", + .reg_version = "1.0.0", + .scoping_class = NULL, + .scoping_profile = &SystemVirtualization }; +struct reg_prof MemoryResourceVirtualization = { + .reg_org = 2, + .reg_id = "CIM:DSP1045-MemoryResourceVirtualization-1.0.0", + .reg_name = "Memory Resource Virtualization", + .reg_version = "1.0.0", + .scoping_class = NULL, + .scoping_profile = &SystemVirtualization +}; + +struct reg_prof VirtualSystemMigration = { + .reg_org = 2, + .reg_id = "CIM:DSP1081-VirtualSystemMigration-1.0", + .reg_name = "Virtual System Migration", + .reg_version = "1.0", + .scoping_class = NULL, + .scoping_profile = &SystemVirtualization +}; // Make sure to add pointer to your reg_prof struct here. struct reg_prof *profiles[] = { &SystemVirtualization, &VirtualSystem, + &GenericDeviceResourceVirtualization, + &MemoryResourceVirtualization, + &VirtualSystemMigration, NULL };
# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1205489059 -3600 # Node ID c999b77057ddaf774c3519f0d4ccca892f32af57 # Parent be69ef2880db3d8410f5db7acb39587a26bfdd9d Add association ReferencedProfile for conformance to DMTF's Profile Registration Profile Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r be69ef2880db -r c999b77057dd Makefile.am --- a/Makefile.am Fri Mar 14 11:03:17 2008 +0100 +++ b/Makefile.am Fri Mar 14 11:04:19 2008 +0100 @@ -45,7 +45,8 @@ INTEROP_MOFS = \ schema/ComputerSystem.mof \ schema/HostSystem.mof \ schema/RegisteredProfile.mof \ - schema/ElementConformsToProfile.mof + schema/ElementConformsToProfile.mof \ + schema/ReferencedProfile.mof REGS = \ @@ -89,7 +90,8 @@ REGS = \ INTEROP_REGS = \ schema/RegisteredProfile.registration \ - schema/ElementConformsToProfile.registration + schema/ElementConformsToProfile.registration \ + schema/ReferencedProfile.registration pkgdata_DATA = $(MOFS) $(REGS) pkgdata_SCRIPTS = provider-register.sh diff -r be69ef2880db -r c999b77057dd schema/ReferencedProfile.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ReferencedProfile.mof Fri Mar 14 11:04:19 2008 +0100 @@ -0,0 +1,34 @@ +// Copyright IBM Corp. 2008 + +[Association, + Description ( + "Associates a RegisteredProfile with its scoping RegisteredProfile."), + Provider("cmpi::Virt_ReferencedProfile") +] +class Xen_ReferencedProfile : CIM_ReferencedProfile +{ + + [Override ("Antecedent")] + Xen_RegisteredProfile REF Antecedent; + + [Override ("Dependent")] + Xen_RegisteredProfile REF Dependent; + +}; + +[Association, + Description ( + "Associates a RegisteredProfile with its scoping RegisteredProfile."), + Provider("cmpi::Virt_ReferencedProfile") +] +class KVM_ReferencedProfile : CIM_ReferencedProfile +{ + + [Override ("Antecedent")] + KVM_RegisteredProfile REF Antecedent; + + [Override ("Dependent")] + KVM_RegisteredProfile REF Dependent; + +}; + diff -r be69ef2880db -r c999b77057dd schema/ReferencedProfile.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ReferencedProfile.registration Fri Mar 14 11:04:19 2008 +0100 @@ -0,0 +1,4 @@ +# Copyright IBM Corp. 2008 +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_ReferencedProfile root/interop Virt_ReferencedProfile Virt_ReferencedProfile association +KVM_ReferencedProfile root/interop Virt_ReferencedProfile Virt_ReferencedProfile association diff -r be69ef2880db -r c999b77057dd src/Makefile.am --- a/src/Makefile.am Fri Mar 14 11:03:17 2008 +0100 +++ b/src/Makefile.am Fri Mar 14 11:04:19 2008 +0100 @@ -46,6 +46,7 @@ provider_LTLIBRARIES = libVirt_ComputerS libVirt_HostedDependency.la \ libVirt_RegisteredProfile.la \ libVirt_ElementConformsToProfile.la \ + libVirt_ReferencedProfile.la \ libVirt_SettingsDefineCapabilities.la \ libVirt_HostedResourcePool.la \ libVirt_ElementCapabilities.la \ @@ -98,6 +99,10 @@ libVirt_ElementConformsToProfile_la_DEPE libVirt_ElementConformsToProfile_la_DEPENDENCIES = libVirt_RegisteredProfile.la libVirt_ElementConformsToProfile_la_SOURCES = Virt_ElementConformsToProfile.c libVirt_ElementConformsToProfile_la_LIBADD = -lVirt_RegisteredProfile + +libVirt_ReferencedProfile_la_DEPENDENCIES = libVirt_RegisteredProfile.la +libVirt_ReferencedProfile_la_SOURCES = Virt_ReferencedProfile.c +libVirt_ReferencedProfile_la_LIBADD = -lVirt_RegisteredProfile libVirt_EnabledLogicalElementCapabilities_la_SOURCES = Virt_EnabledLogicalElementCapabilities.c diff -r be69ef2880db -r c999b77057dd src/Virt_ReferencedProfile.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Virt_ReferencedProfile.c Fri Mar 14 11:04:19 2008 +0100 @@ -0,0 +1,271 @@ +/* + * Copyright IBM Corp. 2008 + * + * Authors: + * Heidi Eckhart <heidieck@linux.vnet.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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 + */ +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <stdbool.h> + +#include "cmpidt.h" +#include "cmpift.h" +#include "cmpimacs.h" + +#include <libcmpiutil/libcmpiutil.h> +#include "misc_util.h" +#include "profiles.h" +#include <libcmpiutil/std_association.h> + +#include "config.h" + +#include "Virt_RegisteredProfile.h" + +const static CMPIBroker *_BROKER; + +static struct reg_prof *get_reg_prof_by_ref(const CMPIObjectPath *ref) +{ + const char* name; + int i; + + if (cu_get_str_path(ref, "InstanceID", &name) != CMPI_RC_OK) + return NULL; + + for (i = 0; profiles[i] != NULL; i++) { + if(STREQ(name, profiles[i]->reg_id)) + return profiles[i]; + } + + return NULL; +} + +static CMPIStatus get_scoping_prof_by_source(const CMPIObjectPath *ref, + struct std_assoc_info *info, + virConnectPtr conn, + struct reg_prof *source, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst = NULL; + + if (source->scoping_profile != NULL) { + s = get_profile(_BROKER, + ref, + info->properties, + pfx_from_conn(conn), + source->scoping_profile, + &inst); + if (s.rc != CMPI_RC_OK) + goto out; + inst_list_add(list, inst); + } + + out: + return s; +} + +static CMPIStatus get_scoping_prof_by_list(const CMPIObjectPath *ref, + struct std_assoc_info *info, + virConnectPtr conn, + struct reg_prof *source, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst = NULL; + struct reg_prof *scope; + int i; + + for (i = 0; profiles[i] != NULL; i++) { + if (profiles[i]->scoping_profile == NULL) + continue; + + scope = profiles[i]->scoping_profile; + if (!STREQC(scope->reg_id, source->reg_id)) + continue; + + s = get_profile(_BROKER, + ref, + info->properties, + pfx_from_conn(conn), + profiles[i], + &inst); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(list, inst); + } + + out: + return s; +} + +static CMPIStatus enum_reg_prof_by_source(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct reg_prof *source, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + virConnectPtr conn = NULL; + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + if (conn == NULL) + goto out; + + s = get_scoping_prof_by_source(ref, info, conn, source, list); + if (s.rc != CMPI_RC_OK) + goto out; + + s = get_scoping_prof_by_list(ref, info, conn, source, list); + if (s.rc != CMPI_RC_OK) + goto out; + + out: + virConnectClose(conn); + + return s; +} + +static CMPIStatus prof_to_prof(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst = NULL; + struct reg_prof *source; + + if (!match_hypervisor_prefix(ref, info)) + goto out; + + s = get_profile_by_ref(_BROKER, ref, info->properties, &inst); + if (s.rc != CMPI_RC_OK) + goto out; + + source = get_reg_prof_by_ref(ref); + if (source == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Can't find RegisteredProfile instance"); + goto out; + } + + s = enum_reg_prof_by_source(ref, info, source, list); + + out: + return s; +} + +static CMPIInstance *make_ref(const CMPIObjectPath *source_ref, + const CMPIInstance *target_inst, + struct std_assoc_info *info, + struct std_assoc *assoc); + +static char* registered_profile[] = { + "Xen_RegisteredProfile", + "KVM_RegisteredProfile", + NULL +}; + +static char* assoc_classname[] = { + "Xen_ReferencedProfile", + "KVM_ReferencedProfile", + NULL +}; + +static struct std_assoc forward = { + .source_class = (char**)®istered_profile, + .source_prop = "Antecedent", + + .target_class = (char**)®istered_profile, + .target_prop = "Dependent", + + .assoc_class = (char**)&assoc_classname, + + .handler = prof_to_prof, + .make_ref = make_ref +}; + +static struct std_assoc backward = { + .source_class = (char**)®istered_profile, + .source_prop = "Dependent", + + .target_class = (char**)®istered_profile, + .target_prop = "Antecedent", + + .assoc_class = (char**)&assoc_classname, + + .handler = prof_to_prof, + .make_ref = make_ref +}; + +static struct std_assoc *assoc_handlers[] = { + &forward, + &backward, + NULL +}; + +static CMPIInstance *make_ref(const CMPIObjectPath *source_ref, + const CMPIInstance *target_inst, + struct std_assoc_info *info, + struct std_assoc *assoc) +{ + CMPIInstance *ref_inst = NULL; + struct std_assoc *ref_assoc = NULL; + struct reg_prof *source; + char* assoc_classname; + + assoc_classname = class_base_name(assoc->assoc_class[0]); + + ref_inst = get_typed_instance(_BROKER, + CLASSNAME(source_ref), + assoc_classname, + NAMESPACE(source_ref)); + + source = get_reg_prof_by_ref(source_ref); + if (source->scoping_profile != NULL) + ref_assoc = &backward; + else + ref_assoc = assoc; + + if (ref_inst != NULL) { + CMPIObjectPath *target_ref; + + target_ref = CMGetObjectPath(target_inst, NULL); + + set_reference(ref_assoc, ref_inst, + source_ref, target_ref); + } + + free(assoc_classname); + + return ref_inst; +} + +STDA_AssocMIStub(, + Virt_ReferencedProfile, + _BROKER, + libvirt_cim_init(), + assoc_handlers); +/* + * Local Variables: + * mode: C + * c-set-style: "K&R" + * tab-width: 8 + * c-basic-offset: 8 + * indent-tabs-mode: nil + * End: + */
# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1205489076 -3600 # Node ID 02c3b6c131b678f1bf68cb92b533794ae1dc9940 # Parent c999b77057ddaf774c3519f0d4ccca892f32af57 ECTP: adopt the changes made to profile.h Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r c999b77057dd -r 02c3b6c131b6 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Fri Mar 14 11:04:19 2008 +0100 +++ b/src/Virt_ElementConformsToProfile.c Fri Mar 14 11:04:36 2008 +0100 @@ -180,6 +180,9 @@ static CMPIStatus elem_to_prof(const CMP } for (i = 0; profiles[i] != NULL; i++) { + if (profiles[i]->scoping_class == NULL) + continue; + if (!STREQC(profiles[i]->scoping_class, classname)) continue;
participants (1)
-
Heidi Eckhart