ref: refs/heads/master commit ee2e26de36c6b966eb9e47ac4451e1da8cde7254 Author: Michael Calmer Date: Mon Feb 2 16:24:53 2009 +0100 Implement SUSE_ElementCapabilities --- mof/CMakeLists.txt | 2 + mof/SUSE_ElementCapabilities.mof | 30 +++++ mof/SUSE_ElementCapabilities.sfcb.reg | 5 + mof/deploy.mof | 2 +- src/CMakeLists.txt | 2 + src/SUSE_ElementCapabilitiesProvider.cc | 207 +++++++++++++++++++++++++++++++ src/SUSE_ElementCapabilitiesProvider.h | 43 +++++++ 7 files changed, 290 insertions(+), 1 deletions(-) diff --git a/mof/CMakeLists.txt b/mof/CMakeLists.txt index 2343679..1d67a2d 100644 --- a/mof/CMakeLists.txt +++ b/mof/CMakeLists.txt @@ -16,6 +16,8 @@ INSTALL( FILES SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg SUSE_SoftwareInstallationServiceCapabilities.mof SUSE_SoftwareInstallationServiceCapabilities.sfcb.reg + SUSE_ElementCapabilities.mof + SUSE_ElementCapabilities.sfcb.reg deploy.mof DESTINATION ${CMPIZYPP_DATA_DIR}/ ) diff --git a/mof/SUSE_ElementCapabilities.mof b/mof/SUSE_ElementCapabilities.mof new file mode 100644 index 0000000..93a191a --- /dev/null +++ b/mof/SUSE_ElementCapabilities.mof @@ -0,0 +1,30 @@ +//#pragma namespace ("root/cimv2") + + +// ------------------------------------------------------------------- +// ******************************************************************* +// Classes +// ******************************************************************* +// ------------------------------------------------------------------- + + + +// =================================================================== +// SUSE_ElementCapabilities +// =================================================================== + +[ Provider("cmpi:cmpi-zypp"), + Description ("Association between SoftwareInstallationService and its capabilities") +] +class SUSE_ElementCapabilities : CIM_ElementCapabilities +{ + [Override ( "ManagedElement" ), + Description ( "Overwrite a CIM_ManagedElement." )] + SUSE_SoftwareInstallationService REF ManagedElement; + + [Override ( "Capabilities" ), + Description ( "Overwrite a CIM_Capabilities." )] + SUSE_SoftwareInstallationServiceCapabilities REF Capabilities; +}; + + diff --git a/mof/SUSE_ElementCapabilities.sfcb.reg b/mof/SUSE_ElementCapabilities.sfcb.reg new file mode 100644 index 0000000..e188167 --- /dev/null +++ b/mof/SUSE_ElementCapabilities.sfcb.reg @@ -0,0 +1,5 @@ +[SUSE_ElementCapabilities] + provider: SUSE_ElementCapabilitiesProvider + location: cmpi-zypp + type: instance association + namespace: root/cimv2 diff --git a/mof/deploy.mof b/mof/deploy.mof index 0773b35..a2c80de 100644 --- a/mof/deploy.mof +++ b/mof/deploy.mof @@ -7,4 +7,4 @@ #pragma include ("SUSE_SoftwareInstallationService.mof") #pragma include ("SUSE_InstallationServiceAffectsSoftwareIdentity.mof") #pragma include ("SUSE_SoftwareInstallationServiceCapabilities.mof") - +#pragma include ("SUSE_ElementCapabilities.mof") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7f99497..5c4ca1e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,7 @@ SET( CMPIZYPP_SRCS SUSE_SoftwareInstallationServiceProvider.cc SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc SUSE_SoftwareInstallationServiceCapabilitiesProvider.cc + SUSE_ElementCapabilitiesProvider.cc ) SET( CMPIZYPP_HEADERS SUSE_Common.h @@ -30,6 +31,7 @@ SET( CMPIZYPP_HEADERS SUSE_SoftwareInstallationServiceProvider.h SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h SUSE_SoftwareInstallationServiceCapabilitiesProvider.h + SUSE_ElementCapabilitiesProvider.h ) ADD_LIBRARY(cmpi-zypp SHARED ${CMPIZYPP_SRCS}) diff --git a/src/SUSE_ElementCapabilitiesProvider.cc b/src/SUSE_ElementCapabilitiesProvider.cc new file mode 100644 index 0000000..e3ab64a --- /dev/null +++ b/src/SUSE_ElementCapabilitiesProvider.cc @@ -0,0 +1,207 @@ + +#include <iostream> + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "SUSE_zypp.h" +#include "SUSE_Common.h" +#include "SUSE_ElementCapabilitiesProvider.h" + +using namespace zypp; +using std::endl; + +namespace cmpizypp +{ + namespace + { + const char * _ClassName = "SUSE_ElementCapabilities"; + const char * _RefLeft = "ManagedElement"; + const char * _RefRight = "Capabilities"; + const char * _RefLeftClass = "SUSE_SoftwareInstallationService"; + const char * _RefRightClass = "SUSE_SoftwareInstallationServiceCapabilities"; + + } // namespace + + SUSE_ElementCapabilitiesProviderClass::SUSE_ElementCapabilitiesProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ) + : CmpiBaseMI( mbp, ctx ) + , CmpiInstanceMI( mbp, ctx ) + , CmpiAssociationMI( mbp, ctx ) + { + } + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() called",_ClassName)); + + bool ret = assoc_create_refs_1toN( *broker, ctx, rslt, cop, + _ClassName,_RefLeft,_RefRight, + _RefLeftClass,_RefRightClass,0,0); + if(!ret) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstanceNames failed." ); + return st; + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() called",_ClassName)); + + bool ret = assoc_create_refs_1toN( *broker, ctx, rslt, cop, + _ClassName,_RefLeft,_RefRight, + _RefLeftClass,_RefRightClass,1,0); + if(!ret) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstances failed." ); + return st; + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() called",_ClassName)); + + CmpiInstance ci = assoc_get_inst( *broker, ctx, cop, _ClassName, _RefLeft, _RefRight); + + rslt.returnData( ci ); + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::associators( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI associators() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !assocClass || op.classPathIsA( assocClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + resultClass, role, resultRole ) ) + { + if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1 ) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI associators() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::associatorNames( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI associatorNames() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !assocClass || op.classPathIsA( assocClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + resultClass, role, resultRole ) ) + { + if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1 ) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI associatorNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::references( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role, + const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI references() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !resultClass || op.classPathIsA( resultClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) + { + if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0 ) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI references() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_ElementCapabilitiesProviderClass::referenceNames( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI referenceNames() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !resultClass || op.classPathIsA( resultClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) + { + if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0 ) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI referenceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + +} // namespace cmpizypp + +CMProviderBase( SUSE_ElementCapabilitiesProvider ); + +CMInstanceMIFactory( cmpizypp::SUSE_ElementCapabilitiesProviderClass, SUSE_ElementCapabilitiesProvider ); +CMAssociationMIFactory( cmpizypp::SUSE_ElementCapabilitiesProviderClass, SUSE_ElementCapabilitiesProvider ); diff --git a/src/SUSE_ElementCapabilitiesProvider.h b/src/SUSE_ElementCapabilitiesProvider.h new file mode 100644 index 0000000..6da3740 --- /dev/null +++ b/src/SUSE_ElementCapabilitiesProvider.h @@ -0,0 +1,43 @@ +#ifndef SUSE_ELEMENTCAPABILITIESPROVIDERCLASS_H +#define SUSE_ELEMENTCAPABILITIESPROVIDERCLASS_H + +#include +#include + +#include "SUSE_AssocFilter.h" + +namespace cmpizypp +{ + /** + */ + class SUSE_ElementCapabilitiesProviderClass : public CmpiInstanceMI, public CmpiAssociationMI + { + public: + SUSE_ElementCapabilitiesProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ); + + virtual CmpiStatus enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ); + virtual CmpiStatus enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ); + virtual CmpiStatus getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ); + + virtual CmpiStatus associators + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties); + + virtual CmpiStatus associatorNames + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole); + + virtual CmpiStatus references + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role, + const char** properties); + + virtual CmpiStatus referenceNames + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role); + }; +} // namespace cmpizypp + +#endif // SUSE_ELEMENTCAPABILITIESPROVIDERCLASS_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org