# HG changeset patch # User Richard Maciel <richardm@br.ibm.com> # Date 1228248506 7200 # Node ID daacf07ad46fa18c1da8e53d2ea815c9be552557 # Parent 7d757914e6a767e968d32b74189b9428a0c39b84 Added ServiceAccessBySAP association (ConsoleRedirectionService <-> KVMRedirectionSAP) * Created mof and registration files * Changed Makefile to use newly created files Changes for submission #2 * Removed registration for CIMV2 in ServiceAccessBySAP.registration file Signed-off-by: Richard Maciel <richardm@br.ibm.com> diff -r 7d757914e6a7 -r daacf07ad46f Makefile.am --- a/Makefile.am Thu Dec 04 18:55:55 2008 -0200 +++ b/Makefile.am Tue Dec 02 18:08:26 2008 -0200 @@ -52,7 +52,8 @@ schema/PointingDevice.mof \ schema/GraphicsPool.mof \ schema/InputPool.mof \ - schema/HostedAccessPoint.mof + schema/HostedAccessPoint.mof \ + schema/ServiceAccessBySAP.mof INTEROP_MOFS = \ schema/ComputerSystem.mof \ @@ -123,7 +124,8 @@ schema/PointingDevice.registration \ schema/GraphicsPool.registration \ schema/InputPool.registration \ - schema/HostedAccessPoint.registration + schema/HostedAccessPoint.registration \ + schema/ServiceAccessBySAP.registration INTEROP_REGS = \ schema/RegisteredProfile.registration \ diff -r 7d757914e6a7 -r daacf07ad46f schema/ServiceAccessBySAP.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ServiceAccessBySAP.mof Tue Dec 02 18:08:26 2008 -0200 @@ -0,0 +1,22 @@ +// Copyright IBM Corp. 2007 + +[Association, + Provider("cmpi::Virt_ServiceAccessBySAP") +] +class Xen_ServiceAccessBySAP : CIM_ServiceAccessBySAP +{ +}; + +[Association, + Provider("cmpi::Virt_ServiceAccessBySAP") +] +class KVM_ServiceAccessBySAP : CIM_ServiceAccessBySAP +{ +}; + +[Association, + Provider("cmpi::Virt_ServiceAccessBySAP") +] +class LXC_ServiceAccessBySAP : CIM_ServiceAccessBySAP +{ +}; diff -r 7d757914e6a7 -r daacf07ad46f schema/ServiceAccessBySAP.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ServiceAccessBySAP.registration Tue Dec 02 18:08:26 2008 -0200 @@ -0,0 +1,6 @@ +# Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_ServiceAccessBySAP root/virt Virt_ServiceAccessBySAP Virt_ServiceAccessBySAP association +KVM_ServiceAccessBySAP root/virt Virt_ServiceAccessBySAP Virt_ServiceAccessBySAP association +LXC_ServiceAccessBySAP root/virt Virt_ServiceAccessBySAP Virt_ServiceAccessBySAP association +

# HG changeset patch # User Richard Maciel <richardm@br.ibm.com> # Date 1228248422 7200 # Node ID c4e26635e6f0f5ec9f11ee53119b4fb33fe7d8ab # Parent daacf07ad46fa18c1da8e53d2ea815c9be552557 Added ServiceAccessBySAP association (ConsoleRedirectionService <-> KVMRedirectionSAP) * Created Virt_ServiceAccessBySAP.c file * Changed src/Makefile.am Changes for submission #2 Removed un-needed checks from the handlers of the ServiceAccessBySAP.c file Signed-off-by: Richard Maciel <richardm@br.ibm.com> diff -r daacf07ad46f -r c4e26635e6f0 src/Makefile.am --- a/src/Makefile.am Tue Dec 02 18:08:26 2008 -0200 +++ b/src/Makefile.am Tue Dec 02 18:07:02 2008 -0200 @@ -73,7 +73,8 @@ libVirt_ElementSettingData.la \ libVirt_ConcreteComponent.la \ libVirt_ServiceAffectsElement.la \ - libVirt_HostedAccessPoint.la + libVirt_HostedAccessPoint.la \ + libVirt_ServiceAccessBySAP.la libVirt_ComputerSystem_la_SOURCES = Virt_ComputerSystem.c libVirt_ComputerSystem_la_DEPENDENCIES = libVirt_VirtualSystemSnapshotService.la @@ -217,6 +218,10 @@ libVirt_KVMRedirectionSAP_la_SOURCES = Virt_KVMRedirectionSAP.c +libVirt_ServiceAccessBySAP_la_DEPENDENCIES = libVirt_ConsoleRedirectionService.la libVirt_KVMRedirectionSAP.la +libVirt_ServiceAccessBySAP_la_SOURCES = Virt_ServiceAccessBySAP.c +libVirt_ServiceAccessBySAP_la_LIBADD = -lVirt_ConsoleRedirectionService -lVirt_KVMRedirectionSAP + libVirt_HostedAccessPoint_la_DEPENDENCIES = libVirt_HostSystem.la libVirt_KVMRedirectionSAP.la libVirt_HostedAccessPoint_la_SOURCES = Virt_HostedAccessPoint.c libVirt_HostedAccessPoint_la_LIBADD = -lVirt_HostSystem -lVirt_KVMRedirectionSAP diff -r daacf07ad46f -r c4e26635e6f0 src/Virt_ServiceAccessBySAP.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Virt_ServiceAccessBySAP.c Tue Dec 02 18:07:02 2008 -0200 @@ -0,0 +1,158 @@ +/* + * Copyright IBM Corp. 2007 + * + * Authors: + * Richard Maciel <richardm@br.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 <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <cmpidt.h> +#include <cmpift.h> +#include <cmpimacs.h> + +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_association.h> +#include "misc_util.h" + +#include "Virt_ConsoleRedirectionService.h" +#include "Virt_KVMRedirectionSAP.h" + +const static CMPIBroker *_BROKER; + + +static CMPIStatus service_to_rsap(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *instance = NULL; + char* classname; + + if (!match_hypervisor_prefix(ref, info)) + goto out; + + classname = class_base_name(CLASSNAME(ref)); + + if (!STREQC(classname, "ConsoleRedirectionService")) + goto out; + + s = get_console_rs(ref, &instance, _BROKER, info->context, true); + if (s.rc != CMPI_RC_OK) + goto out; + + s = enum_console_sap(_BROKER, ref, list); + + out: + return s; +} + +static CMPIStatus rsap_to_service(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *instance = NULL; + + if (!match_hypervisor_prefix(ref, info)) + goto out; + + s = get_console_sap_by_ref(_BROKER, ref, &instance); + if (s.rc != CMPI_RC_OK) + goto out; + + s = get_console_rs(ref, &instance, _BROKER, info->context, false); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(list, instance); + + out: + return s; +} + +LIBVIRT_CIM_DEFAULT_MAKEREF() + +static char* antecedent[] = { + "Xen_ConsoleRedirectionService", + "KVM_ConsoleRedirectionService", + "LXC_ConsoleRedirectionService", + NULL +}; + +static char* dependent[] = { + "Xen_KVMRedirectionSAP", + "KVM_KVMRedirectionSAP", + "LXC_KVMRedirectionSAP", + NULL +}; + +static char* assoc_classname[] = { + "Xen_ServiceAccessBySAP", + "KVM_ServiceAccessBySAP", + "LXC_ServiceAccessBySAP", + NULL +}; + +static struct std_assoc _service_to_rsap = { + .source_class = (char**)&antecedent, + .source_prop = "Antecedent", + + .target_class = (char**)&dependent, + .target_prop = "Dependent", + + .assoc_class = (char**)&assoc_classname, + + .handler = service_to_rsap, + .make_ref = make_ref +}; + +static struct std_assoc _rsap_to_service = { + .source_class = (char**)&dependent, + .source_prop = "Dependent", + + .target_class = (char**)&antecedent, + .target_prop = "Antecedent", + + .assoc_class = (char**)&assoc_classname, + + .handler = rsap_to_service, + .make_ref = make_ref +}; + +static struct std_assoc *handlers[] = { + &_service_to_rsap, + &_rsap_to_service, + NULL +}; + +STDA_AssocMIStub(, + Virt_ServiceAccessBySAP, + _BROKER, + libvirt_cim_init(), + handlers); + +/* + * Local Variables: + * mode: C + * c-set-style: "K&R" + * tab-width: 8 + * c-basic-offset: 8 + * indent-tabs-mode: nil + * End: + */