You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(26) |
Dec
(13) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(5) |
Feb
(16) |
Mar
(5) |
Apr
(5) |
May
(13) |
Jun
(12) |
Jul
(1) |
Aug
(2) |
Sep
(13) |
Oct
(6) |
Nov
(1) |
Dec
(29) |
2008 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(57) |
May
(35) |
Jun
(45) |
Jul
(132) |
Aug
(87) |
Sep
(141) |
Oct
(86) |
Nov
(17) |
Dec
(2) |
2009 |
Jan
(3) |
Feb
(2) |
Mar
(3) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
2010 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <ba...@us...> - 2008-08-27 15:10:48
|
Revision: 882 http://omc.svn.sourceforge.net/omc/?rev=882&view=rev Author: bartw Date: 2008-08-27 15:10:53 +0000 (Wed, 27 Aug 2008) Log Message: ----------- inserted a trunk directory Added Paths: ----------- cmpi-bindings/trunk/ cmpi-bindings/trunk/CMakeLists.txt cmpi-bindings/trunk/COPYING cmpi-bindings/trunk/README cmpi-bindings/trunk/TODO cmpi-bindings/trunk/VERSION.cmake cmpi-bindings/trunk/cmpi-bindings.spec.cmake cmpi-bindings/trunk/doc/ cmpi-bindings/trunk/include/ cmpi-bindings/trunk/mof/ cmpi-bindings/trunk/src/ cmpi-bindings/trunk/swig/ Removed Paths: ------------- cmpi-bindings/CMakeLists.txt cmpi-bindings/COPYING cmpi-bindings/README cmpi-bindings/TODO cmpi-bindings/VERSION.cmake cmpi-bindings/cmpi-bindings.spec.cmake cmpi-bindings/doc/ cmpi-bindings/include/ cmpi-bindings/mof/ cmpi-bindings/src/ cmpi-bindings/swig/ Deleted: cmpi-bindings/CMakeLists.txt =================================================================== --- cmpi-bindings/CMakeLists.txt 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/CMakeLists.txt 2008-08-27 15:10:53 UTC (rev 882) @@ -1,97 +0,0 @@ -# -# CMakeLists.txt for cmpi-bindings -# -PROJECT(cmpi-bindings) - -cmake_minimum_required(VERSION 2.4) - -enable_testing() -# -# cmake2.6: backward compatibility to cmake 2.4 -# -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 OLD) -endif(COMMAND cmake_policy) - -# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -#SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) -#SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH}) - -# Library -IF ( DEFINED LIB ) - SET ( CMPI_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}/cmpi" ) -ELSE ( DEFINED LIB ) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET( LIB_SUFFIX "64" ) - ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET ( CMPI_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmpi" ) -ENDIF ( DEFINED LIB ) -MESSAGE(STATUS "Providers will be installed in ${CMPI_LIBRARY_DIR}" ) - -# Include -SET( CMPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/cmpi ) - - - -INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) - -SET( PACKAGE "cmpi-bindings" ) -SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for CMPI") -SET(CPACK_PACKAGE_VENDOR "Novell Inc.") -#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") -#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") -SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) - -SET( CPACK_GENERATOR "TBZ2") -SET( CPACK_SOURCE_GENERATOR "TBZ2") -SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) - -# The following components are regex's to match anywhere (unless anchored) -# in absolute path + filename to find files or directories to be excluded -# from source tarball. -SET (CPACK_SOURCE_IGNORE_FILES -"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/" -"~$" -"\\\\.cvsignore$" -"/package" -"Makefile\\\\.in$" -) - -INCLUDE(CPack) - -#FIND_PACKAGE(SWIG REQUIRED) -MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") -FIND_PROGRAM(SWIG_EXECUTABLE - NAMES swig-1.3 swig - PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin -) - -IF ( NOT SWIG_EXECUTABLE ) - MESSAGE( FATAL "SWIG not found." ) -ELSE ( NOT SWIG_EXECUTABLE ) - MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" ) -ENDIF ( NOT SWIG_EXECUTABLE ) - -# don't build standalone provider, its included in the swig code -#ADD_SUBDIRECTORY(src) - -ADD_SUBDIRECTORY(swig) -ADD_SUBDIRECTORY(mof) - -SET( SRCPACKAGE_COMMAND - COMMAND ${CMAKE_MAKE_PROGRAM} package_source - COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package/ - COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" -) - -ADD_CUSTOM_TARGET( srcpackage - ${SRCPACKAGE_COMMAND} -) - -MESSAGE(STATUS "Writing spec file...") -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmpi-bindings.spec.cmake ${CMAKE_BINARY_DIR}/package/cmpi-bindings.spec @ONLY) Deleted: cmpi-bindings/COPYING =================================================================== --- cmpi-bindings/COPYING 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/COPYING 2008-08-27 15:10:53 UTC (rev 882) @@ -1,28 +0,0 @@ -Copyright (C) 2008 Novell Inc. All rights reserved. -Copyright (C) 2008 SUSE Linux Products GmbH. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - - Neither the name of Novell Inc. nor of SUSE Linux Products GmbH nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL Novell Inc. OR SUSE Linux Products GmbH OR -THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. Deleted: cmpi-bindings/README =================================================================== --- cmpi-bindings/README 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/README 2008-08-27 15:10:53 UTC (rev 882) @@ -1,50 +0,0 @@ -Swig bases CMPI bindings ------------------------- - -This implements a CMPI Instance provider via SWIG. - - -Currently supported languages - -- Ruby (complete) -- Python (almost there) - -Support for Python is only rough. The Python interpreter and the -Provider implementation get correctly loaded. But I do not know yet -how to call a Python function from C. - - -The prototype implements a dummy class 'Cmpi_Swig' which looks like -this: - -class Cmpi_Swig : CIM_ManagedElement -{ - [Description ("A friendly greeting") ] - string hello; -}; - - -FILES ------ - -mof/Swig_Generic.mof - The class definition -mof/Swig_Generic.reg - The (sfcb based) provider registration data - -src/cmpi_instance.c - A CMPI instance provider C stub to be included into - the SWIG generated C code. - It currently implements EnumInstances (for Ruby and Python) and - EnumInstanceNames (Ruby only) - Supporting more instance methods should be straightforward. - -include/cmpi - cmpi header files - - - -TODO ----- - -Convert it to a 'Generic' CMPI provider. \ No newline at end of file Deleted: cmpi-bindings/TODO =================================================================== --- cmpi-bindings/TODO 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/TODO 2008-08-27 15:10:53 UTC (rev 882) @@ -1,27 +0,0 @@ -Keep track of which objects are created with new*() methods from the -brokerEncFT, and which are created with clone(). We have to release the -later, not the former. - -Fix memory leaks related to cloning of CMPIData structs. - -Items marked as "TODO" in the code. - -Fix the build to determine the python version and dynamically link -to libpython. Cmake only knows how to statically link to libpython. -Right now it is hard-coded for libpython-2.5. - -Finish wrapping broker FTs, such as upcalls. - -Handling CMPIStatus: -Instead of returning CMPIStatus, check it in C code, and throw and -exception if it isn't CMPI_RC_OK. Functions that return CMPIStatus -would then be void instead. We'll check CMPIStatus* output parameters -as well, and do the same. We need to create an exception class with a -code and error string in swig. -[Not possible to pass status+message in a generic way. How about a -toplevel function which raised the execption ?] - -Split src/ into target-specific and common parts - -Wrap CMPIEnumeration and CMPIArray in typemaps. - Deleted: cmpi-bindings/VERSION.cmake =================================================================== --- cmpi-bindings/VERSION.cmake 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/VERSION.cmake 2008-08-27 15:10:53 UTC (rev 882) @@ -1,3 +0,0 @@ -SET(VERSION_MAJOR "0") -SET(VERSION_MINOR "1") -SET(VERSION_PATCH "0") Deleted: cmpi-bindings/cmpi-bindings.spec.cmake =================================================================== --- cmpi-bindings/cmpi-bindings.spec.cmake 2008-08-26 23:30:44 UTC (rev 881) +++ cmpi-bindings/cmpi-bindings.spec.cmake 2008-08-27 15:10:53 UTC (rev 882) @@ -1,84 +0,0 @@ -# -# spec file for package cmpi-bindings -# -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# nodebuginfo - -Name: @PACKAGE@ -Version: @VERSION@ -Release: 0 -License: GPL -Summary: Bindings for cmpi -Group: Development/Sources -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake gcc-c++ ruby-devel swig -BuildRequires: sblim-sfcb-devel -Source: %{name}-%{version}.tar.bz2 - -%description -- - -%prep -%setup -q - -%build -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ - -DLIB=%{_lib} \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - .. -make %{?jobs:-j %jobs} - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT - -%clean -%{__rm} -rf %{buildroot} - -%package -n cmpi-ruby -Summary: Ruby bindings for cmpi -Group: Development/Languages/Ruby - -%description -n cmpi-ruby -- - -%files -n cmpi-ruby -%defattr(-,root,root,-) -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/yui.so - -#%package -n python-yui -#Summary: Python bindings for cmpi -#Group: Development/Languages/Python -#%description -n python-yui -#- -# -#%files -n python-yui -#%defattr(-,root,root,-) -#%{_libdir}/python2.5/site-packages/_yui.so -#%{_libdir}/python2.5/site-packages/yui.py - -#%package -n perl-yui -#Summary: Perl bindings for cmpi -#Group: Development/Languages/Perl -# -#%description -n perl-yui -#- -# -#%files -n perl-yui -#%defattr(-,root,root,-) -#/usr/lib/perl5/*/*/yui.pm -#/usr/lib/perl5/*/*/yui.so - -%changelog Copied: cmpi-bindings/trunk/CMakeLists.txt (from rev 881, cmpi-bindings/CMakeLists.txt) =================================================================== --- cmpi-bindings/trunk/CMakeLists.txt (rev 0) +++ cmpi-bindings/trunk/CMakeLists.txt 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,97 @@ +# +# CMakeLists.txt for cmpi-bindings +# +PROJECT(cmpi-bindings) + +cmake_minimum_required(VERSION 2.4) + +enable_testing() +# +# cmake2.6: backward compatibility to cmake 2.4 +# +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 OLD) +endif(COMMAND cmake_policy) + +# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked +#SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +#SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH}) + +# Library +IF ( DEFINED LIB ) + SET ( CMPI_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}/cmpi" ) +ELSE ( DEFINED LIB ) + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET( LIB_SUFFIX "64" ) + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") + SET ( CMPI_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmpi" ) +ENDIF ( DEFINED LIB ) +MESSAGE(STATUS "Providers will be installed in ${CMPI_LIBRARY_DIR}" ) + +# Include +SET( CMPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/cmpi ) + + + +INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) + +SET( PACKAGE "cmpi-bindings" ) +SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) + +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for CMPI") +SET(CPACK_PACKAGE_VENDOR "Novell Inc.") +#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") +#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") +SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) +SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) +SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) + +SET( CPACK_GENERATOR "TBZ2") +SET( CPACK_SOURCE_GENERATOR "TBZ2") +SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) + +# The following components are regex's to match anywhere (unless anchored) +# in absolute path + filename to find files or directories to be excluded +# from source tarball. +SET (CPACK_SOURCE_IGNORE_FILES +"/CVS/;/.svn/;/.libs/;/.deps/;.swp$;.#;/#;/build/" +"~$" +"\\\\.cvsignore$" +"/package" +"Makefile\\\\.in$" +) + +INCLUDE(CPack) + +#FIND_PACKAGE(SWIG REQUIRED) +MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") +FIND_PROGRAM(SWIG_EXECUTABLE + NAMES swig-1.3 swig + PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin +) + +IF ( NOT SWIG_EXECUTABLE ) + MESSAGE( FATAL "SWIG not found." ) +ELSE ( NOT SWIG_EXECUTABLE ) + MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" ) +ENDIF ( NOT SWIG_EXECUTABLE ) + +# don't build standalone provider, its included in the swig code +#ADD_SUBDIRECTORY(src) + +ADD_SUBDIRECTORY(swig) +ADD_SUBDIRECTORY(mof) + +SET( SRCPACKAGE_COMMAND + COMMAND ${CMAKE_MAKE_PROGRAM} package_source + COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package/ + COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" +) + +ADD_CUSTOM_TARGET( srcpackage + ${SRCPACKAGE_COMMAND} +) + +MESSAGE(STATUS "Writing spec file...") +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmpi-bindings.spec.cmake ${CMAKE_BINARY_DIR}/package/cmpi-bindings.spec @ONLY) Property changes on: cmpi-bindings/trunk/CMakeLists.txt ___________________________________________________________________ Added: svn:mergeinfo + Copied: cmpi-bindings/trunk/COPYING (from rev 881, cmpi-bindings/COPYING) =================================================================== --- cmpi-bindings/trunk/COPYING (rev 0) +++ cmpi-bindings/trunk/COPYING 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,28 @@ +Copyright (C) 2008 Novell Inc. All rights reserved. +Copyright (C) 2008 SUSE Linux Products GmbH. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + - Neither the name of Novell Inc. nor of SUSE Linux Products GmbH nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL Novell Inc. OR SUSE Linux Products GmbH OR +THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. Property changes on: cmpi-bindings/trunk/COPYING ___________________________________________________________________ Added: svn:mergeinfo + Copied: cmpi-bindings/trunk/README (from rev 881, cmpi-bindings/README) =================================================================== --- cmpi-bindings/trunk/README (rev 0) +++ cmpi-bindings/trunk/README 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,50 @@ +Swig bases CMPI bindings +------------------------ + +This implements a CMPI Instance provider via SWIG. + + +Currently supported languages + +- Ruby (complete) +- Python (almost there) + +Support for Python is only rough. The Python interpreter and the +Provider implementation get correctly loaded. But I do not know yet +how to call a Python function from C. + + +The prototype implements a dummy class 'Cmpi_Swig' which looks like +this: + +class Cmpi_Swig : CIM_ManagedElement +{ + [Description ("A friendly greeting") ] + string hello; +}; + + +FILES +----- + +mof/Swig_Generic.mof + The class definition +mof/Swig_Generic.reg + The (sfcb based) provider registration data + +src/cmpi_instance.c + A CMPI instance provider C stub to be included into + the SWIG generated C code. + It currently implements EnumInstances (for Ruby and Python) and + EnumInstanceNames (Ruby only) + Supporting more instance methods should be straightforward. + +include/cmpi + cmpi header files + + + +TODO +---- + +Convert it to a 'Generic' CMPI provider. \ No newline at end of file Property changes on: cmpi-bindings/trunk/README ___________________________________________________________________ Added: svn:mergeinfo + Copied: cmpi-bindings/trunk/TODO (from rev 881, cmpi-bindings/TODO) =================================================================== --- cmpi-bindings/trunk/TODO (rev 0) +++ cmpi-bindings/trunk/TODO 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,27 @@ +Keep track of which objects are created with new*() methods from the +brokerEncFT, and which are created with clone(). We have to release the +later, not the former. + +Fix memory leaks related to cloning of CMPIData structs. + +Items marked as "TODO" in the code. + +Fix the build to determine the python version and dynamically link +to libpython. Cmake only knows how to statically link to libpython. +Right now it is hard-coded for libpython-2.5. + +Finish wrapping broker FTs, such as upcalls. + +Handling CMPIStatus: +Instead of returning CMPIStatus, check it in C code, and throw and +exception if it isn't CMPI_RC_OK. Functions that return CMPIStatus +would then be void instead. We'll check CMPIStatus* output parameters +as well, and do the same. We need to create an exception class with a +code and error string in swig. +[Not possible to pass status+message in a generic way. How about a +toplevel function which raised the execption ?] + +Split src/ into target-specific and common parts + +Wrap CMPIEnumeration and CMPIArray in typemaps. + Property changes on: cmpi-bindings/trunk/TODO ___________________________________________________________________ Added: svn:mergeinfo + Copied: cmpi-bindings/trunk/VERSION.cmake (from rev 881, cmpi-bindings/VERSION.cmake) =================================================================== --- cmpi-bindings/trunk/VERSION.cmake (rev 0) +++ cmpi-bindings/trunk/VERSION.cmake 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,3 @@ +SET(VERSION_MAJOR "0") +SET(VERSION_MINOR "1") +SET(VERSION_PATCH "0") Property changes on: cmpi-bindings/trunk/VERSION.cmake ___________________________________________________________________ Added: svn:mergeinfo + Copied: cmpi-bindings/trunk/cmpi-bindings.spec.cmake (from rev 881, cmpi-bindings/cmpi-bindings.spec.cmake) =================================================================== --- cmpi-bindings/trunk/cmpi-bindings.spec.cmake (rev 0) +++ cmpi-bindings/trunk/cmpi-bindings.spec.cmake 2008-08-27 15:10:53 UTC (rev 882) @@ -0,0 +1,84 @@ +# +# spec file for package cmpi-bindings +# +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# nodebuginfo + +Name: @PACKAGE@ +Version: @VERSION@ +Release: 0 +License: GPL +Summary: Bindings for cmpi +Group: Development/Sources +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake gcc-c++ ruby-devel swig +BuildRequires: sblim-sfcb-devel +Source: %{name}-%{version}.tar.bz2 + +%description +- + +%prep +%setup -q + +%build +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?jobs:-j %jobs} + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +%{__rm} -rf %{buildroot} + +%package -n cmpi-ruby +Summary: Ruby bindings for cmpi +Group: Development/Languages/Ruby + +%description -n cmpi-ruby +- + +%files -n cmpi-ruby +%defattr(-,root,root,-) +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/yui.so + +#%package -n python-yui +#Summary: Python bindings for cmpi +#Group: Development/Languages/Python +#%description -n python-yui +#- +# +#%files -n python-yui +#%defattr(-,root,root,-) +#%{_libdir}/python2.5/site-packages/_yui.so +#%{_libdir}/python2.5/site-packages/yui.py + +#%package -n perl-yui +#Summary: Perl bindings for cmpi +#Group: Development/Languages/Perl +# +#%description -n perl-yui +#- +# +#%files -n perl-yui +#%defattr(-,root,root,-) +#/usr/lib/perl5/*/*/yui.pm +#/usr/lib/perl5/*/*/yui.so + +%changelog Property changes on: cmpi-bindings/trunk/cmpi-bindings.spec.cmake ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: cmpi-bindings/trunk/doc ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: cmpi-bindings/trunk/include ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: cmpi-bindings/trunk/mof ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: cmpi-bindings/trunk/src ___________________________________________________________________ Added: svn:mergeinfo + Property changes on: cmpi-bindings/trunk/swig ___________________________________________________________________ Added: svn:mergeinfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-26 23:30:35
|
Revision: 881 http://omc.svn.sourceforge.net/omc/?rev=881&view=rev Author: mike-brasher Date: 2008-08-26 23:30:44 +0000 (Tue, 26 Aug 2008) Log Message: ----------- Some cardinality tests for boot service profile. Modified Paths: -------------- cmpiprofiles/test/trunk/ProviderTests.py Modified: cmpiprofiles/test/trunk/ProviderTests.py =================================================================== --- cmpiprofiles/test/trunk/ProviderTests.py 2008-08-22 21:19:11 UTC (rev 880) +++ cmpiprofiles/test/trunk/ProviderTests.py 2008-08-26 23:30:44 UTC (rev 881) @@ -221,6 +221,21 @@ "Linux_LANEndpointElementCapabilities", \ "Linux_LANEndpoint") + ## + ## Boot Control Profile + ## + + c.expect_1("Linux_BootService") + c.expect_1("Linux_BootConfigSetting") + c.expect_1("Linux_BootElementConformsToProfile") + c.expect_1("Linux_BootElementSettingData") + c.expect_1("Linux_BootHostedService") + c.expect_1("Linux_BootReferencedProfile", "root/interop") + c.expect_1("Linux_BootRegisteredProfile", "root/interop") + c.expect_1("Linux_BootServiceAffectsElement") + n = c.expect_1_plus("Linux_GrubBootSourceSetting") + c.expect_n(n, "Linux_BootOrderedComponent") + print "OKAY" sys.exit(0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-22 21:19:02
|
Revision: 880 http://omc.svn.sourceforge.net/omc/?rev=880&view=rev Author: mike-brasher Date: 2008-08-22 21:19:11 +0000 (Fri, 22 Aug 2008) Log Message: ----------- Added new provider-specific tests for cardinality of instances and associations. Modified Paths: -------------- cmpiprofiles/test/trunk/Makefile Added Paths: ----------- cmpiprofiles/test/trunk/ProviderTests.py Modified: cmpiprofiles/test/trunk/Makefile =================================================================== --- cmpiprofiles/test/trunk/Makefile 2008-08-21 14:19:49 UTC (rev 879) +++ cmpiprofiles/test/trunk/Makefile 2008-08-22 21:19:11 UTC (rev 880) @@ -1,8 +1,8 @@ help: - @ echo "targets: all sanity profiles" + @ echo "targets: all sanity profiles providers" -all: sanity profiles +all: sanity profiles providers sanity: ./AllSanityTest.py --url=http://localhost @@ -15,3 +15,6 @@ @ ./ProfileTest.py --url $(URL) Linux_SSHProtocolService Linux_SSHRegisteredProfile @ ./ProfileTest.py --url $(URL) Linux_Fan Linux_FanRegisteredProfile @ ./ProfileTest.py --url $(URL) Linux_PowerSupply Linux_PowerSupplyRegisteredProfile + +providers: + ./ProviderTests.py --url=http://localhost Added: cmpiprofiles/test/trunk/ProviderTests.py =================================================================== --- cmpiprofiles/test/trunk/ProviderTests.py (rev 0) +++ cmpiprofiles/test/trunk/ProviderTests.py 2008-08-22 21:19:11 UTC (rev 880) @@ -0,0 +1,226 @@ +#!/usr/bin/env python +# Author: Mike Brasher +# Date: Wed Aug 13 2008 + +import pywbem +import optparse +import sys +sys.path.append("./lib") +import wbem_connection + +################################################################################ +## +## class TestConnection +## +################################################################################ + +def err(msg): + print "\n**** ERROR: %s\n" %(msg) + sys.exit(1) + +################################################################################ +## +## class TestConnection +## +################################################################################ + +class TestConnection(pywbem.WBEMConnection): + + def __init__(self, parser = None): + + if parser == None: + parser = optparse.OptionParser() + + wbem_connection.getWBEMConnParserOptions(parser) + opts, args = parser.parse_args(); + + url = opts.url + user = opts.user + password = opts.password + + if user and not password: + password = getpass('\nEnter password for %s: ' % user) + + pywbem.WBEMConnection.__init__(self, url, ((user, password))) + + # Expect exactly n instances of the given class. + def expect_n(self, n, classname, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_n(%u, %s, %s)" %(n, classname, namespace) + + r = self.EnumerateInstances(classname, namespace) + m = len(r) + + if (m != n): + err("expected %d instances but found %d" %(n, m)) + + return m + + # Expect zero instances of the given class. + def expect_0(self, classname, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_0(%s, %s)" %(classname, namespace) + + r = self.EnumerateInstances(classname, namespace) + n = len(r) + + if (n != 0): + err("expected 0 instances but found %d" %(n)) + + return n + + # Expect one instance of the given class. + def expect_1(self, classname, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_1(%s, %s)" %(classname, namespace) + + r = self.EnumerateInstances(classname, namespace) + n = len(r) + + if (n != 1): + err("expected 1 instance but found %d" %(n)) + + return n + + # Expect one or more instances of the given class. + def expect_1_plus(self, classname, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_1_plus(%s, %s)" %(classname, namespace) + + r = self.EnumerateInstances(classname, namespace) + n = len(r) + + if (n < 1): + err("expected 1+ instances but found %d" %(n)) + + return n + + # Expect 1-to-1 cardinality between class1 and class2 through the assoc. + def expect_1_to_1(self, class1, assoc, class2, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_1_to_1(%s, %s, %s, %s)" \ + %(class1, assoc, class2, namespace) + + r = self.EnumerateInstanceNames(class1, namespace) + + for i in r: + + a1 = self.AssociatorNames(i, AssocClass=assoc) + + if len(a1) != 1: + err("expected 1 associator but found %d" %(len(a1))) + + try: + inst = c.GetInstance(a1[0]) + except: + err("GetInstance() failed") + + # Expect 1-to-n cardinality between class1 and class2 through the assoc. + def expect_1_to_n(self, n, class1, assoc, class2, namespace = None): + + if namespace is None: + namespace = self.default_namespace + + print ">>>> expect_1_to_n(%d, %s, %s, %s, %s)" \ + %(n, class1, assoc, class2, namespace) + + r = self.EnumerateInstanceNames(class1, namespace) + + for i in r: + + a1 = self.AssociatorNames(i, AssocClass=assoc) + + if len(a1) != n: + err("expected %d associators but found %d" %(n, len(a1))) + +################################################################################ +## +## __main__ +## +################################################################################ + +if __name__ == "__main__": + + c = TestConnection() + + ## + ## General tests + ## + + c.expect_0("CIM_RegisteredProfile") + c.expect_0("CIM_ReferencedProfile") + c.expect_1_plus("CIM_RegisteredProfile", "root/interop") + c.expect_1_plus("CIM_ReferencedProfile", "root/interop") + c.expect_1_plus("CIM_ElementConformsToProfile", "root/interop") + c.expect_1_plus("CIM_ElementConformsToProfile") + + ## + ## Ethernet Port Profile + ## + + n = c.expect_1_plus("Linux_EthernetPort") + c.expect_n(n, "Linux_LANEndpoint") + c.expect_n(n, "Linux_EthernetPortDeviceSAPImplementation") + c.expect_n(n, "Linux_EthernetPortElementConformsToProfile") + c.expect_n(n, "Linux_EthernetPortElementCapabilities") + c.expect_n(n, "Linux_EthernetPortHostedAccessPoint") + c.expect_n(n, "Linux_EthernetPortSystemDevice") + c.expect_n(n, "Linux_EthernetPortElementConformsToProfile", "root/interop") + c.expect_1("Linux_EthernetPortRegisteredProfile", "root/interop") + c.expect_1("Linux_EthernetPortReferencedProfile", "root/interop") + c.expect_1("Linux_EthernetPortEnabledLogicalElementCapabilities"); + # Linux_EthernetPortDeviceSAPImplementation associations: + c.expect_1_to_1( \ + "Linux_EthernetPort", \ + "Linux_EthernetPortDeviceSAPImplementation", \ + "Linux_LANEndpoint") + c.expect_1_to_1( \ + "Linux_LANEndpoint", \ + "Linux_EthernetPortDeviceSAPImplementation", \ + "Linux_EthernetPort") + # Linux_EthernetPortElementCapabilities associations: + c.expect_1_to_n( \ + n, + "Linux_EthernetPortEnabledLogicalElementCapabilities", \ + "Linux_EthernetPortElementCapabilities", \ + "Linux_EthernetPort") + c.expect_1_to_1( \ + "Linux_EthernetPort", \ + "Linux_EthernetPortElementCapabilities", \ + "Linux_EthernetPortEnabledLogicalElementCapabilities") + # Linux_EthernetPortElementCapabilities associations: + c.expect_1_to_1( \ + "Linux_EthernetPort", \ + "Linux_EthernetPortElementConformsToProfile", \ + "Linux_EthernetPortRegisteredProfile") + c.expect_1_to_n( \ + n, + "Linux_EthernetPortRegisteredProfile", \ + "Linux_EthernetPortElementConformsToProfile", \ + "Linux_EthernetPort", \ + "root/interop") + # LANEndpointElementCapabilitiesProvider associations: + c.expect_1_to_n( \ + n, + "Linux_LANEndpointEnabledLogicalElementCapabilities", \ + "Linux_LANEndpointElementCapabilities", \ + "Linux_LANEndpoint") + + print "OKAY" + sys.exit(0) + Property changes on: cmpiprofiles/test/trunk/ProviderTests.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2008-08-21 14:19:39
|
Revision: 879 http://omc.svn.sourceforge.net/omc/?rev=879&view=rev Author: npaxton Date: 2008-08-21 14:19:49 +0000 (Thu, 21 Aug 2008) Log Message: ----------- add gdb debug flag to make Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak 2008-08-20 23:44:59 UTC (rev 878) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak 2008-08-21 14:19:49 UTC (rev 879) @@ -1,2 +1,2 @@ all: - gcc -I/usr/include/cmpi -o lsgrub -DLSGRUB Resource.c + gcc -ggdb -I/usr/include/cmpi -o lsgrub -DLSGRUB Resource.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 23:44:50
|
Revision: 878 http://omc.svn.sourceforge.net/omc/?rev=878&view=rev Author: mike-brasher Date: 2008-08-20 23:44:59 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Backed out accidental commit. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-20 22:52:36 UTC (rev 877) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-20 23:44:59 UTC (rev 878) @@ -74,8 +74,7 @@ /* Returns 0 if Grub is enabled */ KHIDE int TestGrubEnabled(); -/* #define GRUB_MENU_LST "/boot/grub/menu.lst" */ -#define GRUB_MENU_LST "/home/mbrasher/tmp/menu.lst" +#define GRUB_MENU_LST "/boot/grub/menu.lst" /* Load Grub menu.lst file. Returns 0 on success */ KHIDE int LoadGrubMenu(const char* path, struct GrubMenu* menu); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 22:52:26
|
Revision: 877 http://omc.svn.sourceforge.net/omc/?rev=877&view=rev Author: mike-brasher Date: 2008-08-20 22:52:36 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Regenerated ProviderList.txt Modified Paths: -------------- cmpiprofiles/test/trunk/ProviderList.txt Modified: cmpiprofiles/test/trunk/ProviderList.txt =================================================================== --- cmpiprofiles/test/trunk/ProviderList.txt 2008-08-20 22:50:27 UTC (rev 876) +++ cmpiprofiles/test/trunk/ProviderList.txt 2008-08-20 22:52:36 UTC (rev 877) @@ -26,16 +26,18 @@ Linux_EthernetPortRegisteredProfile root/interop Linux_EthernetPortSystemDevice root/cimv2 +Linux_FanAssociatedSensor root/cimv2 Linux_FanElementConformsToProfile root/cimv2 Linux_FanElementConformsToProfile root/interop Linux_Fan root/cimv2 Linux_FanHostedCollection root/cimv2 Linux_FanIsSpare root/cimv2 Linux_FanMemberOfCollection root/cimv2 +Linux_FanNumericSensor root/cimv2 Linux_FanOwningCollectionElement root/cimv2 Linux_FanRedundancySet root/cimv2 -Linux_FanReferencedProfile root/cimv2 -Linux_FanRegisteredProfile root/cimv2 +Linux_FanReferencedProfile root/interop +Linux_FanRegisteredProfile root/interop Linux_FanSystemDevice root/cimv2 Linux_PowerSupplyElementConformsToProfile root/cimv2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 22:50:18
|
Revision: 876 http://omc.svn.sourceforge.net/omc/?rev=876&view=rev Author: mike-brasher Date: 2008-08-20 22:50:27 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Added "world" target. Modified Paths: -------------- cmpiprofiles/Makefile Modified: cmpiprofiles/Makefile =================================================================== --- cmpiprofiles/Makefile 2008-08-20 22:38:42 UTC (rev 875) +++ cmpiprofiles/Makefile 2008-08-20 22:50:27 UTC (rev 876) @@ -12,6 +12,14 @@ all: build +world: + - make clean + - make distclean + - make cleanup + make bootstrap + make configure + make build + bootstrap: $(foreach i,$(DIRS), cd $i; ./bootstrap.sh; $(NL) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 22:38:35
|
Revision: 875 http://omc.svn.sourceforge.net/omc/?rev=875&view=rev Author: mike-brasher Date: 2008-08-20 22:38:42 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Fixed dangling char* pointer approach (used all over). Modified Paths: -------------- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/FanProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensorProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/PowerSupplyProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref/Resource.h cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementCapabilitiesProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedAccessPointProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedServiceProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolEndpointProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolServiceProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProvidesEndpointProvider.c cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h cmpiprofiles/test/trunk/ProfileTest.py Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct FanInfo* data; size_t size; size_t i; + Str256 s; /* Get fan resource data */ @@ -53,15 +54,15 @@ /* AssociatedSensor.Antecedent */ NumericSensorRef_Init(&a, _cb, ns); - NumericSensorRef_Set_SystemCreationClassName(&a, SysClassName().str); - NumericSensorRef_Set_SystemName(&a, SysName().str); + NumericSensorRef_Set_SystemCreationClassName(&a, SysClassName(&s)); + NumericSensorRef_Set_SystemName(&a, SysName(&s)); NumericSensorRef_Set_CreationClassName(&a, "Linux_FanNumericSensor"); NumericSensorRef_Set_DeviceID(&a, data[i].deviceID); /* AssociatedSensor.Dependent */ FanRef_Init(&d, _cb, ns); - FanRef_Set_SystemCreationClassName(&d, SysClassName().str); - FanRef_Set_SystemName(&d, SysName().str); + FanRef_Set_SystemCreationClassName(&d, SysClassName(&s)); + FanRef_Set_SystemName(&d, SysName(&s)); FanRef_Set_CreationClassName(&d, "Linux_Fan"); FanRef_Set_DeviceID(&d, data[i].deviceID); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/FanProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/FanProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/FanProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct FanInfo* data; size_t size; size_t i; + Str256 s; /* Get fan resource data */ @@ -52,10 +53,10 @@ Fan_Init(&x, _cb, ns); /* Fan.SystemCreationClassName (mandatory) */ - Fan_Set_SystemCreationClassName(&x, SysClassName().str); + Fan_Set_SystemCreationClassName(&x, SysClassName(&s)); /* Fan.SystemName (mandatory) */ - Fan_Set_SystemName(&x, SysName().str); + Fan_Set_SystemName(&x, SysName(&s)); /* Fan.CreationClassName (mandatory) */ Fan_Set_CreationClassName(&x, "Linux_Fan"); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct RedundancyInfo* data; size_t size; size_t i; + Str256 s; /* Get redundancy resource data */ if (GetRedundancyInfo(&data, &size) != 0) @@ -56,7 +57,7 @@ /* HostedCollection.Antecedent */ ComputerSystemRef_Init(&a, _cb, ns); ComputerSystemRef_Set_CreationClassName(&a, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&a, SysName().str); + ComputerSystemRef_Set_Name(&a, SysName(&s)); /* HostedCollection.Dependent */ RedundancySetRef_Init(&d, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct RedundancyInfo* data; size_t size; size_t i; + Str256 s; /* Get redundancy resource data */ if (GetRedundancyInfo(&data, &size) != 0) @@ -54,8 +55,8 @@ /* Linux_FanIsSpare.Antecedent */ FanRef_Init(&a, _cb, ns); - FanRef_Set_SystemCreationClassName(&a, SysClassName().str); - FanRef_Set_SystemName(&a, SysName().str); + FanRef_Set_SystemCreationClassName(&a, SysClassName(&s)); + FanRef_Set_SystemName(&a, SysName(&s)); FanRef_Set_CreationClassName(&a, "Linux_Fan"); FanRef_Set_DeviceID(&a, data[i].deviceID); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct RedundancyInfo* data; size_t size; size_t i; + Str256 s; /* Get redundancy resource data */ if (GetRedundancyInfo(&data, &size) != 0) @@ -51,8 +52,8 @@ /* Linux_FanIsSpare.Antecedent */ FanRef_Init(&m, _cb, ns); - FanRef_Set_SystemCreationClassName(&m, SysClassName().str); - FanRef_Set_SystemName(&m, SysName().str); + FanRef_Set_SystemCreationClassName(&m, SysClassName(&s)); + FanRef_Set_SystemName(&m, SysName(&s)); FanRef_Set_CreationClassName(&m, "Linux_Fan"); FanRef_Set_DeviceID(&m, data[i].deviceID); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensorProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensorProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensorProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct FanInfo* data; size_t size; size_t i; + Str256 s; /* Get fan resource data */ @@ -52,10 +53,10 @@ NumericSensor_Init(&x, _cb, ns); /* NumericSensor.SystemCreationClassName (mandatory) */ - NumericSensor_Set_SystemCreationClassName(&x, SysClassName().str); + NumericSensor_Set_SystemCreationClassName(&x, SysClassName(&s)); /* NumericSensor.SystemName (mandatory) */ - NumericSensor_Set_SystemName(&x, SysName().str); + NumericSensor_Set_SystemName(&x, SysName(&s)); /* NumericSensor.CreationClassName (mandatory) */ NumericSensor_Set_CreationClassName(&x, "Linux_FanNumericSensor"); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ struct RedundancyInfo* data; size_t size; size_t i; + Str256 s; /* Get redundancy resource data */ if (GetRedundancyInfo(&data, &size) != 0) @@ -56,7 +57,7 @@ /* OwningCollectionElement.Antecedent */ ComputerSystemRef_Init(&cs, _cb, ns); ComputerSystemRef_Set_CreationClassName(&cs, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&cs, SysName().str); + ComputerSystemRef_Set_Name(&cs, SysName(&s)); /* OwningCollectionElement.Dependent */ RedundancySetRef_Init(&rs, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h 2008-08-20 22:38:42 UTC (rev 875) @@ -15,30 +15,32 @@ #define INTEROP_NAMESPACE "root/interop" typedef struct _Str256 -{ +{ char buf[256]; - const char* str; } Str256; -static __inline__ Str256 SysName() +KINLINE char* SysName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - cmpiutilGetComputerSystemName(s.buf, 256); - return s; -} - -static __inline__ Str256 SysClassName() + s->buf[0] = '\0'; + cmpiutilGetComputerSystemName(s->buf, sizeof(s->buf)-1); + return s->buf; +} + +KINLINE char* SysClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, cmpiutilGetComputerSystemClassName(), sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, cmpiutilGetComputerSystemClassName(), sizeof(s->buf)-1); + return s->buf; } +KINLINE char* SysCreationClassName(Str256* s) +{ + s->buf[0] = '\0'; + strncat(s->buf, "Linux_ComputerSystem", sizeof(s->buf)-1); + return s->buf; +} + struct FanInfo { char deviceID[64]; Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -35,10 +35,11 @@ const char** properties) { ComputerSystemRef gc; /* GroupComponent */ + Str256 s; ComputerSystemRef_Init(&gc, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&gc, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&gc, SysName().str); + ComputerSystemRef_Set_Name(&gc, SysName(&s)); /* Associate Linux_ComputerSystem with every Linux_Fan via * Linux_FanSystemDevice association. Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -38,6 +38,7 @@ struct RedundancyInfo* data; size_t size; size_t i; + Str256 s; /* Get redundancy resource data */ if (GetRedundancyInfo(&data, &size) != 0) @@ -57,7 +58,7 @@ /* HostedCollection.Antecedent */ ComputerSystemRef_Init(&a, _cb, ns); ComputerSystemRef_Set_CreationClassName(&a, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&a, SysName().str); + ComputerSystemRef_Set_Name(&a, SysName(&s)); /* HostedCollection.Dependent */ RedundancySetRef_Init(&d, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -48,14 +48,15 @@ IsSpare x; PowerSupplyRef a; /* Antecedent */ RedundancySetRef d; /* Dependent */ + Str256 s; if (!data[i].isSpare) continue; /* Linux_PowerSupplyIsSpare.Antecedent */ PowerSupplyRef_Init(&a, _cb, ns); - PowerSupplyRef_Set_SystemCreationClassName(&a, SysClassName().str); - PowerSupplyRef_Set_SystemName(&a, SysName().str); + PowerSupplyRef_Set_SystemCreationClassName(&a, SysClassName(&s)); + PowerSupplyRef_Set_SystemName(&a, SysName(&s)); PowerSupplyRef_Set_CreationClassName(&a, "Linux_PowerSupply"); PowerSupplyRef_Set_DeviceID(&a, data[i].deviceID); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -48,11 +48,12 @@ MemberOfCollection x; PowerSupplyRef m; /* Member */ RedundancySetRef c; /* Collection */ + Str256 s; /* Linux_PowerSupplyIsSpare.Antecedent */ PowerSupplyRef_Init(&m, _cb, ns); - PowerSupplyRef_Set_SystemCreationClassName(&m, SysClassName().str); - PowerSupplyRef_Set_SystemName(&m, SysName().str); + PowerSupplyRef_Set_SystemCreationClassName(&m, SysClassName(&s)); + PowerSupplyRef_Set_SystemName(&m, SysName(&s)); PowerSupplyRef_Set_CreationClassName(&m, "Linux_PowerSupply"); PowerSupplyRef_Set_DeviceID(&m, data[i].deviceID); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -48,6 +48,7 @@ OwningCollectionElement x; ComputerSystemRef cs; RedundancySetRef rs; + Str256 s; /* Skip if this redundancy element has same id as last */ if (i && strcmp(data[i].instanceID, data[i-1].instanceID) == 0) @@ -56,7 +57,7 @@ /* OwningCollectionElement.Antecedent */ ComputerSystemRef_Init(&cs, _cb, ns); ComputerSystemRef_Set_CreationClassName(&cs, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&cs, SysName().str); + ComputerSystemRef_Set_Name(&cs, SysName(&s)); /* OwningCollectionElement.Dependent */ RedundancySetRef_Init(&rs, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/PowerSupplyProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/PowerSupplyProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/PowerSupplyProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -48,14 +48,15 @@ for (i = 0; i < size; i++) { PowerSupply x; + Str256 s; PowerSupply_Init(&x, _cb, ns); /* PowerSupply.SystemCreationClassName (mandatory) */ - PowerSupply_Set_SystemCreationClassName(&x, SysClassName().str); + PowerSupply_Set_SystemCreationClassName(&x, SysClassName(&s)); /* PowerSupply.SystemName (mandatory) */ - PowerSupply_Set_SystemName(&x, SysName().str); + PowerSupply_Set_SystemName(&x, SysName(&s)); /* PowerSupply.CreationClassName (mandatory) */ PowerSupply_Set_CreationClassName(&x, "Linux_PowerSupply"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-20 22:38:42 UTC (rev 875) @@ -19,48 +19,39 @@ typedef struct _Str256 { char buf[256]; - const char* str; } Str256; -KINLINE Str256 SysName() +KINLINE char* SysName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - cmpiutilGetComputerSystemName(s.buf, 256); - return s; + s->buf[0] = '\0'; + cmpiutilGetComputerSystemName(s->buf, sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysClassName() +KINLINE char* SysClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, cmpiutilGetComputerSystemClassName(), sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, cmpiutilGetComputerSystemClassName(), sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysCreationClassName() +KINLINE char* SysCreationClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, "Linux_ComputerSystem", sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, "Linux_ComputerSystem", sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 Sprintf(const char* format, ...) +KINLINE char* Sprintf(Str256* s, const char* format, ...) { va_list ap; - Str256 s; - s.str = s.buf; va_start(ap, format); - vsprintf(s.buf, format, ap); + vsprintf(s->buf, format, ap); va_end(ap); - return s; + return s->buf; } struct PowerSupplyInfo Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -34,10 +34,11 @@ const char** properties) { ComputerSystemRef gc; /* GroupComponent */ + Str256 s; ComputerSystemRef_Init(&gc, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&gc, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&gc, SysName().str); + ComputerSystemRef_Set_Name(&gc, SysName(&s)); /* Associate Linux_ComputerSystem with every Linux_Fan via * Linux_FanSystemDevice association. Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref/Resource.h 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref/Resource.h 2008-08-20 22:38:42 UTC (rev 875) @@ -15,48 +15,39 @@ typedef struct _Str256 { char buf[256]; - const char* str; } Str256; -KINLINE Str256 SysName() +KINLINE char* SysName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - cmpiutilGetComputerSystemName(s.buf, 256); - return s; + s->buf[0] = '\0'; + cmpiutilGetComputerSystemName(s->buf, sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysClassName() +KINLINE char* SysClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, cmpiutilGetComputerSystemClassName(), sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, cmpiutilGetComputerSystemClassName(), sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysCreationClassName() +KINLINE char* SysCreationClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, "Linux_ComputerSystem", sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, "Linux_ComputerSystem", sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 Sprintf(const char* format, ...) +KINLINE char* Sprintf(Str256* s, const char* format, ...) { va_list ap; - Str256 s; - s.str = s.buf; va_start(ap, format); - vsprintf(s.buf, format, ap); + vsprintf(s->buf, format, ap); va_end(ap); - return s; + return s->buf; } #define MAX_GRUB_MENU_ITEMS 32 Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementCapabilitiesProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,12 +37,13 @@ ProtocolServiceRef m; /* ManagedElement */ CapabilitiesRef c; /* Capabilities */ ElementCapabilities x; + Str256 s; /* Create ElementCapabilities.ManagedElement */ ProtocolServiceRef_Init(&m, _cb, ns); - ProtocolServiceRef_Set_SystemCreationClassName(&m, SysClassName().str); + ProtocolServiceRef_Set_SystemCreationClassName(&m, SysClassName(&s)); ProtocolServiceRef_Set_CreationClassName(&m, "Linux_SSHProtocolService"); - ProtocolServiceRef_Set_SystemName(&m, SysName().str); + ProtocolServiceRef_Set_SystemName(&m, SysName(&s)); ProtocolServiceRef_Set_Name(&m, "SBLIM:Linux_SSHProtocolService"); /* Create ElementCapabilities.Capabilities */ Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedAccessPointProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedAccessPointProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedAccessPointProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -34,10 +34,11 @@ const char** properties) { ComputerSystemRef a; /* Antecedent */ + Str256 s; ComputerSystemRef_Init(&a, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&a, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&a, SysName().str); + ComputerSystemRef_Set_Name(&a, SysName(&s)); return KDefaultEnumerateInstancesOneToAll( _cb, Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedServiceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedServiceProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedServiceProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -35,10 +35,11 @@ const char** properties) { ComputerSystemRef a; /* Antecedent */ + Str256 s; ComputerSystemRef_Init(&a, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&a, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&a, SysName().str); + ComputerSystemRef_Set_Name(&a, SysName(&s)); return KDefaultEnumerateInstancesOneToAll( _cb, Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolEndpointProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolEndpointProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolEndpointProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -26,12 +26,10 @@ _cb, mi, cc, cr, cop); } -static Str256 _NameOf(struct SSHSession* sess) +static char* _NameOf(Str256* s, struct SSHSession* sess) { - Str256 s; - s.str = s.buf; - sprintf(s.buf, "SBLIM:Linux_SSHProtocolEndpoint:%u", sess->localPort); - return s; + sprintf(s->buf, "SBLIM:Linux_SSHProtocolEndpoint:%u", sess->localPort); + return s->buf; } static CMPIStatus ProtocolEndpointEnumInstances( @@ -57,6 +55,7 @@ { ProtocolEndpoint x; struct SSHDConfig conf; + Str256 s; if (GetSSHDConfig(&conf) != 0) KReturn2(_cb, ERR_FAILED, "failed to access sshd_config"); @@ -64,16 +63,16 @@ ProtocolEndpoint_Init(&x, _cb, ns); /* Linux_SSHProtocolEndpoint.SystemCreationClassName */ - ProtocolEndpoint_Set_SystemCreationClassName(&x, SysClassName().str); + ProtocolEndpoint_Set_SystemCreationClassName(&x, SysClassName(&s)); /* Linux_SSHProtocolEndpoint.CreationClassName */ ProtocolEndpoint_Set_CreationClassName(&x, "Linux_SSHProtocolEndpoint"); /* Linux_SSHProtocolEndpoint.SystemName */ - ProtocolEndpoint_Set_SystemName(&x, SysName().str); + ProtocolEndpoint_Set_SystemName(&x, SysName(&s)); /* Linux_SSHProtocolEndpoint.Name */ - ProtocolEndpoint_Set_Name(&x, _NameOf(&sess[i]).str); + ProtocolEndpoint_Set_Name(&x, _NameOf(&s, &sess[i])); /* Linux_SSHProtocolEndpoint.NameFormat */ ProtocolEndpoint_Set_NameFormat(&x, Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolServiceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolServiceProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProtocolServiceProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -37,6 +37,7 @@ { ProtocolService x; int sshd_status; + Str256 s; /* Get status of sshd */ sshd_status = GetSSHDStatus(); @@ -44,13 +45,13 @@ ProtocolService_Init(&x, _cb, KNameSpace(cop)); /* SystemCreationClassName */ - ProtocolService_Set_SystemCreationClassName(&x, SysClassName().str); + ProtocolService_Set_SystemCreationClassName(&x, SysClassName(&s)); /* CreationClassName */ ProtocolService_Set_CreationClassName(&x, "Linux_SSHProtocolService"); /* SystemName */ - ProtocolService_Set_SystemName(&x, SysName().str); + ProtocolService_Set_SystemName(&x, SysName(&s)); /* Name */ ProtocolService_Set_Name(&x, "SBLIM:Linux_SSHProtocolService"); Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProvidesEndpointProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProvidesEndpointProvider.c 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProvidesEndpointProvider.c 2008-08-20 22:38:42 UTC (rev 875) @@ -35,12 +35,13 @@ { const char* ns = KNameSpace(cop); ProtocolServiceRef a; /* Antecedent */ + Str256 s; /* Linux_SSHProtocolService.Antecedent */ ProtocolServiceRef_Init(&a, _cb, ns); - ProtocolServiceRef_Set_SystemCreationClassName(&a, SysClassName().str); + ProtocolServiceRef_Set_SystemCreationClassName(&a, SysClassName(&s)); ProtocolServiceRef_Set_CreationClassName(&a, "Linux_SSHProtocolService"); - ProtocolServiceRef_Set_SystemName(&a, SysName().str); + ProtocolServiceRef_Set_SystemName(&a, SysName(&s)); ProtocolServiceRef_Set_Name(&a, "SBLIM:Linux_SSHProtocolService"); /* Associate with every instance of Linux_SSHProtocolEndpoint */ Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-20 22:38:42 UTC (rev 875) @@ -57,26 +57,28 @@ typedef struct _Str256 { char buf[256]; - const char* str; } Str256; -static __inline__ Str256 SysName() +KINLINE char* SysName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - cmpiutilGetComputerSystemName(s.buf, 256); - return s; + s->buf[0] = '\0'; + cmpiutilGetComputerSystemName(s->buf, sizeof(s->buf)-1); + return s->buf; } -static __inline__ Str256 SysClassName() +KINLINE char* SysClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, cmpiutilGetComputerSystemClassName(), sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, cmpiutilGetComputerSystemClassName(), sizeof(s->buf)-1); + return s->buf; } +KINLINE char* SysCreationClassName(Str256* s) +{ + s->buf[0] = '\0'; + strncat(s->buf, "Linux_ComputerSystem", sizeof(s->buf)-1); + return s->buf; +} + #endif /* _Resource_h */ Modified: cmpiprofiles/test/trunk/ProfileTest.py =================================================================== --- cmpiprofiles/test/trunk/ProfileTest.py 2008-08-20 22:24:28 UTC (rev 874) +++ cmpiprofiles/test/trunk/ProfileTest.py 2008-08-20 22:38:42 UTC (rev 875) @@ -63,6 +63,11 @@ print "no instances of the central class found: %s" %(centralClassName) sys.exit(1) + ## + ## Remove this! + ## + # instances = c.EnumerateInstanceNames("Linux_BootOrderedComponent"); + # For each instance of central class be sure there is exactly one # RegisteredProfile instance (associated through ElementConformsToProfile). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 22:24:20
|
Revision: 874 http://omc.svn.sourceforge.net/omc/?rev=874&view=rev Author: mike-brasher Date: 2008-08-20 22:24:28 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Fixed bug causing CMPI string trash. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/BootServiceProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ConfigSettingProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/BootServiceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/BootServiceProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/BootServiceProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -34,12 +34,13 @@ const char** properties) { const char* ns = KNameSpace(cop); + Str256 s; BootService x; BootService_Init(&x, _cb, ns); BootService_Set_Name(&x, "SBLIM:Boot_Service"); - BootService_Set_SystemCreationClassName(&x, SysCreationClassName().str); - BootService_Set_SystemName(&x, SysName().str); + BootService_Set_SystemCreationClassName(&x, SysCreationClassName(&s)); + BootService_Set_SystemName(&x, SysName(&s)); BootService_Set_CreationClassName(&x, "Linux_BootService"); BootService_Set_ElementName(&x, "SBLIM:Boot_Service"); KReturnInstance(cr, x); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ConfigSettingProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ConfigSettingProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ConfigSettingProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -34,7 +34,7 @@ { ConfigSetting x; ConfigSetting_Init(&x, _cb, KNameSpace(cop)); - ConfigSetting_Set_InstanceID(&x, "SBLIM:BootConfigSetting:Grub"); + ConfigSetting_Set_InstanceID(&x, "SBLIM:Linux_BootConfigSetting:Grub"); ConfigSetting_Set_ElementName(&x, "Default Grub Boot Configuration"); KReturnInstance(cr, x); CMReturn(CMPI_RC_OK); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -37,15 +37,16 @@ ComputerSystemRef me; /* ManagedElement */ ConfigSettingRef sd; /* SettingData */ ElementSettingData x; + Str256 s; /* Linux_BootElementSettingData.ManagedElement */ ComputerSystemRef_Init(&me, _cb, ns); ComputerSystemRef_Set_CreationClassName(&me, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&me, SysName().str); + ComputerSystemRef_Set_Name(&me, SysName(&s)); /* Linux_BootElementSettingData.SettingData */ ConfigSettingRef_Init(&sd, _cb, ns); - ConfigSettingRef_Set_InstanceID(&sd, "SBLIM:BootConfigSetting:Grub"); + ConfigSettingRef_Set_InstanceID(&sd, "SBLIM:Linux_BootConfigSetting:Grub"); /* Linux_BootElementSettingData */ ElementSettingData_Init(&x, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -37,17 +37,18 @@ ComputerSystemRef a; /* Antecedent */ BootServiceRef d; /* Dependent */ HostedService x; + Str256 s; /* Linux_BootHostedService.Antecedent */ ComputerSystemRef_Init(&a, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&a, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&a, SysName().str); + ComputerSystemRef_Set_Name(&a, SysName(&s)); /* Linux_BootHostedService.Dependent */ BootServiceRef_Init(&d, _cb, ns); BootServiceRef_Set_Name(&d, "SBLIM:Boot_Service"); - BootServiceRef_Set_SystemCreationClassName(&d, SysCreationClassName().str); - BootServiceRef_Set_SystemName(&d, SysName().str); + BootServiceRef_Set_SystemCreationClassName(&d, SysCreationClassName(&s)); + BootServiceRef_Set_SystemName(&d, SysName(&s)); BootServiceRef_Set_CreationClassName(&d, "Linux_BootService"); /* Linux_BootHostedService */ Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -39,6 +39,7 @@ OrderedComponent x; struct GrubMenu menu; size_t i; + Str256 s; /* Load Grub configuration */ if (LoadGrubMenu(GRUB_MENU_LST, &menu) != 0) @@ -46,7 +47,7 @@ /* Linux_BootOrderedComponent.GroupComponent */ ConfigSettingRef_Init(&g, _cb, ns); - ConfigSettingRef_Set_InstanceID(&g, "SBLIM:ConfigSetting:Grub"); + ConfigSettingRef_Set_InstanceID(&g, "SBLIM:Linux_BootConfigSetting:Grub"); /* Generate association instances */ @@ -55,7 +56,7 @@ /* Linux_BootOrderedComponent.PartComponent */ SourceSettingRef_Init(&p, _cb, ns); SourceSettingRef_Set_InstanceID(&p, - Sprintf("SBLIM:GrubBootSourceSetting:%d", i).str); + Sprintf(&s, "SBLIM:Linux_GrubBootSourceSetting:%d", (int)i)); /* Linux_BootOrderedComponent */ OrderedComponent_Init(&x, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c 2008-08-20 22:24:28 UTC (rev 874) @@ -204,12 +204,18 @@ printf("}\n"); } -int main() +int main(int argc, char** argv) { struct GrubMenu menu; - if (LoadGrubMenu("./menu.lst", &menu) != 0) + if (argc != 2) { + fprintf(stderr, "Usage: %s path\n", argv[0]); + exit(1); + } + + if (LoadGrubMenu(argv[1], &menu) != 0) + { fprintf(stderr, "failed to load menu.lst\n"); exit(1); } Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-20 22:24:28 UTC (rev 874) @@ -16,48 +16,39 @@ typedef struct _Str256 { char buf[256]; - const char* str; } Str256; -KINLINE Str256 SysName() +KINLINE char* SysName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - cmpiutilGetComputerSystemName(s.buf, 256); - return s; + s->buf[0] = '\0'; + cmpiutilGetComputerSystemName(s->buf, sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysClassName() +KINLINE char* SysClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, cmpiutilGetComputerSystemClassName(), sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, cmpiutilGetComputerSystemClassName(), sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 SysCreationClassName() +KINLINE char* SysCreationClassName(Str256* s) { - Str256 s; - s.str = s.buf; - s.buf[0] = '\0'; - strncat(s.buf, "Linux_ComputerSystem", sizeof(s.buf)-1); - return s; + s->buf[0] = '\0'; + strncat(s->buf, "Linux_ComputerSystem", sizeof(s->buf)-1); + return s->buf; } -KINLINE Str256 Sprintf(const char* format, ...) +KINLINE char* Sprintf(Str256* s, const char* format, ...) { va_list ap; - Str256 s; - s.str = s.buf; va_start(ap, format); - vsprintf(s.buf, format, ap); + vsprintf(s->buf, format, ap); va_end(ap); - return s; + return s->buf; } #define MAX_GRUB_MENU_ITEMS 32 @@ -83,7 +74,8 @@ /* Returns 0 if Grub is enabled */ KHIDE int TestGrubEnabled(); -#define GRUB_MENU_LST "/boot/grub/menu.lst" +/* #define GRUB_MENU_LST "/boot/grub/menu.lst" */ +#define GRUB_MENU_LST "/home/mbrasher/tmp/menu.lst" /* Load Grub menu.lst file. Returns 0 on success */ KHIDE int LoadGrubMenu(const char* path, struct GrubMenu* menu); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -37,18 +37,19 @@ ComputerSystemRef cs; BootServiceRef bs; ServiceAffectsElement x; + Str256 s; /* Linux_BootServiceAffectsElement.AffectingElement */ BootServiceRef_Init(&bs, _cb, ns); BootServiceRef_Set_Name(&bs, "SBLIM:Boot_Service"); - BootServiceRef_Set_SystemCreationClassName(&bs, SysCreationClassName().str); - BootServiceRef_Set_SystemName(&bs, SysName().str); + BootServiceRef_Set_SystemCreationClassName(&bs, SysCreationClassName(&s)); + BootServiceRef_Set_SystemName(&bs, SysName(&s)); BootServiceRef_Set_CreationClassName(&bs, "Linux_BootService"); /* Linux_BootServiceAffectsElement.AffectedElement */ ComputerSystemRef_Init(&cs, _cb, KNameSpace(cop)); ComputerSystemRef_Set_CreationClassName(&cs, "Linux_ComputerSystem"); - ComputerSystemRef_Set_Name(&cs, SysName().str); + ComputerSystemRef_Set_Name(&cs, SysName(&s)); /* Linux_BootServiceAffectsElement */ ServiceAffectsElement_Init(&x, _cb, ns); Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c 2008-08-20 21:10:23 UTC (rev 873) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c 2008-08-20 22:24:28 UTC (rev 874) @@ -35,6 +35,7 @@ { struct GrubMenu menu; size_t i; + Str256 s; /* Load Grub configuration */ if (LoadGrubMenu(GRUB_MENU_LST, &menu) != 0) @@ -51,7 +52,7 @@ /* Linux_GrubBootSourceSetting.InstanceID */ SourceSetting_Set_InstanceID(&x, - Sprintf("SBLIM:GrubBootSourceSetting:%d", i).str); + Sprintf(&s, "SBLIM:Linux_GrubBootSourceSetting:%d", (int)i)); /* Linux_GrubBootSourceSetting.FailThroughSupported */ SourceSetting_Set_FailThroughSupported_Unknown(&x); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-20 21:10:15
|
Revision: 873 http://omc.svn.sourceforge.net/omc/?rev=873&view=rev Author: mike-brasher Date: 2008-08-20 21:10:23 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Implemented 2 providers: Linux_FanNumericSensor & Linux_FanAssociatedSensor. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.mof cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Makefile.am cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/linux-fan-profile.kon Added Paths: ----------- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensor.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_AssociatedSensor.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_NumericSensor.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_Sensor.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensor.h cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/NumericSensorProvider.c Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.mof =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.mof 2008-08-19 23:49:21 UTC (rev 872) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.mof 2008-08-20 21:10:23 UTC (rev 873) @@ -164,6 +164,22 @@ [Key] Linux_FanRedundancySet REF OwnedElement; }; +// =========================================================================== +// Linux_FanNumericSensor +// =========================================================================== +class Linux_FanNumericSensor : CIM_NumericSensor +{ +}; + +// =========================================================================== +// Linux_AssociatedSensor +// =========================================================================== +class Linux_FanAssociatedSensor : CIM_AssociatedSensor +{ + Linux_FanNumericSensor REF Antecedent; + Linux_Fan REF Dependent; +}; + // ================================================================== // end of file // ================================================================== Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-19 23:49:21 UTC (rev 872) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-20 21:10:23 UTC (rev 873) @@ -1,3 +1,9 @@ +[Linux_FanAssociatedSensor] + provider: Linux_FanAssociatedSensor + location: linux_fanprovider + type: instance association + namespace: root/cimv2 +# [Linux_FanElementConformsToProfile] provider: Linux_FanElementConformsToProfile location: linux_fanprovider @@ -28,6 +34,12 @@ type: instance association namespace: root/cimv2 # +[Linux_FanNumericSensor] + provider: Linux_FanNumericSensor + location: linux_fanprovider + type: instance method + namespace: root/cimv2 +# [Linux_FanOwningCollectionElement] provider: Linux_FanOwningCollectionElement location: linux_fanprovider Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-19 23:49:21 UTC (rev 872) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-20 21:10:23 UTC (rev 873) @@ -1,3 +1,4 @@ +Linux_FanAssociatedSensor root/cimv2 Linux_FanAssociatedSensor linux_fanprovider instance association Linux_FanElementConformsToProfile root/cimv2\ root/interop Linux_FanElementConformsToProfile linux_fanprovider instance association Linux_Fan root/cimv2 Linux_Fan linux_fanprovider instance method Linux_FanHostedCollection root/cimv2 Linux_FanHostedCollection linux_fanprovider instance association @@ -3,4 +4,5 @@ Linux_FanIsSpare root/cimv2 Linux_FanIsSpare linux_fanprovider instance association Linux_FanMemberOfCollection root/cimv2 Linux_FanMemberOfCollection linux_fanprovider instance association +Linux_FanNumericSensor root/cimv2 Linux_FanNumericSensor linux_fanprovider instance method Linux_FanOwningCollectionElement root/cimv2 Linux_FanOwningCollectionElement linux_fanprovider instance association Linux_FanRedundancySet root/cimv2 Linux_FanRedundancySet linux_fanprovider instance method Added: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensor.h =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensor.h (rev 0) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensor.h 2008-08-20 21:10:23 UTC (rev 873) @@ -0,0 +1,388 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_AssociatedSensor_h +#define _konkrete_AssociatedSensor_h + +#include <konkret/konkret.h> +#include "NumericSensor.h" +#include "Fan.h" + +/* +**============================================================================== +** +** struct AssociatedSensorRef +** +**============================================================================== +*/ + +/* classname=Linux_FanAssociatedSensor */ +typedef struct _AssociatedSensorRef +{ + KBase __base; + /* CIM_Dependency features */ + const KRef Antecedent; /* NumericSensor */ + const KRef Dependent; /* Fan */ + /* CIM_AssociatedSensor features */ + /* Linux_FanAssociatedSensor features */ +} +AssociatedSensorRef; + +static const unsigned char __AssociatedSensorRef_sig[] = +{ + 0x19,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x46,0x61,0x6e,0x41,0x73,0x73,0x6f,0x63, + 0x69,0x61,0x74,0x65,0x64,0x53,0x65,0x6e,0x73,0x6f,0x72,0x00,0x02,0x4e,0x0a, + 0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65, + 0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, +}; + +KINLINE void AssociatedSensorRef_Init( + AssociatedSensorRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __AssociatedSensorRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->Antecedent)->__sig = __NumericSensor_sig; + ((KRef*)&self->Dependent)->__sig = __Fan_sig; +} + +KINLINE CMPIStatus AssociatedSensorRef_InitFromInstance( + AssociatedSensorRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + AssociatedSensorRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus AssociatedSensorRef_InitFromObjectPath( + AssociatedSensorRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + AssociatedSensorRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void AssociatedSensorRef_Print( + const AssociatedSensorRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* AssociatedSensorRef_ToInstance( + const AssociatedSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* AssociatedSensorRef_ToObjectPath( + const AssociatedSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* AssociatedSensorRef_NameSpace( + AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void AssociatedSensorRef_SetObjectPath_Antecedent( + AssociatedSensorRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus AssociatedSensorRef_Set_Antecedent( + AssociatedSensorRef* self, + const NumericSensorRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void AssociatedSensorRef_Null_Antecedent( + AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Null(field); + } +} + +KINLINE void AssociatedSensorRef_Clr_Antecedent( + AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Clr(field); + } +} + +KINLINE void AssociatedSensorRef_SetObjectPath_Dependent( + AssociatedSensorRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus AssociatedSensorRef_Set_Dependent( + AssociatedSensorRef* self, + const FanRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void AssociatedSensorRef_Null_Dependent( + AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Null(field); + } +} + +KINLINE void AssociatedSensorRef_Clr_Dependent( + AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Clr(field); + } +} + +/* +**============================================================================== +** +** struct AssociatedSensor +** +**============================================================================== +*/ + +/* classname=Linux_FanAssociatedSensor */ +typedef struct _AssociatedSensor +{ + KBase __base; + /* CIM_Dependency features */ + const KRef Antecedent; /* NumericSensor */ + const KRef Dependent; /* Fan */ + /* CIM_AssociatedSensor features */ + /* Linux_FanAssociatedSensor features */ +} +AssociatedSensor; + +static const unsigned char __AssociatedSensor_sig[] = +{ + 0x19,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x46,0x61,0x6e,0x41,0x73,0x73,0x6f,0x63, + 0x69,0x61,0x74,0x65,0x64,0x53,0x65,0x6e,0x73,0x6f,0x72,0x00,0x02,0x4e,0x0a, + 0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65, + 0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, +}; + +KINLINE void AssociatedSensor_Init( + AssociatedSensor* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __AssociatedSensor_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->Antecedent)->__sig = __NumericSensor_sig; + ((KRef*)&self->Dependent)->__sig = __Fan_sig; +} + +KINLINE CMPIStatus AssociatedSensor_InitFromInstance( + AssociatedSensor* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + AssociatedSensor_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus AssociatedSensor_InitFromObjectPath( + AssociatedSensor* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + AssociatedSensor_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void AssociatedSensor_Print( + const AssociatedSensor* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* AssociatedSensor_ToInstance( + const AssociatedSensor* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* AssociatedSensor_ToObjectPath( + const AssociatedSensor* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* AssociatedSensor_NameSpace( + AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void AssociatedSensor_SetObjectPath_Antecedent( + AssociatedSensor* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus AssociatedSensor_Set_Antecedent( + AssociatedSensor* self, + const NumericSensorRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void AssociatedSensor_Null_Antecedent( + AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Null(field); + } +} + +KINLINE void AssociatedSensor_Clr_Antecedent( + AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Clr(field); + } +} + +KINLINE void AssociatedSensor_SetObjectPath_Dependent( + AssociatedSensor* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus AssociatedSensor_Set_Dependent( + AssociatedSensor* self, + const FanRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void AssociatedSensor_Null_Dependent( + AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Null(field); + } +} + +KINLINE void AssociatedSensor_Clr_Dependent( + AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Clr(field); + } +} + +/* +**============================================================================== +** +** AssociatedSensor methods +** +**============================================================================== +*/ + +KINLINE CMPIStatus AssociatedSensor_DispatchMethod( + const CMPIBroker* cb, + CMPIMethodMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* meth, + const CMPIArgs* in, + CMPIArgs* out) +{ + AssociatedSensorRef self; + + KReturnIf(AssociatedSensorRef_InitFromObjectPath(&self, cb, cop)); + + + KReturn(ERR_METHOD_NOT_FOUND); +} + +#define AssociatedSensor_ClassName "Linux_FanAssociatedSensor" + +#endif /* _konkrete_AssociatedSensor_h */ Added: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c (rev 0) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/AssociatedSensorProvider.c 2008-08-20 21:10:23 UTC (rev 873) @@ -0,0 +1,246 @@ +#include <konkret/konkret.h> +#include "AssociatedSensor.h" +#include "Resource.h" + +static const CMPIBroker* _cb; + +static void AssociatedSensorInitialize() +{ +} + +static CMPIStatus AssociatedSensorCleanup( + CMPIInstanceMI* mi, + const CMPIContext* cc, + CMPIBoolean term) +{ + CMReturn(CMPI_RC_OK); +} + +static CMPIStatus AssociatedSensorEnumInstanceNames( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop) +{ + return KDefaultEnumerateInstanceNames( + _cb, mi, cc, cr, cop); +} + +static CMPIStatus AssociatedSensorEnumInstances( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char** properties) +{ + const char* ns = KNameSpace(cop); + struct FanInfo* data; + size_t size; + size_t i; + + /* Get fan resource data */ + + if (GetFanInfo(&data, &size) != 0) + KReturn2(_cb, ERR_FAILED, "failed to access fan resources"); + + /* For each fan */ + + for (i = 0; i < size; i++) + { + AssociatedSensor x; + NumericSensorRef a; + FanRef d; + + /* AssociatedSensor.Antecedent */ + NumericSensorRef_Init(&a, _cb, ns); + NumericSensorRef_Set_SystemCreationClassName(&a, SysClassName().str); + NumericSensorRef_Set_SystemName(&a, SysName().str); + NumericSensorRef_Set_CreationClassName(&a, "Linux_FanNumericSensor"); + NumericSensorRef_Set_DeviceID(&a, data[i].deviceID); + + /* AssociatedSensor.Dependent */ + FanRef_Init(&d, _cb, ns); + FanRef_Set_SystemCreationClassName(&d, SysClassName().str); + FanRef_Set_SystemName(&d, SysName().str); + FanRef_Set_CreationClassName(&d, "Linux_Fan"); + FanRef_Set_DeviceID(&d, data[i].deviceID); + + /* AssociatedSensor */ + AssociatedSensor_Init(&x, _cb, ns); + AssociatedSensor_Set_Antecedent(&x, &a); + AssociatedSensor_Set_Dependent(&x, &d); + + KReturnInstance(cr, x); + } + + /* Free resource data */ + free(data); + + CMReturn(CMPI_RC_OK); +} + +static CMPIStatus AssociatedSensorGetInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char** properties) +{ + return KDefaultGetInstance( + _cb, mi, cc, cr, cop, properties); +} + +static CMPIStatus AssociatedSensorCreateInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const CMPIInstance* ci) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus AssociatedSensorModifyInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const CMPIInstance* ci, + const char**properties) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus AssociatedSensorDeleteInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus AssociatedSensorExecQuery( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* lang, + const char* query) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus AssociatedSensorAssociationCleanup( + CMPIAssociationMI* mi, + const CMPIContext* cc, + CMPIBoolean term) +{ + CMReturn(CMPI_RC_OK); +} + +static CMPIStatus AssociatedSensorAssociators( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* resultClass, + const char* role, + const char* resultRole, + const char** properties) +{ + return KDefaultAssociators( + _cb, + mi, + cc, + cr, + cop, + AssociatedSensor_ClassName, + assocClass, + resultClass, + role, + resultRole, + properties); +} + +static CMPIStatus AssociatedSensorAssociatorNames( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* resultClass, + const char* role, + const char* resultRole) +{ + return KDefaultAssociatorNames( + _cb, + mi, + cc, + cr, + cop, + AssociatedSensor_ClassName, + assocClass, + resultClass, + role, + resultRole); +} + +static CMPIStatus AssociatedSensorReferences( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* role, + const char** properties) +{ + return KDefaultReferences( + _cb, + mi, + cc, + cr, + cop, + AssociatedSensor_ClassName, + assocClass, + role, + properties); +} + +static CMPIStatus AssociatedSensorReferenceNames( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* role) +{ + return KDefaultReferenceNames( + _cb, + mi, + cc, + cr, + cop, + AssociatedSensor_ClassName, + assocClass, + role); +} + +CMInstanceMIStub( + AssociatedSensor, + Linux_FanAssociatedSensor, + _cb, + AssociatedSensorInitialize()) + +CMAssociationMIStub( + AssociatedSensor, + Linux_FanAssociatedSensor, + _cb, + AssociatedSensorInitialize()) + +KONKRET_REGISTRATION( + "root/cimv2", + "Linux_FanAssociatedSensor", + "Linux_FanAssociatedSensor", + "instance association"); Added: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_AssociatedSensor.h =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_AssociatedSensor.h (rev 0) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_AssociatedSensor.h 2008-08-20 21:10:23 UTC (rev 873) @@ -0,0 +1,386 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_CIM_AssociatedSensor_h +#define _konkrete_CIM_AssociatedSensor_h + +#include <konkret/konkret.h> +#include "CIM_Sensor.h" +#include "CIM_ManagedSystemElement.h" + +/* +**============================================================================== +** +** struct CIM_AssociatedSensorRef +** +**============================================================================== +*/ + +/* classname=CIM_AssociatedSensor */ +typedef struct _CIM_AssociatedSensorRef +{ + KBase __base; + /* CIM_Dependency features */ + const KRef Antecedent; /* CIM_Sensor */ + const KRef Dependent; /* CIM_ManagedSystemElement */ + /* CIM_AssociatedSensor features */ +} +CIM_AssociatedSensorRef; + +static const unsigned char __CIM_AssociatedSensorRef_sig[] = +{ + 0x14,0x43,0x49,0x4d,0x5f,0x41,0x73,0x73,0x6f,0x63,0x69,0x61,0x74,0x65,0x64, + 0x53,0x65,0x6e,0x73,0x6f,0x72,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63, + 0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65, + 0x6e,0x74,0x00, +}; + +KINLINE void CIM_AssociatedSensorRef_Init( + CIM_AssociatedSensorRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __CIM_AssociatedSensorRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->Antecedent)->__sig = __CIM_Sensor_sig; + ((KRef*)&self->Dependent)->__sig = __CIM_ManagedSystemElement_sig; +} + +KINLINE CMPIStatus CIM_AssociatedSensorRef_InitFromInstance( + CIM_AssociatedSensorRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + CIM_AssociatedSensorRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus CIM_AssociatedSensorRef_InitFromObjectPath( + CIM_AssociatedSensorRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + CIM_AssociatedSensorRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void CIM_AssociatedSensorRef_Print( + const CIM_AssociatedSensorRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* CIM_AssociatedSensorRef_ToInstance( + const CIM_AssociatedSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* CIM_AssociatedSensorRef_ToObjectPath( + const CIM_AssociatedSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* CIM_AssociatedSensorRef_NameSpace( + CIM_AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void CIM_AssociatedSensorRef_SetObjectPath_Antecedent( + CIM_AssociatedSensorRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus CIM_AssociatedSensorRef_Set_Antecedent( + CIM_AssociatedSensorRef* self, + const CIM_SensorRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void CIM_AssociatedSensorRef_Null_Antecedent( + CIM_AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Null(field); + } +} + +KINLINE void CIM_AssociatedSensorRef_Clr_Antecedent( + CIM_AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Clr(field); + } +} + +KINLINE void CIM_AssociatedSensorRef_SetObjectPath_Dependent( + CIM_AssociatedSensorRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus CIM_AssociatedSensorRef_Set_Dependent( + CIM_AssociatedSensorRef* self, + const CIM_ManagedSystemElementRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void CIM_AssociatedSensorRef_Null_Dependent( + CIM_AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Null(field); + } +} + +KINLINE void CIM_AssociatedSensorRef_Clr_Dependent( + CIM_AssociatedSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Clr(field); + } +} + +/* +**============================================================================== +** +** struct CIM_AssociatedSensor +** +**============================================================================== +*/ + +/* classname=CIM_AssociatedSensor */ +typedef struct _CIM_AssociatedSensor +{ + KBase __base; + /* CIM_Dependency features */ + const KRef Antecedent; /* CIM_Sensor */ + const KRef Dependent; /* CIM_ManagedSystemElement */ + /* CIM_AssociatedSensor features */ +} +CIM_AssociatedSensor; + +static const unsigned char __CIM_AssociatedSensor_sig[] = +{ + 0x14,0x43,0x49,0x4d,0x5f,0x41,0x73,0x73,0x6f,0x63,0x69,0x61,0x74,0x65,0x64, + 0x53,0x65,0x6e,0x73,0x6f,0x72,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63, + 0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65, + 0x6e,0x74,0x00, +}; + +KINLINE void CIM_AssociatedSensor_Init( + CIM_AssociatedSensor* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __CIM_AssociatedSensor_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->Antecedent)->__sig = __CIM_Sensor_sig; + ((KRef*)&self->Dependent)->__sig = __CIM_ManagedSystemElement_sig; +} + +KINLINE CMPIStatus CIM_AssociatedSensor_InitFromInstance( + CIM_AssociatedSensor* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + CIM_AssociatedSensor_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus CIM_AssociatedSensor_InitFromObjectPath( + CIM_AssociatedSensor* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + CIM_AssociatedSensor_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void CIM_AssociatedSensor_Print( + const CIM_AssociatedSensor* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* CIM_AssociatedSensor_ToInstance( + const CIM_AssociatedSensor* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* CIM_AssociatedSensor_ToObjectPath( + const CIM_AssociatedSensor* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* CIM_AssociatedSensor_NameSpace( + CIM_AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void CIM_AssociatedSensor_SetObjectPath_Antecedent( + CIM_AssociatedSensor* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus CIM_AssociatedSensor_Set_Antecedent( + CIM_AssociatedSensor* self, + const CIM_SensorRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void CIM_AssociatedSensor_Null_Antecedent( + CIM_AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Null(field); + } +} + +KINLINE void CIM_AssociatedSensor_Clr_Antecedent( + CIM_AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Antecedent; + KRef_Clr(field); + } +} + +KINLINE void CIM_AssociatedSensor_SetObjectPath_Dependent( + CIM_AssociatedSensor* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus CIM_AssociatedSensor_Set_Dependent( + CIM_AssociatedSensor* self, + const CIM_ManagedSystemElementRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void CIM_AssociatedSensor_Null_Dependent( + CIM_AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Null(field); + } +} + +KINLINE void CIM_AssociatedSensor_Clr_Dependent( + CIM_AssociatedSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Dependent; + KRef_Clr(field); + } +} + +/* +**============================================================================== +** +** CIM_AssociatedSensor methods +** +**============================================================================== +*/ + +KINLINE CMPIStatus CIM_AssociatedSensor_DispatchMethod( + const CMPIBroker* cb, + CMPIMethodMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* meth, + const CMPIArgs* in, + CMPIArgs* out) +{ + CIM_AssociatedSensorRef self; + + KReturnIf(CIM_AssociatedSensorRef_InitFromObjectPath(&self, cb, cop)); + + + KReturn(ERR_METHOD_NOT_FOUND); +} + +#define CIM_AssociatedSensor_ClassName "CIM_AssociatedSensor" + +#endif /* _konkrete_CIM_AssociatedSensor_h */ Added: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_NumericSensor.h =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_NumericSensor.h (rev 0) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/CIM_NumericSensor.h 2008-08-20 21:10:23 UTC (rev 873) @@ -0,0 +1,6012 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_CIM_NumericSensor_h +#define _konkrete_CIM_NumericSensor_h + +#include <konkret/konkret.h> +#include "CIM_ConcreteJob.h" + +/* +**============================================================================== +** +** struct CIM_NumericSensorRef +** +**============================================================================== +*/ + +/* classname=CIM_NumericSensor */ +typedef struct _CIM_NumericSensorRef +{ + KBase __base; + /* CIM_ManagedElement features */ + /* CIM_ManagedSystemElement features */ + /* CIM_LogicalElement features */ + /* CIM_EnabledLogicalElement features */ + /* CIM_LogicalDevice features */ + const KString SystemCreationClassName; + const KString SystemName; + const KString CreationClassName; + const KString DeviceID; + /* CIM_Sensor features */ + /* CIM_NumericSensor features */ +} +CIM_NumericSensorRef; + +static const unsigned char __CIM_NumericSensorRef_sig[] = +{ + 0x11,0x43,0x49,0x4d,0x5f,0x4e,0x75,0x6d,0x65,0x72,0x69,0x63,0x53,0x65,0x6e, + 0x73,0x6f,0x72,0x00,0x04,0x4c,0x17,0x53,0x79,0x73,0x74,0x65,0x6d,0x43,0x72, + 0x65,0x61,0x74,0x69,0x6f,0x6e,0x43,0x6c,0x61,0x73,0x73,0x4e,0x61,0x6d,0x65, + 0x00,0x4c,0x0a,0x53,0x79,0x73,0x74,0x65,0x6d,0x4e,0x61,0x6d,0x65,0x00,0x4c, + 0x11,0x43,0x72,0x65,0x61,0x74,0x69,0x6f,0x6e,0x43,0x6c,0x61,0x73,0x73,0x4e, + 0x61,0x6d,0x65,0x00,0x4c,0x08,0x44,0x65,0x76,0x69,0x63,0x65,0x49,0x44,0x00, +}; + +KINLINE void CIM_NumericSensorRef_Init( + CIM_NumericSensorRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __CIM_NumericSensorRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus CIM_NumericSensorRef_InitFromInstance( + CIM_NumericSensorRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + CIM_NumericSensorRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus CIM_NumericSensorRef_InitFromObjectPath( + CIM_NumericSensorRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + CIM_NumericSensorRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void CIM_NumericSensorRef_Print( + const CIM_NumericSensorRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* CIM_NumericSensorRef_ToInstance( + const CIM_NumericSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* CIM_NumericSensorRef_ToObjectPath( + const CIM_NumericSensorRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* CIM_NumericSensorRef_NameSpace( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void CIM_NumericSensorRef_SetString_SystemCreationClassName( + CIM_NumericSensorRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemCreationClassName; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensorRef_Set_SystemCreationClassName( + CIM_NumericSensorRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemCreationClassName; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensorRef_Null_SystemCreationClassName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemCreationClassName; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensorRef_Clr_SystemCreationClassName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemCreationClassName; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensorRef_SetString_SystemName( + CIM_NumericSensorRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemName; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensorRef_Set_SystemName( + CIM_NumericSensorRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemName; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensorRef_Null_SystemName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemName; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensorRef_Clr_SystemName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->SystemName; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensorRef_SetString_CreationClassName( + CIM_NumericSensorRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->CreationClassName; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensorRef_Set_CreationClassName( + CIM_NumericSensorRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->CreationClassName; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensorRef_Null_CreationClassName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->CreationClassName; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensorRef_Clr_CreationClassName( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->CreationClassName; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensorRef_SetString_DeviceID( + CIM_NumericSensorRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->DeviceID; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensorRef_Set_DeviceID( + CIM_NumericSensorRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->DeviceID; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensorRef_Null_DeviceID( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->DeviceID; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensorRef_Clr_DeviceID( + CIM_NumericSensorRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->DeviceID; + KString_Clr(field); + } +} + +/* +**============================================================================== +** +** struct CIM_NumericSensor +** +**============================================================================== +*/ + +/* classname=CIM_NumericSensor */ +typedef struct _CIM_NumericSensor +{ + KBase __base; + /* CIM_ManagedElement features */ + const KString Caption; + const KString Description; + const KString ElementName; + /* CIM_ManagedSystemElement features */ + const KDateTime InstallDate; + const KString Name; + const KUint16A OperationalStatus; + const KStringA StatusDescriptions; + const KString Status; + const KUint16 HealthState; + const KUint16 PrimaryStatus; + const KUint16 DetailedStatus; + const KUint16 OperatingStatus; + const KUint16 CommunicationStatus; + /* CIM_LogicalElement features */ + /* CIM_EnabledLogicalElement features */ + const KUint16 EnabledState; + const KString OtherEnabledState; + const KUint16 RequestedState; + const KUint16 EnabledDefault; + const KDateTime TimeOfLastStateChange; + const KUint16A AvailableRequestedStates; + const KUint16 TransitioningToState; + /* CIM_LogicalDevice features */ + const KString SystemCreationClassName; + const KString SystemName; + const KString CreationClassName; + const KString DeviceID; + const KBoolean PowerManagementSupported; + const KUint16A PowerManagementCapabilities; + const KUint16 Availability; + const KUint16 StatusInfo; + const KUint32 LastErrorCode; + const KString ErrorDescription; + const KBoolean ErrorCleared; + const KStringA OtherIdentifyingInfo; + const KUint64 PowerOnHours; + const KUint64 TotalPowerOnHours; + const KStringA IdentifyingDescriptions; + const KUint16A AdditionalAvailability; + const KUint64 MaxQuiesceTime; + const KUint16 LocationIndicator; + /* CIM_Sensor features */ + const KUint16 SensorType; + const KString OtherSensorTypeDescription; + const KStringA PossibleStates; + const KString CurrentState; + const KUint64 PollingInterval; + const KString SensorContext; + /* CIM_NumericSensor features */ + const KUint16 BaseUnits; + const KSint32 UnitModifier; + const KUint16 RateUnits; + const KSint32 CurrentReading; + const KSint32 NominalReading; + const KSint32 NormalMax; + const KSint32 NormalMin; + const KSint32 MaxReadable; + const KSint32 MinReadable; + const KUint32 Resolution; + const KSint32 Tolerance; + const KSint32 Accuracy; + const KBoolean IsLinear; + const KUint32 Hysteresis; + const KSint32 LowerThresholdNonCritical; + const KSint32 UpperThresholdNonCritical; + const KSint32 LowerThresholdCritical; + const KSint32 UpperThresholdCritical; + const KSint32 LowerThresholdFatal; + const KSint32 UpperThresholdFatal; + const KUint16A SupportedThresholds; + const KUint16A EnabledThresholds; + const KUint16A SettableThresholds; + const KUint32 ProgrammaticAccuracy; + const KString AccuracyUnits; + const KUint16 ValueFormulation; +} +CIM_NumericSensor; + +static const unsigned char __CIM_NumericSensor_sig[] = +{ + 0x11,0x43,0x49,0x4d,0x5f,0x4e,0x75,0x6d,0x65,0x72,0x69,0x63,0x53,0x65,0x6e, + 0x73,0x6f,0x72,0x00,0x46,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f,0x6e,0x00, + 0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c, + 0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00,0x0d,0x0b, + 0x49,0x6e,0x73,0x74,0x61,0x6c,0x6c,0x44,0x61,0x74,0x65,0x00,0x0c,0x04,0x4e, + 0x61,0x6d,0x65,0x00,0x83,0x11,0x4f,0x70,0x65,0x72,0x61,0x74,0x69,0x6f,0x6e, + 0x61,0x6c,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x8c,0x12,0x53,0x74,0x61,0x74, + 0x75,0x73,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x73,0x00, + 0x0c,0x06,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x0b,0x48,0x65,0x61,0x6c, + 0x74,0x68,0x53,0x74,0x61,0x74,0x65,0x00,0x03,0x0d,0x50,0x72,0x69,0x6d,0x61, + 0x72,0x79,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x0e,0x44,0x65,0x74,0x61, + 0x69,0x6c,0x65,0x64,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x0f,0x4f,0x70, + 0x65,0x72,0x61,0x74,0x69,0x6e,0x67,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x03, + 0x13,0x43,0x6f,0x6d,0x6d,0x75,0x6e,0x69,0x63,0x61,0x74,0x69,0x6f,0x6e,0x53, + 0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x0c,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64, + 0x53,0x74,0x61,0x74,0x65,0x00,0x0c,0x11,0x4f,0x74,0x68,0x65,0x72,0x45,0x6e, + 0x61,0x62,0x6c,0x65,0x64,0x53,0x74,0x61,0x74,0x65,0x00,0x03,0x0e,0x52,0x65, + 0x71,0x75,0x65,0x73,0x74,0x65,0x64,0x53,0x74,0x61,0x74,0x65,0x00,0x03,0x0e, + 0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x44,0x65,0x66,0x61,0x75,0x6c,0x74,0x00, + 0x0d,0x15,0x54,0x69,0x6d,0x65,0x4f,0x66,0x4c,0x61,0x73,0x74,0x53,0x74,0x61, + 0x74,0x65,0x43,0x68,0x61,0x6e,0x67,0x65,0x00,0x83,0x18,0x41,0x76,0x61,0x69, + 0x6c,0x61,0x62,0x6c,0x65,0x52,0x65,0x71,0x75,0x65,0x73,0x74,0x65,0x64,0x53, + 0x74,0x61,0x74,0x65,0x73,0x00,0x03,0x14,0x54,0x72,0x61,0x6e,0x73,0x69,0x74, + 0x69,0x6f,0x6e,0x69,0x6e,0x67,0x54,0x6f,0x53,0x74,0x61,0x74,0x65,0x00,0x4c, + 0x17,0x53,0x79,0x73,0x74,0x65,0x6d,0x43,0x72,0x65,0x61,0x74,0x69,0x6f,0x6e, + 0x43,0x6c,0x61,0x73,0x73,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x53,0x79,0x73, + 0x74,0x65,0x6d,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x11,0x43,0x72,0x65,0x61,0x74, + 0x69,0x6f,0x6e,0x43,0x6c,0x61,0x73,0x73,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x08, + 0x44,0x65,0x76,0x69,0x63,0x65,0x49,0x44,0x00,0x00,0x18,0x50,0x6f,0x77,0x65, + 0x72,0x4d,0x61,0x6e,0x61,0x67,0x65,0x6d,0x65,0x6e,0x74,0x53,0x75,0x70,0x70, + 0x6f,0x72,0x74,0x65,0x64,0x00,0x83,0x1b,0x50,0x6f,0x77,0x65,0x72,0x4d,0x61, + 0x6e,0x61,0x67,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62,0x69,0x6c, + 0x69,0x74,0x69,0x65,0x73,0x00,0x03,0x0c,0x41,0x76,0x61,0x69,0x6c,0x61,0x62, + 0x69,0x6c,0x69,0x74,0x79,0x00,0x03,0x0a,0x53,0x74,0x61,0x74,0x75,0x73,0x49, + 0x6e,0x66,0x6f,0x00,0x05,0x0d,0x4c,0x61,0x73,0x74,0x45,0x72,0x72,0x6f,0x72, + 0x43,0x6f,0x64,0x65,0x00,0x0c,0x10,0x45,0x72,0x72,0x6f,0x72,0x44,0x65,0x73, + 0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x00,0x0c,0x45,0x72,0x72,0x6f, + 0x72,0x43,0x6c,0x65,0x61,0x72,0x65,0x64,0x00,0x8c,0x14,0x4f,0x74,0x68,0x65, + 0x72,0x49,0x64,0x65,0x6e,0x74,0x69,0x66,0x79,0x69,0x6e,0x67,0x49,0x6e,0x66, + 0x6f,0x00,0x07,0x0c,0x50,0x6f,0x77,0x65,0x72,0x4f,0x6e,0x48,0x6f,0x75,0x72, + 0x73,0x00,0x07,0x11,0x54,0x6f,0x74,0x61,0x6c,0x50,0x6f,0x77,0x65,0x72,0x4f, + 0x6e,0x48,0x6f,0x75,0x72,0x73,0x00,0x8c,0x17,0x49,0x64,0x65,0x6e,0x74,0x69, + 0x66,0x79,0x69,0x6e,0x67,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f, + 0x6e,0x73,0x00,0x83,0x16,0x41,0x64,0x64,0x69,0x74,0x69,0x6f,0x6e,0x61,0x6c, + 0x41,0x76,0x61,0x69,0x6c,0x61,0x62,0x69,0x6c,0x69,0x74,0x79,0x00,0x07,0x0e, + 0x4d,0x61,0x78,0x51,0x75,0x69,0x65,0x73,0x63,0x65,0x54,0x69,0x6d,0x65,0x00, + 0x03,0x11,0x4c,0x6f,0x63,0x61,0x74,0x69,0x6f,0x6e,0x49,0x6e,0x64,0x69,0x63, + 0x61,0x74,0x6f,0x72,0x00,0x03,0x0a,0x53,0x65,0x6e,0x73,0x6f,0x72,0x54,0x79, + 0x70,0x65,0x00,0x0c,0x1a,0x4f,0x74,0x68,0x65,0x72,0x53,0x65,0x6e,0x73,0x6f, + 0x72,0x54,0x79,0x70,0x65,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f, + 0x6e,0x00,0x8c,0x0e,0x50,0x6f,0x73,0x73,0x69,0x62,0x6c,0x65,0x53,0x74,0x61, + 0x74,0x65,0x73,0x00,0x0c,0x0c,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x53,0x74, + 0x61,0x74,0x65,0x00,0x07,0x0f,0x50,0x6f,0x6c,0x6c,0x69,0x6e,0x67,0x49,0x6e, + 0x74,0x65,0x72,0x76,0x61,0x6c,0x00,0x0c,0x0d,0x53,0x65,0x6e,0x73,0x6f,0x72, + 0x43,0x6f,0x6e,0x74,0x65,0x78,0x74,0x00,0x03,0x09,0x42,0x61,0x73,0x65,0x55, + 0x6e,0x69,0x74,0x73,0x00,0x06,0x0c,0x55,0x6e,0x69,0x74,0x4d,0x6f,0x64,0x69, + 0x66,0x69,0x65,0x72,0x00,0x03,0x09,0x52,0x61,0x74,0x65,0x55,0x6e,0x69,0x74, + 0x73,0x00,0x06,0x0e,0x43,0x75,0x72,0x72,0x65,0x6e,0x74,0x52,0x65,0x61,0x64, + 0x69,0x6e,0x67,0x00,0x06,0x0e,0x4e,0x6f,0x6d,0x69,0x6e,0x61,0x6c,0x52,0x65, + 0x61,0x64,0x69,0x6e,0x67,0x00,0x06,0x09,0x4e,0x6f,0x72,0x6d,0x61,0x6c,0x4d, + 0x61,0x78,0x00,0x06,0x09,0x4e,0x6f,0x72,0x6d,0x61,0x6c,0x4d,0x69,0x6e,0x00, + 0x06,0x0b,0x4d,0x61,0x78,0x52,0x65,0x61,0x64,0x61,0x62,0x6c,0x65,0x00,0x06, + 0x0b,0x4d,0x69,0x6e,0x52,0x65,0x61,0x64,0x61,0x62,0x6c,0x65,0x00,0x05,0x0a, + 0x52,0x65,0x73,0x6f,0x6c,0x75,0x74,0x69,0x6f,0x6e,0x00,0x06,0x09,0x54,0x6f, + 0x6c,0x65,0x72,0x61,0x6e,0x63,0x65,0x00,0x06,0x08,0x41,0x63,0x63,0x75,0x72, + 0x61,0x63,0x79,0x00,0x00,0x08,0x49,0x73,0x4c,0x69,0x6e,0x65,0x61,0x72,0x00, + 0x05,0x0a,0x48,0x79,0x73,0x74,0x65,0x72,0x65,0x73,0x69,0x73,0x00,0x06,0x19, + 0x4c,0x6f,0x77,0x65,0x72,0x54,0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x4e, + 0x6f,0x6e,0x43,0x72,0x69,0x74,0x69,0x63,0x61,0x6c,0x00,0x06,0x19,0x55,0x70, + 0x70,0x65,0x72,0x54,0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x4e,0x6f,0x6e, + 0x43,0x72,0x69,0x74,0x69,0x63,0x61,0x6c,0x00,0x06,0x16,0x4c,0x6f,0x77,0x65, + 0x72,0x54,0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x43,0x72,0x69,0x74,0x69, + 0x63,0x61,0x6c,0x00,0x06,0x16,0x55,0x70,0x70,0x65,0x72,0x54,0x68,0x72,0x65, + 0x73,0x68,0x6f,0x6c,0x64,0x43,0x72,0x69,0x74,0x69,0x63,0x61,0x6c,0x00,0x06, + 0x13,0x4c,0x6f,0x77,0x65,0x72,0x54,0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64, + 0x46,0x61,0x74,0x61,0x6c,0x00,0x06,0x13,0x55,0x70,0x70,0x65,0x72,0x54,0x68, + 0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x46,0x61,0x74,0x61,0x6c,0x00,0x83,0x13, + 0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x54,0x68,0x72,0x65,0x73,0x68, + 0x6f,0x6c,0x64,0x73,0x00,0x83,0x11,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x54, + 0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x73,0x00,0x83,0x12,0x53,0x65,0x74, + 0x74,0x61,0x62,0x6c,0x65,0x54,0x68,0x72,0x65,0x73,0x68,0x6f,0x6c,0x64,0x73, + 0x00,0x05,0x14,0x50,0x72,0x6f,0x67,0x72,0x61,0x6d,0x6d,0x61,0x74,0x69,0x63, + 0x41,0x63,0x63,0x75,0x72,0x61,0x63,0x79,0x00,0x0c,0x0d,0x41,0x63,0x63,0x75, + 0x72,0x61,0x63,0x79,0x55,0x6e,0x69,0x74,0x73,0x00,0x03,0x10,0x56,0x61,0x6c, + 0x75,0x65,0x46,0x6f,0x72,0x6d,0x75,0x6c,0x61,0x74,0x69,0x6f,0x6e,0x00, +}; + +KINLINE void CIM_NumericSensor_Init( + CIM_NumericSensor* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __CIM_NumericSensor_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus CIM_NumericSensor_InitFromInstance( + CIM_NumericSensor* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + CIM_NumericSensor_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus CIM_NumericSensor_InitFromObjectPath( + CIM_NumericSensor* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + CIM_NumericSensor_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void CIM_NumericSensor_Print( + const CIM_NumericSensor* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* CIM_NumericSensor_ToInstance( + const CIM_NumericSensor* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* CIM_NumericSensor_ToObjectPath( + const CIM_NumericSensor* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* CIM_NumericSensor_NameSpace( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void CIM_NumericSensor_SetString_Caption( + CIM_NumericSensor* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensor_Set_Caption( + CIM_NumericSensor* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensor_Null_Caption( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensor_Clr_Caption( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensor_SetString_Description( + CIM_NumericSensor* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensor_Set_Description( + CIM_NumericSensor* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensor_Null_Description( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensor_Clr_Description( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensor_SetString_ElementName( + CIM_NumericSensor* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensor_Set_ElementName( + CIM_NumericSensor* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensor_Null_ElementName( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensor_Clr_ElementName( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Clr(field); + } +} + +KINLINE void CIM_NumericSensor_Set_InstallDate( + CIM_NumericSensor* self, + CMPIDateTime* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KDateTime* field = (KDateTime*)&self->InstallDate; + KDateTime_Set(field, x); + } +} + +KINLINE void CIM_NumericSensor_Null_InstallDate( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KDateTime* field = (KDateTime*)&self->InstallDate; + KDateTime_Null(field); + } +} + +KINLINE void CIM_NumericSensor_Clr_InstallDate( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KDateTime* field = (KDateTime*)&self->InstallDate; + KDateTime_Clr(field); + } +} + +KINLINE void CIM_NumericSensor_SetString_Name( + CIM_NumericSensor* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Name; + KString_SetString(field, x); + } +} + +KINLINE void CIM_NumericSensor_Set_Name( + CIM_NumericSensor* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Name; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void CIM_NumericSensor_Null_Name( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Name; + KString_Null(field); + } +} + +KINLINE void CIM_NumericSensor_Clr_Name( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Name; + KString_Clr(field); + } +} + +KINLINE CMPIBoolean CIM_NumericSensor_Init_OperationalStatus( + CIM_NumericSensor* self, + CMPICount count) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + return KUint16A_Init(field, self->__base.cb, count); + } + return 0; +} + +KINLINE void CIM_NumericSensor_InitNull_OperationalStatus( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + KUint16A_InitNull(field); + } +} + +KINLINE CMPIBoolean CIM_NumericSensor_Set_OperationalStatus( + CIM_NumericSensor* self, + CMPICount i, + CMPIUint16 x) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + return KUint16A_Set(field, i, x); + } + return 0; +} + +KINLINE KUint16 CIM_NumericSensor_Get_OperationalStatus( + CIM_NumericSensor* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + return KUint16A_Get(field, i); + } + return KUint16A_Get(NULL, 0); +} + +KINLINE CMPIBoolean CIM_NumericSensor_Null_OperationalStatus( + CIM_NumericSensor* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + return KUint16A_Null(field, i); + } + return 0; +} + +KINLINE void CIM_NumericSensor_Clr_OperationalStatus( + CIM_NumericSensor* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->OperationalStatus; + KUint16A_Clr(field); + } +} + +typedef enum _CIM_NumericSensor_OperationalStatus_Enum +{ + CIM_NumericSensor_OperationalStatus_Unknown = 0, + CIM_NumericSensor_OperationalStatus_Other = 1, + CIM_NumericSensor_OperationalStatus_OK = 2, + CIM_NumericSensor_OperationalStatus_Degraded = 3, + CIM_NumericSensor_OperationalStatus_Stressed = 4, + CIM_NumericSensor_OperationalStatus_Predictive_Failure = 5, + CIM_NumericSensor_OperationalStatus_Error = 6, + CIM_NumericSensor_OperationalStatus_Non_Recoverable_Error = 7, + CIM_NumericSensor_OperationalStatus_Starting = 8, + CIM_NumericSensor_OperationalStatus_Stopping = 9, + CIM_NumericSensor_OperationalStatus_Stopped = 10, + CIM_NumericSensor_OperationalStatus_In_Service = 11, + CIM_NumericSensor_OperationalStatus_No_Contact = 12, + CIM_NumericSensor_OperationalStatus_Lost_Communication = 13, + CIM_NumericSensor_OperationalStatus_Aborted = 14, + CIM_NumericSensor_OperationalStatus_Dormant = 15, + CIM_NumericSensor_OperationalStatus_Supporting_Entity_in_Error = 16, + CIM_NumericSensor_OperationalStatus_Completed = 17, + CIM_NumericSensor_OperationalStatus_Power_Mode = 18, + CIM_NumericSensor_OperationalStatus_DMTF_Reserved = 0, + CIM_NumericSensor_OperationalStatus_Vendor_Reserved = 0, +} +CIM_NumericSensor_OperationalStatus_Enum; + +/* "Unknown" */ +#define CIM_NumericSensor_Set_OperationalStatus_Unknown(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 0) + +/* "Other" */ +#define CIM_NumericSensor_Set_OperationalStatus_Other(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 1) + +/* "OK" */ +#define CIM_NumericSensor_Set_OperationalStatus_OK(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 2) + +/* "Degraded" */ +#define CIM_NumericSensor_Set_OperationalStatus_Degraded(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 3) + +/* "Stressed" */ +#define CIM_NumericSensor_Set_OperationalStatus_Stressed(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 4) + +/* "Predictive Failure" */ +#define CIM_NumericSensor_Set_OperationalStatus_Predictive_Failure(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 5) + +/* "Error" */ +#define CIM_NumericSensor_Set_OperationalStatus_Error(SELF, INDEX)\ + CIM_NumericSensor_Set_OperationalStatus(SELF, INDEX, 6) + +/* "Non-Recoverable Error" */ +#de... [truncated message content] |
From: <mik...@us...> - 2008-08-19 23:49:12
|
Revision: 872 http://omc.svn.sourceforge.net/omc/?rev=872&view=rev Author: mike-brasher Date: 2008-08-19 23:49:21 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Expanded profile tests to find all associators associated through profile related classes. Modified Paths: -------------- cmpiprofiles/test/trunk/ProfileTest.py Added Paths: ----------- cmpiprofiles/test/trunk/Makefile Added: cmpiprofiles/test/trunk/Makefile =================================================================== --- cmpiprofiles/test/trunk/Makefile (rev 0) +++ cmpiprofiles/test/trunk/Makefile 2008-08-19 23:49:21 UTC (rev 872) @@ -0,0 +1,17 @@ + +help: + @ echo "targets: all sanity profiles" + +all: sanity profiles + +sanity: + ./AllSanityTest.py --url=http://localhost + +URL=http://localhost + +profiles: + @ ./ProfileTest.py --url $(URL) Linux_EthernetPort Linux_EthernetPortRegisteredProfile + @ ./ProfileTest.py --url $(URL) Linux_BootService Linux_BootRegisteredProfile + @ ./ProfileTest.py --url $(URL) Linux_SSHProtocolService Linux_SSHRegisteredProfile + @ ./ProfileTest.py --url $(URL) Linux_Fan Linux_FanRegisteredProfile + @ ./ProfileTest.py --url $(URL) Linux_PowerSupply Linux_PowerSupplyRegisteredProfile Modified: cmpiprofiles/test/trunk/ProfileTest.py =================================================================== --- cmpiprofiles/test/trunk/ProfileTest.py 2008-08-19 22:16:16 UTC (rev 871) +++ cmpiprofiles/test/trunk/ProfileTest.py 2008-08-19 23:49:21 UTC (rev 872) @@ -43,31 +43,72 @@ globalParser=p # Get centralClassName argument: - if (len(arguments) == 0): - print "missing central class argument\n" + if len(arguments) != 2: + print "error: need centrl-class registered-profile-class args\n" sys.exit(1) centralClassName = arguments[0]; + registeredProfileClassName = arguments[1]; + print ">>>> Now Testing Profile: [%s]" %(centralClassName) + # Create connection. c = wbem_connection.WBEMConnFromOptions(p) - # For each instance of the central class. + # Find instances of the central class. + names = c.EnumerateInstanceNames(centralClassName) if len(names) == 0: print "no instances of the central class found: %s" %(centralClassName) sys.exit(1) - # Each instance of central class must have exactly one associator of type - # CIM_Registered profile. + # For each instance of central class be sure there is exactly one + # RegisteredProfile instance (associated through ElementConformsToProfile). for name in names: inst = c.GetInstance(name) - assocs = c.Associators(name, AssocClass='CIM_ElementConformsToProfile') + # Find associators through ElementConformsToProfile. + + assocs = c.AssociatorNames( \ + name, AssocClass='CIM_ElementConformsToProfile') + if len(assocs) != 1: print "error: expected instance of central class to have 1 " \ "associator through CIM_ElementConformsToProfile but found %d" \ %(len(assocs)) sys.exit(1) + + # Get RegisteredProfile instance. + + assoc = assocs[0] + inst = c.GetInstance(assocs[0]) + + if inst.classname != registeredProfileClassName: + print "expected registered profile classname to be %s but got %s" \ + %(registeredProfileClassName, inst.classname) + sys.exit(1) + + # Be sure there is an association between RegisteredProfile instance + # and ComputerSystem through ReferenceProfile. + # [RegisteredProfile<-ReferenceProfile->ComputerSystem] + + assocs = c.AssociatorNames( \ + assoc, AssocClass='CIM_ReferencedProfile') + + if len(assocs) != 1: + print "error: expected instance of registered profile to have 1 " \ + "associator through CIM_ReferencedProfile but found %d" \ + %(len(assocs)) + sys.exit(1) + + # Expect CIM_RegisteredProfile.InstanceID='SBLIM:Base_Computer' + # associator. + + assoc = assocs[0] + + if assoc['InstanceID'] != 'SBLIM:Base_Computer': + print "expected " \ + "CIM_RegisteredProfile.InstanceID='SBLIM:Base_Computer'" + sys.exit(1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 22:16:07
|
Revision: 871 http://omc.svn.sourceforge.net/omc/?rev=871&view=rev Author: mike-brasher Date: 2008-08-19 22:16:16 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Updated cleanup.sh scripts to remove dist file. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/cleanup.sh cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/cleanup.sh cmpiprofiles/sblim-cmpi-fan_profile/trunk/cleanup.sh cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/cleanup.sh cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/cleanup.sh Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/cleanup.sh =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/cleanup.sh 2008-08-19 22:13:22 UTC (rev 870) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/cleanup.sh 2008-08-19 22:16:16 UTC (rev 871) @@ -25,4 +25,5 @@ Makefile \ mof/Makefile \ src/.deps \ - src/Makefile + src/Makefile \ + sblim-cmpi-boot_control_profile-1.0.0.tar.gz Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/cleanup.sh =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/cleanup.sh 2008-08-19 22:13:22 UTC (rev 870) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/cleanup.sh 2008-08-19 22:16:16 UTC (rev 871) @@ -25,4 +25,5 @@ Makefile \ mof/Makefile \ src/.deps \ - src/Makefile + src/Makefile \ + sblim-cmpi-ethport_profile-1.0.0.tar.gz Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/cleanup.sh =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/cleanup.sh 2008-08-19 22:13:22 UTC (rev 870) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/cleanup.sh 2008-08-19 22:16:16 UTC (rev 871) @@ -16,4 +16,5 @@ install-sh \ mof/Makefile.in \ src/Makefile.in \ - config.h.in~ + config.h.in~ \ + sblim-cmpi-fan_profile-1.0.0.tar.gz Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/cleanup.sh =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/cleanup.sh 2008-08-19 22:13:22 UTC (rev 870) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/cleanup.sh 2008-08-19 22:16:16 UTC (rev 871) @@ -25,4 +25,5 @@ Makefile \ mof/Makefile \ src/.deps \ - src/Makefile + src/Makefile \ + sblim-cmpi-power_supply_profile-1.0.0.tar.gz Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/cleanup.sh =================================================================== --- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/cleanup.sh 2008-08-19 22:13:22 UTC (rev 870) +++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/cleanup.sh 2008-08-19 22:16:16 UTC (rev 871) @@ -25,5 +25,5 @@ Makefile \ mof/Makefile \ src/.deps \ - src/Makefile - + src/Makefile \ + sblim-cmpi-ssh_service_profile-1.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 22:13:11
|
Revision: 870 http://omc.svn.sourceforge.net/omc/?rev=870&view=rev Author: mike-brasher Date: 2008-08-19 22:13:22 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Updated top level makefile. Modified Paths: -------------- cmpiprofiles/Makefile Modified: cmpiprofiles/Makefile =================================================================== --- cmpiprofiles/Makefile 2008-08-19 22:11:47 UTC (rev 869) +++ cmpiprofiles/Makefile 2008-08-19 22:13:22 UTC (rev 870) @@ -27,6 +27,9 @@ distclean: $(foreach i,$(DIRS), $(MAKE) -C $i distclean; $(NL) ) +distcheck: + $(foreach i,$(DIRS), $(MAKE) -C $i distcheck; $(NL) ) + cleanup: $(foreach i,$(DIRS), cd $i; ./cleanup.sh ; $(NL) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 22:11:37
|
Revision: 869 http://omc.svn.sourceforge.net/omc/?rev=869&view=rev Author: mike-brasher Date: 2008-08-19 22:11:47 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Renamed files. Added Paths: ----------- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilities.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilitiesProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledElementCapabilities.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledLogicalElementCapabilities.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledLogicalElementCapabilitiesProvider.c Added: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilities.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilities.h (rev 0) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilities.h 2008-08-19 22:11:47 UTC (rev 869) @@ -0,0 +1,484 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_LANEndpointElementCapabilities_h +#define _konkrete_LANEndpointElementCapabilities_h + +#include <konkret/konkret.h> +#include "LANEndpoint.h" +#include "LANEndpointEnabledLogicalElementCapabilities.h" + +/* +**============================================================================== +** +** struct LANEndpointElementCapabilitiesRef +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointElementCapabilities */ +typedef struct _LANEndpointElementCapabilitiesRef +{ + KBase __base; + /* CIM_ElementCapabilities features */ + const KRef ManagedElement; /* LANEndpoint */ + const KRef Capabilities; /* LANEndpointEnabledLogicalElementCapabilities */ + /* Linux_LANEndpointElementCapabilities features */ +} +LANEndpointElementCapabilitiesRef; + +static const unsigned char __LANEndpointElementCapabilitiesRef_sig[] = +{ + 0x24,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62, + 0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x02,0x4e,0x0e,0x4d,0x61,0x6e,0x61, + 0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43,0x61, + 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00, +}; + +KINLINE void LANEndpointElementCapabilitiesRef_Init( + LANEndpointElementCapabilitiesRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointElementCapabilitiesRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->ManagedElement)->__sig = __LANEndpoint_sig; + ((KRef*)&self->Capabilities)->__sig = __LANEndpointEnabledLogicalElementCapabilities_sig; +} + +KINLINE CMPIStatus LANEndpointElementCapabilitiesRef_InitFromInstance( + LANEndpointElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointElementCapabilitiesRef_InitFromObjectPath( + LANEndpointElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointElementCapabilitiesRef_Print( + const LANEndpointElementCapabilitiesRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* LANEndpointElementCapabilitiesRef_ToInstance( + const LANEndpointElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointElementCapabilitiesRef_ToObjectPath( + const LANEndpointElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointElementCapabilitiesRef_NameSpace( + LANEndpointElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointElementCapabilitiesRef_SetObjectPath_ManagedElement( + LANEndpointElementCapabilitiesRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus LANEndpointElementCapabilitiesRef_Set_ManagedElement( + LANEndpointElementCapabilitiesRef* self, + const LANEndpointRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void LANEndpointElementCapabilitiesRef_Null_ManagedElement( + LANEndpointElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_Null(field); + } +} + +KINLINE void LANEndpointElementCapabilitiesRef_Clr_ManagedElement( + LANEndpointElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_Clr(field); + } +} + +KINLINE void LANEndpointElementCapabilitiesRef_SetObjectPath_Capabilities( + LANEndpointElementCapabilitiesRef* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus LANEndpointElementCapabilitiesRef_Set_Capabilities( + LANEndpointElementCapabilitiesRef* self, + const LANEndpointEnabledLogicalElementCapabilitiesRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void LANEndpointElementCapabilitiesRef_Null_Capabilities( + LANEndpointElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_Null(field); + } +} + +KINLINE void LANEndpointElementCapabilitiesRef_Clr_Capabilities( + LANEndpointElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_Clr(field); + } +} + +/* +**============================================================================== +** +** struct LANEndpointElementCapabilities +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointElementCapabilities */ +typedef struct _LANEndpointElementCapabilities +{ + KBase __base; + /* CIM_ElementCapabilities features */ + const KRef ManagedElement; /* LANEndpoint */ + const KRef Capabilities; /* LANEndpointEnabledLogicalElementCapabilities */ + const KUint16A Characteristics; + /* Linux_LANEndpointElementCapabilities features */ +} +LANEndpointElementCapabilities; + +static const unsigned char __LANEndpointElementCapabilities_sig[] = +{ + 0x24,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62, + 0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x03,0x4e,0x0e,0x4d,0x61,0x6e,0x61, + 0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43,0x61, + 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x83,0x0f,0x43,0x68, + 0x61,0x72,0x61,0x63,0x74,0x65,0x72,0x69,0x73,0x74,0x69,0x63,0x73,0x00, +}; + +KINLINE void LANEndpointElementCapabilities_Init( + LANEndpointElementCapabilities* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointElementCapabilities_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); + ((KRef*)&self->ManagedElement)->__sig = __LANEndpoint_sig; + ((KRef*)&self->Capabilities)->__sig = __LANEndpointEnabledLogicalElementCapabilities_sig; +} + +KINLINE CMPIStatus LANEndpointElementCapabilities_InitFromInstance( + LANEndpointElementCapabilities* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointElementCapabilities_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointElementCapabilities_InitFromObjectPath( + LANEndpointElementCapabilities* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointElementCapabilities_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointElementCapabilities_Print( + const LANEndpointElementCapabilities* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* LANEndpointElementCapabilities_ToInstance( + const LANEndpointElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointElementCapabilities_ToObjectPath( + const LANEndpointElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointElementCapabilities_NameSpace( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointElementCapabilities_SetObjectPath_ManagedElement( + LANEndpointElementCapabilities* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus LANEndpointElementCapabilities_Set_ManagedElement( + LANEndpointElementCapabilities* self, + const LANEndpointRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void LANEndpointElementCapabilities_Null_ManagedElement( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_Null(field); + } +} + +KINLINE void LANEndpointElementCapabilities_Clr_ManagedElement( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->ManagedElement; + KRef_Clr(field); + } +} + +KINLINE void LANEndpointElementCapabilities_SetObjectPath_Capabilities( + LANEndpointElementCapabilities* self, + const CMPIObjectPath* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_SetObjectPath(field, x); + } +} + +KINLINE CMPIStatus LANEndpointElementCapabilities_Set_Capabilities( + LANEndpointElementCapabilities* self, + const LANEndpointEnabledLogicalElementCapabilitiesRef* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + return KRef_Set(field, &x->__base); + } + CMReturn(CMPI_RC_ERR_FAILED); +} + +KINLINE void LANEndpointElementCapabilities_Null_Capabilities( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_Null(field); + } +} + +KINLINE void LANEndpointElementCapabilities_Clr_Capabilities( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KRef* field = (KRef*)&self->Capabilities; + KRef_Clr(field); + } +} + +KINLINE CMPIBoolean LANEndpointElementCapabilities_Init_Characteristics( + LANEndpointElementCapabilities* self, + CMPICount count) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + return KUint16A_Init(field, self->__base.cb, count); + } + return 0; +} + +KINLINE void LANEndpointElementCapabilities_InitNull_Characteristics( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + KUint16A_InitNull(field); + } +} + +KINLINE CMPIBoolean LANEndpointElementCapabilities_Set_Characteristics( + LANEndpointElementCapabilities* self, + CMPICount i, + CMPIUint16 x) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + return KUint16A_Set(field, i, x); + } + return 0; +} + +KINLINE KUint16 LANEndpointElementCapabilities_Get_Characteristics( + LANEndpointElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + return KUint16A_Get(field, i); + } + return KUint16A_Get(NULL, 0); +} + +KINLINE CMPIBoolean LANEndpointElementCapabilities_Null_Characteristics( + LANEndpointElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + return KUint16A_Null(field, i); + } + return 0; +} + +KINLINE void LANEndpointElementCapabilities_Clr_Characteristics( + LANEndpointElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->Characteristics; + KUint16A_Clr(field); + } +} + +typedef enum _LANEndpointElementCapabilities_Characteristics_Enum +{ + LANEndpointElementCapabilities_Characteristics_Default = 2, + LANEndpointElementCapabilities_Characteristics_Current = 3, + LANEndpointElementCapabilities_Characteristics_DMTF_Reserved = 0, + LANEndpointElementCapabilities_Characteristics_Vendor_Specific = 32768, +} +LANEndpointElementCapabilities_Characteristics_Enum; + +/* "Default" */ +#define LANEndpointElementCapabilities_Set_Characteristics_Default(SELF, INDEX)\ + LANEndpointElementCapabilities_Set_Characteristics(SELF, INDEX, 2) + +/* "Current" */ +#define LANEndpointElementCapabilities_Set_Characteristics_Current(SELF, INDEX)\ + LANEndpointElementCapabilities_Set_Characteristics(SELF, INDEX, 3) + +/* "DMTF Reserved" */ +#define LANEndpointElementCapabilities_Set_Characteristics_DMTF_Reserved(SELF, INDEX)\ + LANEndpointElementCapabilities_Set_Characteristics(SELF, INDEX, 0) + +/* "Vendor Specific" */ +#define LANEndpointElementCapabilities_Set_Characteristics_Vendor_Specific(SELF, INDEX)\ + LANEndpointElementCapabilities_Set_Characteristics(SELF, INDEX, 32768) + +/* +**============================================================================== +** +** LANEndpointElementCapabilities methods +** +**============================================================================== +*/ + +KINLINE CMPIStatus LANEndpointElementCapabilities_DispatchMethod( + const CMPIBroker* cb, + CMPIMethodMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* meth, + const CMPIArgs* in, + CMPIArgs* out) +{ + LANEndpointElementCapabilitiesRef self; + + KReturnIf(LANEndpointElementCapabilitiesRef_InitFromObjectPath(&self, cb, cop)); + + + KReturn(ERR_METHOD_NOT_FOUND); +} + +#define LANEndpointElementCapabilities_ClassName "Linux_LANEndpointElementCapabilities" + +#endif /* _konkrete_LANEndpointElementCapabilities_h */ Added: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilitiesProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilitiesProvider.c (rev 0) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointElementCapabilitiesProvider.c 2008-08-19 22:11:47 UTC (rev 869) @@ -0,0 +1,218 @@ +#include <konkret/konkret.h> +#include "LANEndpointElementCapabilities.h" +#include "Resource.h" + +static const CMPIBroker* _cb; + +static void LANEndpointElementCapabilitiesInitialize() +{ +} + +static CMPIStatus LANEndpointElementCapabilitiesCleanup( + CMPIInstanceMI* mi, + const CMPIContext* cc, + CMPIBoolean term) +{ + CMReturn(CMPI_RC_OK); +} + +static CMPIStatus LANEndpointElementCapabilitiesEnumInstanceNames( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop) +{ + return KDefaultEnumerateInstanceNames( + _cb, mi, cc, cr, cop); +} + +static CMPIStatus LANEndpointElementCapabilitiesEnumInstances( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char** properties) +{ + LANEndpointEnabledLogicalElementCapabilitiesRef x; + + LANEndpointEnabledLogicalElementCapabilitiesRef_Init( + &x, _cb, KNameSpace(cop)); + LANEndpointEnabledLogicalElementCapabilitiesRef_Set_InstanceID( + &x, "SBLIM:LANEndpoint"); + + return KDefaultEnumerateInstancesOneToAll( + _cb, + cc, + cr, + cop, + LANEndpointEnabledLogicalElementCapabilitiesRef_ToObjectPath(&x, NULL), + "Capabilities", + CMNewObjectPath(_cb, KNameSpace(cop), "Linux_LANEndpoint", NULL), + "ManagedElement"); +} + +static CMPIStatus LANEndpointElementCapabilitiesGetInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char** properties) +{ + return KDefaultGetInstance( + _cb, mi, cc, cr, cop, properties); +} + +static CMPIStatus LANEndpointElementCapabilitiesCreateInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const CMPIInstance* ci) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus LANEndpointElementCapabilitiesModifyInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const CMPIInstance* ci, + const char**properties) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus LANEndpointElementCapabilitiesDeleteInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus LANEndpointElementCapabilitiesExecQuery( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* lang, + const char* query) +{ + CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); +} + +static CMPIStatus LANEndpointElementCapabilitiesAssociationCleanup( + CMPIAssociationMI* mi, + const CMPIContext* cc, + CMPIBoolean term) +{ + CMReturn(CMPI_RC_OK); +} + +static CMPIStatus LANEndpointElementCapabilitiesAssociators( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* resultClass, + const char* role, + const char* resultRole, + const char** properties) +{ + return KDefaultAssociators( + _cb, + mi, + cc, + cr, + cop, + LANEndpointElementCapabilities_ClassName, + assocClass, + resultClass, + role, + resultRole, + properties); +} + +static CMPIStatus LANEndpointElementCapabilitiesAssociatorNames( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* resultClass, + const char* role, + const char* resultRole) +{ + return KDefaultAssociatorNames( + _cb, + mi, + cc, + cr, + cop, + LANEndpointElementCapabilities_ClassName, + assocClass, + resultClass, + role, + resultRole); +} + +static CMPIStatus LANEndpointElementCapabilitiesReferences( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* role, + const char** properties) +{ + return KDefaultReferences( + _cb, + mi, + cc, + cr, + cop, + LANEndpointElementCapabilities_ClassName, + assocClass, + role, + properties); +} + +static CMPIStatus LANEndpointElementCapabilitiesReferenceNames( + CMPIAssociationMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* assocClass, + const char* role) +{ + return KDefaultReferenceNames( + _cb, + mi, + cc, + cr, + cop, + LANEndpointElementCapabilities_ClassName, + assocClass, + role); +} + +CMInstanceMIStub( + LANEndpointElementCapabilities, + Linux_LANEndpointElementCapabilities, + _cb, + LANEndpointElementCapabilitiesInitialize()) + +CMAssociationMIStub( + LANEndpointElementCapabilities, + Linux_LANEndpointElementCapabilities, + _cb, + LANEndpointElementCapabilitiesInitialize()) + +KONKRET_REGISTRATION( + "root/cimv2", + "Linux_LANEndpointElementCapabilities", + "Linux_LANEndpointElementCapabilities", + "instance association") Added: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledElementCapabilities.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledElementCapabilities.h (rev 0) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledElementCapabilities.h 2008-08-19 22:11:47 UTC (rev 869) @@ -0,0 +1,851 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_LANEndpointEnabledElementCapabilities_h +#define _konkrete_LANEndpointEnabledElementCapabilities_h + +#include <konkret/konkret.h> + +/* +**============================================================================== +** +** struct LANEndpointEnabledElementCapabilitiesRef +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointEnabledLogicalElementCapabilities */ +typedef struct _LANEndpointEnabledElementCapabilitiesRef +{ + KBase __base; + /* CIM_ManagedElement features */ + /* CIM_Capabilities features */ + const KString InstanceID; + /* CIM_EnabledLogicalElementCapabilities features */ + /* Linux_LANEndpointEnabledLogicalElementCapabilities features */ +} +LANEndpointEnabledElementCapabilitiesRef; + +static const unsigned char __LANEndpointEnabledElementCapabilitiesRef_sig[] = +{ + 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69,0x63, + 0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62,0x69, + 0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61, + 0x6e,0x63,0x65,0x49,0x44,0x00, +}; + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_Init( + LANEndpointEnabledElementCapabilitiesRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointEnabledElementCapabilitiesRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilitiesRef_InitFromInstance( + LANEndpointEnabledElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointEnabledElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilitiesRef_InitFromObjectPath( + LANEndpointEnabledElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointEnabledElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_Print( + const LANEndpointEnabledElementCapabilitiesRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* LANEndpointEnabledElementCapabilitiesRef_ToInstance( + const LANEndpointEnabledElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointEnabledElementCapabilitiesRef_ToObjectPath( + const LANEndpointEnabledElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointEnabledElementCapabilitiesRef_NameSpace( + LANEndpointEnabledElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_SetString_InstanceID( + LANEndpointEnabledElementCapabilitiesRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_Set_InstanceID( + LANEndpointEnabledElementCapabilitiesRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_Null_InstanceID( + LANEndpointEnabledElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilitiesRef_Clr_InstanceID( + LANEndpointEnabledElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Clr(field); + } +} + +/* +**============================================================================== +** +** struct LANEndpointEnabledElementCapabilities +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointEnabledLogicalElementCapabilities */ +typedef struct _LANEndpointEnabledElementCapabilities +{ + KBase __base; + /* CIM_ManagedElement features */ + const KString Caption; + const KString Description; + const KString ElementName; + /* CIM_Capabilities features */ + const KString InstanceID; + /* CIM_EnabledLogicalElementCapabilities features */ + const KBoolean ElementNameEditSupported; + const KUint16 MaxElementNameLen; + const KUint16A RequestedStatesSupported; + const KString ElementNameMask; + const KUint16A StateAwareness; + /* Linux_LANEndpointEnabledLogicalElementCapabilities features */ +} +LANEndpointEnabledElementCapabilities; + +static const unsigned char __LANEndpointEnabledElementCapabilities_sig[] = +{ + 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69,0x63, + 0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62,0x69, + 0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x09,0x0c,0x07,0x43,0x61,0x70,0x74,0x69, + 0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f, + 0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65, + 0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x00, + 0x18,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x45,0x64,0x69, + 0x74,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x03,0x11,0x4d,0x61, + 0x78,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4c,0x65,0x6e, + 0x00,0x83,0x18,0x52,0x65,0x71,0x75,0x65,0x73,0x74,0x65,0x64,0x53,0x74,0x61, + 0x74,0x65,0x73,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x0c,0x0f, + 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4d,0x61,0x73,0x6b, + 0x00,0x83,0x0e,0x53,0x74,0x61,0x74,0x65,0x41,0x77,0x61,0x72,0x65,0x6e,0x65, + 0x73,0x73,0x00, +}; + +KINLINE void LANEndpointEnabledElementCapabilities_Init( + LANEndpointEnabledElementCapabilities* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointEnabledElementCapabilities_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilities_InitFromInstance( + LANEndpointEnabledElementCapabilities* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointEnabledElementCapabilities_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilities_InitFromObjectPath( + LANEndpointEnabledElementCapabilities* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointEnabledElementCapabilities_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointEnabledElementCapabilities_Print( + const LANEndpointEnabledElementCapabilities* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* LANEndpointEnabledElementCapabilities_ToInstance( + const LANEndpointEnabledElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointEnabledElementCapabilities_ToObjectPath( + const LANEndpointEnabledElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointEnabledElementCapabilities_NameSpace( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointEnabledElementCapabilities_SetString_Caption( + LANEndpointEnabledElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_Caption( + LANEndpointEnabledElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_Caption( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_Caption( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_Clr(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_SetString_Description( + LANEndpointEnabledElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_Description( + LANEndpointEnabledElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_Description( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_Description( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Description; + KString_Clr(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_SetString_ElementName( + LANEndpointEnabledElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_ElementName( + LANEndpointEnabledElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_ElementName( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_ElementName( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementName; + KString_Clr(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_SetString_InstanceID( + LANEndpointEnabledElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_InstanceID( + LANEndpointEnabledElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_InstanceID( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_InstanceID( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Clr(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_ElementNameEditSupported( + LANEndpointEnabledElementCapabilities* self, + CMPIBoolean x) +{ + if (self && self->__base.magic == KMAGIC) + { + KBoolean* field = (KBoolean*)&self->ElementNameEditSupported; + KBoolean_Set(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_ElementNameEditSupported( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KBoolean* field = (KBoolean*)&self->ElementNameEditSupported; + KBoolean_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_ElementNameEditSupported( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KBoolean* field = (KBoolean*)&self->ElementNameEditSupported; + KBoolean_Clr(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_MaxElementNameLen( + LANEndpointEnabledElementCapabilities* self, + CMPIUint16 x) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16* field = (KUint16*)&self->MaxElementNameLen; + KUint16_Set(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_MaxElementNameLen( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16* field = (KUint16*)&self->MaxElementNameLen; + KUint16_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_MaxElementNameLen( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16* field = (KUint16*)&self->MaxElementNameLen; + KUint16_Clr(field); + } +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Init_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self, + CMPICount count) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + return KUint16A_Init(field, self->__base.cb, count); + } + return 0; +} + +KINLINE void LANEndpointEnabledElementCapabilities_InitNull_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + KUint16A_InitNull(field); + } +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self, + CMPICount i, + CMPIUint16 x) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + return KUint16A_Set(field, i, x); + } + return 0; +} + +KINLINE KUint16 LANEndpointEnabledElementCapabilities_Get_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + return KUint16A_Get(field, i); + } + return KUint16A_Get(NULL, 0); +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Null_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + return KUint16A_Null(field, i); + } + return 0; +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_RequestedStatesSupported( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->RequestedStatesSupported; + KUint16A_Clr(field); + } +} + +typedef enum _LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Enum +{ + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Enabled = 2, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Disabled = 3, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Shut_Down = 4, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Offline = 6, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Test = 7, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Defer = 8, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Quiesce = 9, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Reboot = 10, + LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Reset = 11, +} +LANEndpointEnabledElementCapabilities_RequestedStatesSupported_Enum; + +/* "Enabled" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Enabled(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 2) + +/* "Disabled" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Disabled(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 3) + +/* "Shut Down" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Shut_Down(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 4) + +/* "Offline" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Offline(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 6) + +/* "Test" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Test(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 7) + +/* "Defer" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Defer(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 8) + +/* "Quiesce" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Quiesce(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 9) + +/* "Reboot" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Reboot(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 10) + +/* "Reset" */ +#define LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported_Reset(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_RequestedStatesSupported(SELF, INDEX, 11) + +KINLINE void LANEndpointEnabledElementCapabilities_SetString_ElementNameMask( + LANEndpointEnabledElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementNameMask; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Set_ElementNameMask( + LANEndpointEnabledElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementNameMask; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Null_ElementNameMask( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementNameMask; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_ElementNameMask( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->ElementNameMask; + KString_Clr(field); + } +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Init_StateAwareness( + LANEndpointEnabledElementCapabilities* self, + CMPICount count) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + return KUint16A_Init(field, self->__base.cb, count); + } + return 0; +} + +KINLINE void LANEndpointEnabledElementCapabilities_InitNull_StateAwareness( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + KUint16A_InitNull(field); + } +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Set_StateAwareness( + LANEndpointEnabledElementCapabilities* self, + CMPICount i, + CMPIUint16 x) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + return KUint16A_Set(field, i, x); + } + return 0; +} + +KINLINE KUint16 LANEndpointEnabledElementCapabilities_Get_StateAwareness( + LANEndpointEnabledElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + return KUint16A_Get(field, i); + } + return KUint16A_Get(NULL, 0); +} + +KINLINE CMPIBoolean LANEndpointEnabledElementCapabilities_Null_StateAwareness( + LANEndpointEnabledElementCapabilities* self, + CMPICount i) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + return KUint16A_Null(field, i); + } + return 0; +} + +KINLINE void LANEndpointEnabledElementCapabilities_Clr_StateAwareness( + LANEndpointEnabledElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KUint16A* field = (KUint16A*)&self->StateAwareness; + KUint16A_Clr(field); + } +} + +typedef enum _LANEndpointEnabledElementCapabilities_StateAwareness_Enum +{ + LANEndpointEnabledElementCapabilities_StateAwareness_Implicit = 2, + LANEndpointEnabledElementCapabilities_StateAwareness_RequestStateChange = 3, +} +LANEndpointEnabledElementCapabilities_StateAwareness_Enum; + +/* "Implicit" */ +#define LANEndpointEnabledElementCapabilities_Set_StateAwareness_Implicit(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_StateAwareness(SELF, INDEX, 2) + +/* "RequestStateChange" */ +#define LANEndpointEnabledElementCapabilities_Set_StateAwareness_RequestStateChange(SELF, INDEX)\ + LANEndpointEnabledElementCapabilities_Set_StateAwareness(SELF, INDEX, 3) + +/* classname=Linux_LANEndpointEnabledLogicalElementCapabilities */ +typedef struct _LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args +{ + KBase __base; + /* IN */ + KStringA TemplateGoalSettings; + /* IN OUT */ + KStringA SupportedGoalSettings; +} +LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args; + +static const unsigned char __LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_sig[] = +{ + 0x12,0x43,0x72,0x65,0x61,0x74,0x65,0x47,0x6f,0x61,0x6c,0x53,0x65,0x74,0x74, + 0x69,0x6e,0x67,0x73,0x00,0x02,0xac,0x14,0x54,0x65,0x6d,0x70,0x6c,0x61,0x74, + 0x65,0x47,0x6f,0x61,0x6c,0x53,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x00,0xbc, + 0x15,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x47,0x6f,0x61,0x6c,0x53, + 0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x00, +}; + +KINLINE void LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_Init( + LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args* self, + const CMPIBroker* cb) +{ + const unsigned char* sig = __LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, NULL); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_InitFromArgs( + LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args* self, + const CMPIBroker* cb, + const CMPIArgs* x, + CMPIBoolean in, + CMPIBoolean out) +{ + LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_Init(self, cb); + return KBase_FromArgs(&self->__base, x, in, out); +} + +KINLINE CMPIArgs* LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_ToArgs( + const LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args* self, + CMPIBoolean in, + CMPIBoolean out, + CMPIStatus* status) +{ + return KBase_ToArgs(&self->__base, in, out, status); +} + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_SetArgs( + const LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args* self, + CMPIBoolean in, + CMPIBoolean out, + CMPIArgs* ca) +{ + return KBase_SetToArgs(&self->__base, in, out, ca); +} + +KINLINE void LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_Print( + const LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'a'); +} + +/* +**============================================================================== +** +** LANEndpointEnabledElementCapabilities methods +** +**============================================================================== +*/ + +KEXTERN KUint16 LANEndpointEnabledElementCapabilities_CreateGoalSettings( + const CMPIBroker* cb, + CMPIMethodMI* mi, + const CMPIContext* context, + const LANEndpointEnabledElementCapabilitiesRef* self, + const KStringA* TemplateGoalSettings, + KStringA* SupportedGoalSettings, + CMPIStatus* status); + +KINLINE CMPIStatus LANEndpointEnabledElementCapabilities_DispatchMethod( + const CMPIBroker* cb, + CMPIMethodMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char* meth, + const CMPIArgs* in, + CMPIArgs* out) +{ + LANEndpointEnabledElementCapabilitiesRef self; + + KReturnIf(LANEndpointEnabledElementCapabilitiesRef_InitFromObjectPath(&self, cb, cop)); + + if (strcasecmp(meth, "CreateGoalSettings") == 0) + { + CMPIStatus st = KSTATUS_INIT; + LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args args; + KUint16 r; + + KReturnIf(LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_InitFromArgs( + &args, cb, in, 1, 0)); + + r = LANEndpointEnabledElementCapabilities_CreateGoalSettings( + cb, + mi, + cc, + &self, + &args.TemplateGoalSettings, + &args.SupportedGoalSettings, + &st); + + if (!KOkay(st)) + return st; + + if (!r.exists) + KReturn(ERR_FAILED); + + KReturnIf(LANEndpointEnabledElementCapabilities_CreateGoalSettings_Args_SetArgs( + &args, 0, 1, out)); + KReturnUint16Data(cr, &r); + CMReturnDone(cr); + + KReturn(OK); + } + + KReturn(ERR_METHOD_NOT_FOUND); +} + +#define LANEndpointEnabledElementCapabilities_ClassName "Linux_LANEndpointEnabledLogicalElementCapabilities" + +#endif /* _konkrete_LANEndpointEnabledElementCapabilities_h */ Added: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledLogicalElementCapabilities.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledLogicalElementCapabilities.h (rev 0) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/LANEndpointEnabledLogicalElementCapabilities.h 2008-08-19 22:11:47 UTC (rev 869) @@ -0,0 +1,851 @@ +/* +**============================================================================== +** +** CAUTION: This file generated by KonkretCMPI. Please do not edit. +** +**============================================================================== +*/ + +#ifndef _konkrete_LANEndpointEnabledLogicalElementCapabilities_h +#define _konkrete_LANEndpointEnabledLogicalElementCapabilities_h + +#include <konkret/konkret.h> + +/* +**============================================================================== +** +** struct LANEndpointEnabledLogicalElementCapabilitiesRef +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointEnabledLogicalElementCapabilities */ +typedef struct _LANEndpointEnabledLogicalElementCapabilitiesRef +{ + KBase __base; + /* CIM_ManagedElement features */ + /* CIM_Capabilities features */ + const KString InstanceID; + /* CIM_EnabledLogicalElementCapabilities features */ + /* Linux_LANEndpointEnabledLogicalElementCapabilities features */ +} +LANEndpointEnabledLogicalElementCapabilitiesRef; + +static const unsigned char __LANEndpointEnabledLogicalElementCapabilitiesRef_sig[] = +{ + 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69,0x63, + 0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62,0x69, + 0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61, + 0x6e,0x63,0x65,0x49,0x44,0x00, +}; + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_Init( + LANEndpointEnabledLogicalElementCapabilitiesRef* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointEnabledLogicalElementCapabilitiesRef_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus LANEndpointEnabledLogicalElementCapabilitiesRef_InitFromInstance( + LANEndpointEnabledLogicalElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointEnabledLogicalElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointEnabledLogicalElementCapabilitiesRef_InitFromObjectPath( + LANEndpointEnabledLogicalElementCapabilitiesRef* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointEnabledLogicalElementCapabilitiesRef_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_Print( + const LANEndpointEnabledLogicalElementCapabilitiesRef* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'r'); +} + +KINLINE CMPIInstance* LANEndpointEnabledLogicalElementCapabilitiesRef_ToInstance( + const LANEndpointEnabledLogicalElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointEnabledLogicalElementCapabilitiesRef_ToObjectPath( + const LANEndpointEnabledLogicalElementCapabilitiesRef* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointEnabledLogicalElementCapabilitiesRef_NameSpace( + LANEndpointEnabledLogicalElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_SetString_InstanceID( + LANEndpointEnabledLogicalElementCapabilitiesRef* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_Set_InstanceID( + LANEndpointEnabledLogicalElementCapabilitiesRef* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Set(field, self->__base.cb, s); + } +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_Null_InstanceID( + LANEndpointEnabledLogicalElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Null(field); + } +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilitiesRef_Clr_InstanceID( + LANEndpointEnabledLogicalElementCapabilitiesRef* self) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->InstanceID; + KString_Clr(field); + } +} + +/* +**============================================================================== +** +** struct LANEndpointEnabledLogicalElementCapabilities +** +**============================================================================== +*/ + +/* classname=Linux_LANEndpointEnabledLogicalElementCapabilities */ +typedef struct _LANEndpointEnabledLogicalElementCapabilities +{ + KBase __base; + /* CIM_ManagedElement features */ + const KString Caption; + const KString Description; + const KString ElementName; + /* CIM_Capabilities features */ + const KString InstanceID; + /* CIM_EnabledLogicalElementCapabilities features */ + const KBoolean ElementNameEditSupported; + const KUint16 MaxElementNameLen; + const KUint16A RequestedStatesSupported; + const KString ElementNameMask; + const KUint16A StateAwareness; + /* Linux_LANEndpointEnabledLogicalElementCapabilities features */ +} +LANEndpointEnabledLogicalElementCapabilities; + +static const unsigned char __LANEndpointEnabledLogicalElementCapabilities_sig[] = +{ + 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x4c,0x41,0x4e,0x45,0x6e,0x64,0x70,0x6f, + 0x69,0x6e,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69,0x63, + 0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62,0x69, + 0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x09,0x0c,0x07,0x43,0x61,0x70,0x74,0x69, + 0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f, + 0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65, + 0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x00, + 0x18,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x45,0x64,0x69, + 0x74,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x03,0x11,0x4d,0x61, + 0x78,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4c,0x65,0x6e, + 0x00,0x83,0x18,0x52,0x65,0x71,0x75,0x65,0x73,0x74,0x65,0x64,0x53,0x74,0x61, + 0x74,0x65,0x73,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x0c,0x0f, + 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4d,0x61,0x73,0x6b, + 0x00,0x83,0x0e,0x53,0x74,0x61,0x74,0x65,0x41,0x77,0x61,0x72,0x65,0x6e,0x65, + 0x73,0x73,0x00, +}; + +KINLINE void LANEndpointEnabledLogicalElementCapabilities_Init( + LANEndpointEnabledLogicalElementCapabilities* self, + const CMPIBroker* cb, + const char* ns) +{ + const unsigned char* sig = __LANEndpointEnabledLogicalElementCapabilities_sig; + KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); +} + +KINLINE CMPIStatus LANEndpointEnabledLogicalElementCapabilities_InitFromInstance( + LANEndpointEnabledLogicalElementCapabilities* self, + const CMPIBroker* cb, + const CMPIInstance* x) +{ + LANEndpointEnabledLogicalElementCapabilities_Init(self, cb, NULL); + return KBase_FromInstance(&self->__base, x); +} + +KINLINE CMPIStatus LANEndpointEnabledLogicalElementCapabilities_InitFromObjectPath( + LANEndpointEnabledLogicalElementCapabilities* self, + const CMPIBroker* cb, + const CMPIObjectPath* x) +{ + LANEndpointEnabledLogicalElementCapabilities_Init(self, cb, NULL); + return KBase_FromObjectPath(&self->__base, x); +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilities_Print( + const LANEndpointEnabledLogicalElementCapabilities* self, + FILE* os) +{ + KBase_Print(os, &self->__base, 'i'); +} + +KINLINE CMPIInstance* LANEndpointEnabledLogicalElementCapabilities_ToInstance( + const LANEndpointEnabledLogicalElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToInstance(&self->__base, status); +} + +KINLINE CMPIObjectPath* LANEndpointEnabledLogicalElementCapabilities_ToObjectPath( + const LANEndpointEnabledLogicalElementCapabilities* self, + CMPIStatus* status) +{ + return KBase_ToObjectPath(&self->__base, status); +} + +KINLINE const char* LANEndpointEnabledLogicalElementCapabilities_NameSpace( + LANEndpointEnabledLogicalElementCapabilities* self) +{ + if (self && self->__base.magic == KMAGIC) + return self->__base.ns ? KChars(self->__base.ns) : NULL; + return NULL; +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilities_SetString_Caption( + LANEndpointEnabledLogicalElementCapabilities* self, + CMPIString* x) +{ + if (self && self->__base.magic == KMAGIC) + { + KString* field = (KString*)&self->Caption; + KString_SetString(field, x); + } +} + +KINLINE void LANEndpointEnabledLogicalElementCapabilities_Set_Caption( + LANEndpointEnabledLogicalElementCapabilities* self, + const char* s) +{ + if (self && self->__base.magic == KMAGIC) + ... [truncated message content] |
From: <mik...@us...> - 2008-08-19 22:06:30
|
Revision: 868 http://omc.svn.sourceforge.net/omc/?rev=868&view=rev Author: mike-brasher Date: 2008-08-19 22:06:39 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Added top level makefile for recursing into profile directories. Added Paths: ----------- cmpiprofiles/Makefile Removed Paths: ------------- cmpiprofiles/register.sh Added: cmpiprofiles/Makefile =================================================================== --- cmpiprofiles/Makefile (rev 0) +++ cmpiprofiles/Makefile 2008-08-19 22:06:39 UTC (rev 868) @@ -0,0 +1,37 @@ +DIRS = \ + $(PWD)/sblim-cmpi-boot_control_profile/trunk \ + $(PWD)/sblim-cmpi-ethernet_port_profile/trunk \ + $(PWD)/sblim-cmpi-fan_profile/trunk \ + $(PWD)/sblim-cmpi-power_supply_profile/trunk \ + $(PWD)/sblim-cmpi-ssh_service_profile/trunk + +define NL + + +endef + +all: build + +bootstrap: + $(foreach i,$(DIRS), cd $i; ./bootstrap.sh; $(NL) ) + +configure: + $(foreach i,$(DIRS), cd $i; ./configure; $(NL) ) + +build: + $(foreach i,$(DIRS), $(MAKE) -C $i; $(NL) ) + +clean: + $(foreach i,$(DIRS), $(MAKE) -C $i clean; $(NL) ) + +distclean: + $(foreach i,$(DIRS), $(MAKE) -C $i distclean; $(NL) ) + +cleanup: + $(foreach i,$(DIRS), cd $i; ./cleanup.sh ; $(NL) ) + +register: + su -c '$(MAKE) register_su' + +register_su: + $(foreach i,$(DIRS), cd $i/mof; ./register.sh; $(NL) ) Deleted: cmpiprofiles/register.sh =================================================================== --- cmpiprofiles/register.sh 2008-08-19 20:34:53 UTC (rev 867) +++ cmpiprofiles/register.sh 2008-08-19 22:06:39 UTC (rev 868) @@ -1,7 +0,0 @@ -#!/bin/sh -( cd ./sblim-cmpi-power_supply_profile/trunk/mof ; ./register.sh ) -( cd ./sblim-cmpi-power_supply_profile/trunk/mof ; ./register.sh ) -( cd ./sblim-cmpi-boot_control_profile/trunk/mof ; ./register.sh ) -( cd ./sblim-cmpi-ethernet_port_profile/trunk/mof ; ./register.sh ) -( cd ./sblim-cmpi-ssh_service_profile/trunk/mof ; ./register.sh ) -( cd ./sblim-cmpi-fan_profile/trunk/mof ; ./register.sh ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 20:34:43
|
Revision: 867 http://omc.svn.sourceforge.net/omc/?rev=867&view=rev Author: mike-brasher Date: 2008-08-19 20:34:53 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Beginnings of profile test. Modified Paths: -------------- cmpiprofiles/test/trunk/ProviderList.txt Added Paths: ----------- cmpiprofiles/test/trunk/ProfileTest.py Added: cmpiprofiles/test/trunk/ProfileTest.py =================================================================== --- cmpiprofiles/test/trunk/ProfileTest.py (rev 0) +++ cmpiprofiles/test/trunk/ProfileTest.py 2008-08-19 20:34:53 UTC (rev 867) @@ -0,0 +1,73 @@ +#!/usr/bin/env python +# Author: Mike Brasher +# Date: Wed Aug 13 2008 +'''Testing ProfileTest''' +################################################################################ +## +## ProfileTest +## +################################################################################ + +import pywbem +import unittest +import sys +import traceback + +sys.path.append("./lib") + +import wbem_connection +from optparse import OptionParser +import ProviderSanityTest + +globalVerbose = False +globalNamespace = 'root/cimv2' +globalClass = None +globalParser = None +globalListFile = 'ProviderList.txt' + +################################################################################ +## +## __main__ +## +################################################################################ + +if __name__ == "__main__": + p = OptionParser() + wbem_connection.getWBEMConnParserOptions(p) + + options, arguments = p.parse_args() + + if options.namespace != None: + globalNamespace = options.namespace + + globalParser=p + + # Get centralClassName argument: + if (len(arguments) == 0): + print "missing central class argument\n" + sys.exit(1) + + centralClassName = arguments[0]; + + # Create connection. + c = wbem_connection.WBEMConnFromOptions(p) + + # For each instance of the central class. + names = c.EnumerateInstanceNames(centralClassName) + + if len(names) == 0: + print "no instances of the central class found: %s" %(centralClassName) + sys.exit(1) + + # Each instance of central class must have exactly one associator of type + # CIM_Registered profile. + + for name in names: + inst = c.GetInstance(name) + assocs = c.Associators(name, AssocClass='CIM_ElementConformsToProfile') + + if len(assocs) != 1: + print "error: expected instance of central class to have 1 " \ + "associator through CIM_ElementConformsToProfile but found %d" \ + %(len(assocs)) + sys.exit(1) Property changes on: cmpiprofiles/test/trunk/ProfileTest.py ___________________________________________________________________ Added: svn:executable + * Modified: cmpiprofiles/test/trunk/ProviderList.txt =================================================================== --- cmpiprofiles/test/trunk/ProviderList.txt 2008-08-19 19:40:52 UTC (rev 866) +++ cmpiprofiles/test/trunk/ProviderList.txt 2008-08-19 20:34:53 UTC (rev 867) @@ -38,17 +38,17 @@ Linux_FanRegisteredProfile root/cimv2 Linux_FanSystemDevice root/cimv2 -Linux_PowerElementConformsToProfile root/cimv2 -Linux_PowerElementConformsToProfile root/interop -Linux_PowerHostedCollection root/cimv2 -Linux_PowerIsSpare root/cimv2 -Linux_PowerMemberOfCollection root/cimv2 -Linux_PowerOwningCollectionElement root/cimv2 +Linux_PowerSupplyElementConformsToProfile root/cimv2 +Linux_PowerSupplyElementConformsToProfile root/interop +Linux_PowerSupplyHostedCollection root/cimv2 +Linux_PowerSupplyIsSpare root/cimv2 +Linux_PowerSupplyMemberOfCollection root/cimv2 +Linux_PowerSupplyOwningCollectionElement root/cimv2 Linux_PowerSupply root/cimv2 -Linux_PowerRedundancySet root/cimv2 -Linux_PowerReferencedProfile root/interop -Linux_PowerRegisteredProfile root/interop -Linux_PowerSystemDevice root/cimv2 +Linux_PowerSupplyRedundancySet root/cimv2 +Linux_PowerSupplyReferencedProfile root/interop +Linux_PowerSupplyRegisteredProfile root/interop +Linux_PowerSupplySystemDevice root/cimv2 Linux_SSHCapabilities root/cimv2 Linux_SSHElementCapabilities root/cimv2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 19:40:45
|
Revision: 866 http://omc.svn.sourceforge.net/omc/?rev=866&view=rev Author: mike-brasher Date: 2008-08-19 19:40:52 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Changed class prefix from "Linux_Power" to "Linux_PowerSupply". Modified Paths: -------------- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-19 19:40:52 UTC (rev 866) @@ -1,18 +1,18 @@ -class Linux_PowerRegisteredProfile : CIM_RegisteredProfile +class Linux_PowerSupplyRegisteredProfile : CIM_RegisteredProfile { }; [Association] -class Linux_PowerElementConformsToProfile : CIM_ElementConformsToProfile +class Linux_PowerSupplyElementConformsToProfile : CIM_ElementConformsToProfile { - [Key] Linux_PowerRegisteredProfile REF ConformantStandard; + [Key] Linux_PowerSupplyRegisteredProfile REF ConformantStandard; // [Key] Linux_PowerSupply REF ManagedElement; }; [Association] -class Linux_PowerReferencedProfile : CIM_ReferencedProfile +class Linux_PowerSupplyReferencedProfile : CIM_ReferencedProfile { [Key] CIM_RegisteredProfile REF Antecedent; - [Key] Linux_PowerRegisteredProfile REF Dependent; + [Key] Linux_PowerSupplyRegisteredProfile REF Dependent; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof 2008-08-19 19:40:52 UTC (rev 866) @@ -8,36 +8,36 @@ { }; -class Linux_PowerRedundancySet : CIM_RedundancySet +class Linux_PowerSupplyRedundancySet : CIM_RedundancySet { }; -class Linux_PowerHostedCollection : CIM_HostedCollection +class Linux_PowerSupplyHostedCollection : CIM_HostedCollection { [Key] Linux_ComputerSystem REF Antecedent; - [Key] Linux_PowerRedundancySet REF Dependent; + [Key] Linux_PowerSupplyRedundancySet REF Dependent; }; -class Linux_PowerIsSpare : CIM_IsSpare +class Linux_PowerSupplyIsSpare : CIM_IsSpare { - [Key] Linux_PowerRedundancySet REF Dependent; + [Key] Linux_PowerSupplyRedundancySet REF Dependent; [Key] Linux_PowerSupply REF Antecedent; }; -class Linux_PowerMemberOfCollection : CIM_MemberOfCollection +class Linux_PowerSupplyMemberOfCollection : CIM_MemberOfCollection { - [Key] Linux_PowerRedundancySet REF Collection; + [Key] Linux_PowerSupplyRedundancySet REF Collection; [Key] Linux_PowerSupply REF Member; }; -class Linux_PowerSystemDevice : CIM_SystemDevice +class Linux_PowerSupplySystemDevice : CIM_SystemDevice { [Key] Linux_ComputerSystem REF GroupComponent; [Key] Linux_PowerSupply REF PartComponent; }; -class Linux_PowerOwningCollectionElement : CIM_OwningCollectionElement +class Linux_PowerSupplyOwningCollectionElement : CIM_OwningCollectionElement { [Key] Linux_ComputerSystem REF OwningElement; - [Key] Linux_PowerRedundancySet REF OwnedElement; + [Key] Linux_PowerSupplyRedundancySet REF OwnedElement; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-19 19:40:52 UTC (rev 866) @@ -1,29 +1,29 @@ -[Linux_PowerElementConformsToProfile] - provider: Linux_PowerElementConformsToProfile +[Linux_PowerSupplyElementConformsToProfile] + provider: Linux_PowerSupplyElementConformsToProfile location: linux_powersupplyprovider type: instance association namespace: root/cimv2 root/interop # -[Linux_PowerHostedCollection] - provider: Linux_PowerHostedCollection +[Linux_PowerSupplyHostedCollection] + provider: Linux_PowerSupplyHostedCollection location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerIsSpare] - provider: Linux_PowerIsSpare +[Linux_PowerSupplyIsSpare] + provider: Linux_PowerSupplyIsSpare location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerMemberOfCollection] - provider: Linux_PowerMemberOfCollection +[Linux_PowerSupplyMemberOfCollection] + provider: Linux_PowerSupplyMemberOfCollection location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerOwningCollectionElement] - provider: Linux_PowerOwningCollectionElement +[Linux_PowerSupplyOwningCollectionElement] + provider: Linux_PowerSupplyOwningCollectionElement location: linux_powersupplyprovider type: instance association namespace: root/cimv2 @@ -34,26 +34,26 @@ type: instance method namespace: root/cimv2 # -[Linux_PowerRedundancySet] - provider: Linux_PowerRedundancySet +[Linux_PowerSupplyRedundancySet] + provider: Linux_PowerSupplyRedundancySet location: linux_powersupplyprovider type: instance method namespace: root/cimv2 # -[Linux_PowerReferencedProfile] - provider: Linux_PowerReferencedProfile +[Linux_PowerSupplyReferencedProfile] + provider: Linux_PowerSupplyReferencedProfile location: linux_powersupplyprovider type: instance association namespace: root/interop # -[Linux_PowerRegisteredProfile] - provider: Linux_PowerRegisteredProfile +[Linux_PowerSupplyRegisteredProfile] + provider: Linux_PowerSupplyRegisteredProfile location: linux_powersupplyprovider type: instance method namespace: root/interop # -[Linux_PowerSystemDevice] - provider: Linux_PowerSystemDevice +[Linux_PowerSupplySystemDevice] + provider: Linux_PowerSupplySystemDevice location: linux_powersupplyprovider type: instance association namespace: root/cimv2 Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-19 19:40:52 UTC (rev 866) @@ -1,10 +1,10 @@ -Linux_PowerElementConformsToProfile root/cimv2\ root/interop Linux_PowerElementConformsToProfile linux_powersupplyprovider instance association -Linux_PowerHostedCollection root/cimv2 Linux_PowerHostedCollection linux_powersupplyprovider instance association -Linux_PowerIsSpare root/cimv2 Linux_PowerIsSpare linux_powersupplyprovider instance association -Linux_PowerMemberOfCollection root/cimv2 Linux_PowerMemberOfCollection linux_powersupplyprovider instance association -Linux_PowerOwningCollectionElement root/cimv2 Linux_PowerOwningCollectionElement linux_powersupplyprovider instance association +Linux_PowerSupplyElementConformsToProfile root/cimv2\ root/interop Linux_PowerSupplyElementConformsToProfile linux_powersupplyprovider instance association +Linux_PowerSupplyHostedCollection root/cimv2 Linux_PowerSupplyHostedCollection linux_powersupplyprovider instance association +Linux_PowerSupplyIsSpare root/cimv2 Linux_PowerSupplyIsSpare linux_powersupplyprovider instance association +Linux_PowerSupplyMemberOfCollection root/cimv2 Linux_PowerSupplyMemberOfCollection linux_powersupplyprovider instance association +Linux_PowerSupplyOwningCollectionElement root/cimv2 Linux_PowerSupplyOwningCollectionElement linux_powersupplyprovider instance association Linux_PowerSupply root/cimv2 Linux_PowerSupply linux_powersupplyprovider instance method -Linux_PowerRedundancySet root/cimv2 Linux_PowerRedundancySet linux_powersupplyprovider instance method -Linux_PowerReferencedProfile root/interop Linux_PowerReferencedProfile linux_powersupplyprovider instance association -Linux_PowerRegisteredProfile root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method -Linux_PowerSystemDevice root/cimv2 Linux_PowerSystemDevice linux_powersupplyprovider instance association +Linux_PowerSupplyRedundancySet root/cimv2 Linux_PowerSupplyRedundancySet linux_powersupplyprovider instance method +Linux_PowerSupplyReferencedProfile root/interop Linux_PowerSupplyReferencedProfile linux_powersupplyprovider instance association +Linux_PowerSupplyRegisteredProfile root/interop Linux_PowerSupplyRegisteredProfile linux_powersupplyprovider instance method +Linux_PowerSupplySystemDevice root/cimv2 Linux_PowerSupplySystemDevice linux_powersupplyprovider instance association Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,25 +21,25 @@ **============================================================================== */ -/* classname=Linux_PowerElementConformsToProfile */ +/* classname=Linux_PowerSupplyElementConformsToProfile */ typedef struct _ElementConformsToProfileRef { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* CIM_ManagedElement */ - /* Linux_PowerElementConformsToProfile features */ + /* Linux_PowerSupplyElementConformsToProfile features */ } ElementConformsToProfileRef; static const unsigned char __ElementConformsToProfileRef_sig[] = { - 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50, - 0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f, - 0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e,0x64,0x61,0x72,0x64,0x00,0x4e, - 0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x00, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f, + 0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e, + 0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e, + 0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void ElementConformsToProfileRef_Init( @@ -194,25 +194,25 @@ **============================================================================== */ -/* classname=Linux_PowerElementConformsToProfile */ +/* classname=Linux_PowerSupplyElementConformsToProfile */ typedef struct _ElementConformsToProfile { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* CIM_ManagedElement */ - /* Linux_PowerElementConformsToProfile features */ + /* Linux_PowerSupplyElementConformsToProfile features */ } ElementConformsToProfile; static const unsigned char __ElementConformsToProfile_sig[] = { - 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50, - 0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f, - 0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e,0x64,0x61,0x72,0x64,0x00,0x4e, - 0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x00, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f, + 0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e, + 0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e, + 0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void ElementConformsToProfile_Init( @@ -385,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ElementConformsToProfile_ClassName "Linux_PowerElementConformsToProfile" +#define ElementConformsToProfile_ClassName "Linux_PowerSupplyElementConformsToProfile" #endif /* _konkrete_ElementConformsToProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -202,18 +202,18 @@ CMInstanceMIStub( ElementConformsToProfile, - Linux_PowerElementConformsToProfile, + Linux_PowerSupplyElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) CMAssociationMIStub( ElementConformsToProfile, - Linux_PowerElementConformsToProfile, + Linux_PowerSupplyElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) KONKRET_REGISTRATION( "root/cimv2 root/interop", - "Linux_PowerElementConformsToProfile", - "Linux_PowerElementConformsToProfile", + "Linux_PowerSupplyElementConformsToProfile", + "Linux_PowerSupplyElementConformsToProfile", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerHostedCollection */ +/* classname=Linux_PowerSupplyHostedCollection */ typedef struct _HostedCollectionRef { KBase __base; @@ -30,16 +30,17 @@ const KRef Dependent; /* RedundancySet */ /* CIM_HostedDependency features */ /* CIM_HostedCollection features */ - /* Linux_PowerHostedCollection features */ + /* Linux_PowerSupplyHostedCollection features */ } HostedCollectionRef; static const unsigned char __HostedCollectionRef_sig[] = { - 0x1b,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x48,0x6f,0x73, - 0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02, - 0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09, - 0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x21,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x48,0x6f,0x73,0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, + 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, + 0x00, }; KINLINE void HostedCollectionRef_Init( @@ -194,7 +195,7 @@ **============================================================================== */ -/* classname=Linux_PowerHostedCollection */ +/* classname=Linux_PowerSupplyHostedCollection */ typedef struct _HostedCollection { KBase __base; @@ -203,16 +204,17 @@ const KRef Dependent; /* RedundancySet */ /* CIM_HostedDependency features */ /* CIM_HostedCollection features */ - /* Linux_PowerHostedCollection features */ + /* Linux_PowerSupplyHostedCollection features */ } HostedCollection; static const unsigned char __HostedCollection_sig[] = { - 0x1b,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x48,0x6f,0x73, - 0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02, - 0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09, - 0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x21,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x48,0x6f,0x73,0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, + 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, + 0x00, }; KINLINE void HostedCollection_Init( @@ -385,6 +387,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define HostedCollection_ClassName "Linux_PowerHostedCollection" +#define HostedCollection_ClassName "Linux_PowerSupplyHostedCollection" #endif /* _konkrete_HostedCollection_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -228,18 +228,18 @@ CMInstanceMIStub( HostedCollection, - Linux_PowerHostedCollection, + Linux_PowerSupplyHostedCollection, _cb, HostedCollectionInitialize()) CMAssociationMIStub( HostedCollection, - Linux_PowerHostedCollection, + Linux_PowerSupplyHostedCollection, _cb, HostedCollectionInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerHostedCollection", - "Linux_PowerHostedCollection", + "Linux_PowerSupplyHostedCollection", + "Linux_PowerSupplyHostedCollection", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerIsSpare */ +/* classname=Linux_PowerSupplyIsSpare */ typedef struct _IsSpareRef { KBase __base; @@ -29,16 +29,16 @@ const KRef Antecedent; /* PowerSupply */ const KRef Dependent; /* RedundancySet */ /* CIM_IsSpare features */ - /* Linux_PowerIsSpare features */ + /* Linux_PowerSupplyIsSpare features */ } IsSpareRef; static const unsigned char __IsSpareRef_sig[] = { - 0x12,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x49,0x73,0x53, - 0x70,0x61,0x72,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, - 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, - 0x00, + 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x49,0x73,0x53,0x70,0x61,0x72,0x65,0x00,0x02,0x4e,0x0a,0x41, + 0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70, + 0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, }; KINLINE void IsSpareRef_Init( @@ -193,7 +193,7 @@ **============================================================================== */ -/* classname=Linux_PowerIsSpare */ +/* classname=Linux_PowerSupplyIsSpare */ typedef struct _IsSpare { KBase __base; @@ -203,18 +203,18 @@ /* CIM_IsSpare features */ const KUint16 SpareStatus; const KUint16 FailoverSupported; - /* Linux_PowerIsSpare features */ + /* Linux_PowerSupplyIsSpare features */ } IsSpare; static const unsigned char __IsSpare_sig[] = { - 0x12,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x49,0x73,0x53, - 0x70,0x61,0x72,0x65,0x00,0x04,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, - 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, - 0x00,0x03,0x0b,0x53,0x70,0x61,0x72,0x65,0x53,0x74,0x61,0x74,0x75,0x73,0x00, - 0x03,0x11,0x46,0x61,0x69,0x6c,0x6f,0x76,0x65,0x72,0x53,0x75,0x70,0x70,0x6f, - 0x72,0x74,0x65,0x64,0x00, + 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x49,0x73,0x53,0x70,0x61,0x72,0x65,0x00,0x04,0x4e,0x0a,0x41, + 0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70, + 0x65,0x6e,0x64,0x65,0x6e,0x74,0x00,0x03,0x0b,0x53,0x70,0x61,0x72,0x65,0x53, + 0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x11,0x46,0x61,0x69,0x6c,0x6f,0x76,0x65, + 0x72,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00, }; KINLINE void IsSpare_Init( @@ -494,6 +494,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define IsSpare_ClassName "Linux_PowerIsSpare" +#define IsSpare_ClassName "Linux_PowerSupplyIsSpare" #endif /* _konkrete_IsSpare_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -228,18 +228,18 @@ CMInstanceMIStub( IsSpare, - Linux_PowerIsSpare, + Linux_PowerSupplyIsSpare, _cb, IsSpareInitialize()) CMAssociationMIStub( IsSpare, - Linux_PowerIsSpare, + Linux_PowerSupplyIsSpare, _cb, IsSpareInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerIsSpare", - "Linux_PowerIsSpare", + "Linux_PowerSupplyIsSpare", + "Linux_PowerSupplyIsSpare", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,23 +21,23 @@ **============================================================================== */ -/* classname=Linux_PowerMemberOfCollection */ +/* classname=Linux_PowerSupplyMemberOfCollection */ typedef struct _MemberOfCollectionRef { KBase __base; /* CIM_MemberOfCollection features */ const KRef Collection; /* RedundancySet */ const KRef Member; /* PowerSupply */ - /* Linux_PowerMemberOfCollection features */ + /* Linux_PowerSupplyMemberOfCollection features */ } MemberOfCollectionRef; static const unsigned char __MemberOfCollectionRef_sig[] = { - 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4d,0x65,0x6d, - 0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e, - 0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00, - 0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, + 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4d,0x65,0x6d,0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c, + 0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65, + 0x63,0x74,0x69,0x6f,0x6e,0x00,0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, }; KINLINE void MemberOfCollectionRef_Init( @@ -192,23 +192,23 @@ **============================================================================== */ -/* classname=Linux_PowerMemberOfCollection */ +/* classname=Linux_PowerSupplyMemberOfCollection */ typedef struct _MemberOfCollection { KBase __base; /* CIM_MemberOfCollection features */ const KRef Collection; /* RedundancySet */ const KRef Member; /* PowerSupply */ - /* Linux_PowerMemberOfCollection features */ + /* Linux_PowerSupplyMemberOfCollection features */ } MemberOfCollection; static const unsigned char __MemberOfCollection_sig[] = { - 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4d,0x65,0x6d, - 0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e, - 0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00, - 0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, + 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4d,0x65,0x6d,0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c, + 0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65, + 0x63,0x74,0x69,0x6f,0x6e,0x00,0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, }; KINLINE void MemberOfCollection_Init( @@ -381,6 +381,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define MemberOfCollection_ClassName "Linux_PowerMemberOfCollection" +#define MemberOfCollection_ClassName "Linux_PowerSupplyMemberOfCollection" #endif /* _konkrete_MemberOfCollection_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -225,18 +225,18 @@ CMInstanceMIStub( MemberOfCollection, - Linux_PowerMemberOfCollection, + Linux_PowerSupplyMemberOfCollection, _cb, MemberOfCollectionInitialize()) CMAssociationMIStub( MemberOfCollection, - Linux_PowerMemberOfCollection, + Linux_PowerSupplyMemberOfCollection, _cb, MemberOfCollectionInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerMemberOfCollection", - "Linux_PowerMemberOfCollection", + "Linux_PowerSupplyMemberOfCollection", + "Linux_PowerSupplyMemberOfCollection", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,24 +21,24 @@ **============================================================================== */ -/* classname=Linux_PowerOwningCollectionElement */ +/* classname=Linux_PowerSupplyOwningCollectionElement */ typedef struct _OwningCollectionElementRef { KBase __base; /* CIM_OwningCollectionElement features */ const KRef OwningElement; /* ComputerSystem */ const KRef OwnedElement; /* RedundancySet */ - /* Linux_PowerOwningCollectionElement features */ + /* Linux_PowerSupplyOwningCollectionElement features */ } OwningCollectionElementRef; static const unsigned char __OwningCollectionElementRef_sig[] = { - 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4f,0x77,0x6e, - 0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x45,0x6c, - 0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d,0x4f,0x77,0x6e,0x69,0x6e,0x67, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x4f,0x77,0x6e,0x65,0x64, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, + 0x28,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4f,0x77,0x6e,0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d, + 0x4f,0x77,0x6e,0x69,0x6e,0x67,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e, + 0x0c,0x4f,0x77,0x6e,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void OwningCollectionElementRef_Init( @@ -193,24 +193,24 @@ **============================================================================== */ -/* classname=Linux_PowerOwningCollectionElement */ +/* classname=Linux_PowerSupplyOwningCollectionElement */ typedef struct _OwningCollectionElement { KBase __base; /* CIM_OwningCollectionElement features */ const KRef OwningElement; /* ComputerSystem */ const KRef OwnedElement; /* RedundancySet */ - /* Linux_PowerOwningCollectionElement features */ + /* Linux_PowerSupplyOwningCollectionElement features */ } OwningCollectionElement; static const unsigned char __OwningCollectionElement_sig[] = { - 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4f,0x77,0x6e, - 0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x45,0x6c, - 0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d,0x4f,0x77,0x6e,0x69,0x6e,0x67, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x4f,0x77,0x6e,0x65,0x64, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, + 0x28,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4f,0x77,0x6e,0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d, + 0x4f,0x77,0x6e,0x69,0x6e,0x67,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e, + 0x0c,0x4f,0x77,0x6e,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void OwningCollectionElement_Init( @@ -383,6 +383,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define OwningCollectionElement_ClassName "Linux_PowerOwningCollectionElement" +#define OwningCollectionElement_ClassName "Linux_PowerSupplyOwningCollectionElement" #endif /* _konkrete_OwningCollectionElement_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -227,18 +227,18 @@ CMInstanceMIStub( OwningCollectionElement, - Linux_PowerOwningCollectionElement, + Linux_PowerSupplyOwningCollectionElement, _cb, OwningCollectionElementInitialize()) CMAssociationMIStub( OwningCollectionElement, - Linux_PowerOwningCollectionElement, + Linux_PowerSupplyOwningCollectionElement, _cb, OwningCollectionElementInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerOwningCollectionElement", - "Linux_PowerOwningCollectionElement", + "Linux_PowerSupplyOwningCollectionElement", + "Linux_PowerSupplyOwningCollectionElement", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h 2008-08-19 19:40:52 UTC (rev 866) @@ -20,7 +20,7 @@ **============================================================================== */ -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySetRef { KBase __base; @@ -29,15 +29,16 @@ /* CIM_SystemSpecificCollection features */ const KString InstanceID; /* CIM_RedundancySet features */ - /* Linux_PowerRedundancySet features */ + /* Linux_PowerSupplyRedundancySet features */ } RedundancySetRef; static const unsigned char __RedundancySetRef_sig[] = { - 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x64, - 0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65,0x74,0x00,0x01,0x4c,0x0a,0x49, - 0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00, + 0x1e,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65, + 0x74,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44, + 0x00, }; KINLINE void RedundancySetRef_Init( @@ -146,7 +147,7 @@ **============================================================================== */ -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySet { KBase __base; @@ -166,28 +167,29 @@ const KStringA OtherTypeOfSet; const KUint16 LoadBalanceAlgorithm; const KString OtherLoadBalanceAlgorithm; - /* Linux_PowerRedundancySet features */ + /* Linux_PowerSupplyRedundancySet features */ } RedundancySet; static const unsigned char __RedundancySet_sig[] = { - 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x64, - 0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65,0x74,0x00,0x0c,0x0c,0x07,0x43, - 0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69, - 0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65, - 0x49,0x44,0x00,0x03,0x10,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79, - 0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x83,0x09,0x54,0x79,0x70,0x65,0x4f,0x66, - 0x53,0x65,0x74,0x00,0x05,0x0f,0x4d,0x69,0x6e,0x4e,0x75,0x6d,0x62,0x65,0x72, - 0x4e,0x65,0x65,0x64,0x65,0x64,0x00,0x05,0x12,0x4d,0x61,0x78,0x4e,0x75,0x6d, - 0x62,0x65,0x72,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x0c,0x15, - 0x56,0x65,0x6e,0x64,0x6f,0x72,0x49,0x64,0x65,0x6e,0x74,0x69,0x66,0x79,0x69, - 0x6e,0x67,0x49,0x6e,0x66,0x6f,0x00,0x8c,0x0e,0x4f,0x74,0x68,0x65,0x72,0x54, - 0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00,0x03,0x14,0x4c,0x6f,0x61,0x64, - 0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f,0x72,0x69,0x74,0x68, - 0x6d,0x00,0x0c,0x19,0x4f,0x74,0x68,0x65,0x72,0x4c,0x6f,0x61,0x64,0x42,0x61, - 0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f,0x72,0x69,0x74,0x68,0x6d,0x00, + 0x1e,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65, + 0x74,0x00,0x0c,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b, + 0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e, + 0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x10,0x52,0x65,0x64,0x75, + 0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x83,0x09, + 0x54,0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00,0x05,0x0f,0x4d,0x69,0x6e, + 0x4e,0x75,0x6d,0x62,0x65,0x72,0x4e,0x65,0x65,0x64,0x65,0x64,0x00,0x05,0x12, + 0x4d,0x61,0x78,0x4e,0x75,0x6d,0x62,0x65,0x72,0x53,0x75,0x70,0x70,0x6f,0x72, + 0x74,0x65,0x64,0x00,0x0c,0x15,0x56,0x65,0x6e,0x64,0x6f,0x72,0x49,0x64,0x65, + 0x6e,0x74,0x69,0x66,0x79,0x69,0x6e,0x67,0x49,0x6e,0x66,0x6f,0x00,0x8c,0x0e, + 0x4f,0x74,0x68,0x65,0x72,0x54,0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00, + 0x03,0x14,0x4c,0x6f,0x61,0x64,0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c, + 0x67,0x6f,0x72,0x69,0x74,0x68,0x6d,0x00,0x0c,0x19,0x4f,0x74,0x68,0x65,0x72, + 0x4c,0x6f,0x61,0x64,0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f, + 0x72,0x69,0x74,0x68,0x6d,0x00, }; KINLINE void RedundancySet_Init( @@ -910,7 +912,7 @@ } } -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySet_Failover_Args { KBase __base; @@ -1040,6 +1042,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define RedundancySet_ClassName "Linux_PowerRedundancySet" +#define RedundancySet_ClassName "Linux_PowerSupplyRedundancySet" #endif /* _konkrete_RedundancySet_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -137,7 +137,7 @@ CMInstanceMIStub( RedundancySet, - Linux_PowerRedundancySet, + Linux_PowerSupplyRedundancySet, _cb, RedundancySetInitialize()) @@ -164,7 +164,7 @@ CMMethodMIStub( RedundancySet, - Linux_PowerRedundancySet, + Linux_PowerSupplyRedundancySet, _cb, RedundancySetInitialize()) @@ -185,6 +185,6 @@ KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerRedundancySet", - "Linux_PowerRedundancySet", + "Linux_PowerSupplyRedundancySet", + "Linux_PowerSupplyRedundancySet", "instance method"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerReferencedProfile */ +/* classname=Linux_PowerSupplyReferencedProfile */ typedef struct _ReferencedProfileRef { KBase __base; @@ -29,16 +29,17 @@ const KRef Antecedent; /* CIM_RegisteredProfile */ const KRef Dependent; /* RegisteredProfile */ /* CIM_ReferencedProfile features */ - /* Linux_PowerReferencedProfile features */ + /* Linux_PowerSupplyReferencedProfile features */ } ReferencedProfileRef; static const unsigned char __ReferencedProfileRef_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x66, - 0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e, - 0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x66,0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65, + 0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e, + 0x74,0x00, }; KINLINE void ReferencedProfileRef_Init( @@ -193,7 +194,7 @@ **============================================================================== */ -/* classname=Linux_PowerReferencedProfile */ +/* classname=Linux_PowerSupplyReferencedProfile */ typedef struct _ReferencedProfile { KBase __base; @@ -201,16 +202,17 @@ const KRef Antecedent; /* CIM_RegisteredProfile */ const KRef Dependent; /* RegisteredProfile */ /* CIM_ReferencedProfile features */ - /* Linux_PowerReferencedProfile features */ + /* Linux_PowerSupplyReferencedProfile features */ } ReferencedProfile; static const unsigned char __ReferencedProfile_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x66, - 0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e, - 0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x66,0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65, + 0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e, + 0x74,0x00, }; KINLINE void ReferencedProfile_Init( @@ -383,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ReferencedProfile_ClassName "Linux_PowerReferencedProfile" +#define ReferencedProfile_ClassName "Linux_PowerSupplyReferencedProfile" #endif /* _konkrete_ReferencedProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -206,18 +206,18 @@ CMInstanceMIStub( ReferencedProfile, - Linux_PowerReferencedProfile, + Linux_PowerSupplyReferencedProfile, _cb, ReferencedProfileInitialize()) CMAssociationMIStub( ReferencedProfile, - Linux_PowerReferencedProfile, + Linux_PowerSupplyReferencedProfile, _cb, ReferencedProfileInitialize()) KONKRET_REGISTRATION( "root/interop", - "Linux_PowerReferencedProfile", - "Linux_PowerReferencedProfile", + "Linux_PowerSupplyReferencedProfile", + "Linux_PowerSupplyReferencedProfile", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -19,22 +19,23 @@ **============================================================================== */ -/* classname=Linux_PowerRegisteredProfile */ +/* classname=Linux_PowerSupplyRegisteredProfile */ typedef struct _RegisteredProfileRef { KBase __base; /* CIM_ManagedElement features */ /* CIM_RegisteredProfile features */ const KString InstanceID; - /* Linux_PowerRegisteredProfile features */ + /* Linux_PowerSupplyRegisteredProfile features */ } RegisteredProfileRef; static const unsigned char __RegisteredProfileRef_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x67, - 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e, + 0x63,0x65,0x49,0x44,0x00, }; KINLINE void RegisteredProfileRef_Init( @@ -143,7 +144,7 @@ **============================================================================== */ -/* classname=Linux_PowerRegisteredProfile */ +/* classname=Linux_PowerSupplyRegisteredProfile */ typedef struct _RegisteredProfile { KBase __base; @@ -159,27 +160,27 @@ const KString RegisteredVersion; const KUint16A AdvertiseTypes; const KStringA AdvertiseTypeDescriptions; - /* Linux_PowerRegisteredProfile features */ + /* Linux_PowerSupplyRegisteredProfile features */ } RegisteredProfile; static const unsigned char __RegisteredProfile_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x67, - 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x0a,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65, - 0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74, - 0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x16,0x52,0x65,0x67,0x69,0x73,0x74, - 0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e,0x69,0x7a,0x61,0x74,0x69,0x6f, - 0x6e,0x00,0x0c,0x1b,0x4f,0x74,0x68,0x65,0x72,0x52,0x65,0x67,0x69,0x73,0x74, - 0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e,0x69,0x7a,0x61,0x74,0x69,0x6f, - 0x6e,0x00,0x0c,0x0e,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4e, - 0x61,0x6d,0x65,0x00,0x0c,0x11,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65, - 0x64,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x00,0x83,0x0e,0x41,0x64,0x76,0x65, - 0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65,0x73,0x00,0x8c,0x19,0x41,0x64, - 0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65,0x44,0x65,0x73,0x63, - 0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x73,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x0a,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f, + 0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e, + 0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00, + 0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x16, + 0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e, + 0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x1b,0x4f,0x74,0x68,0x65,0x72, + 0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e, + 0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0e,0x52,0x65,0x67,0x69,0x73, + 0x74,0x65,0x72,0x65,0x64,0x4e,0x61,0x6d,0x65,0x00,0x0c,0x11,0x52,0x65,0x67, + 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x00, + 0x83,0x0e,0x41,0x64,0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65, + 0x73,0x00,0x8c,0x19,0x41,0x64,0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79, + 0x70,0x65,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x73,0x00, }; KINLINE void RegisteredProfile_Init( @@ -882,6 +883,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define RegisteredProfile_ClassName "Linux_PowerRegisteredProfile" +#define RegisteredProfile_ClassName "Linux_PowerSupplyRegisteredProfile" #endif /* _konkrete_RegisteredProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -100,7 +100,7 @@ CMInstanceMIStub( RegisteredProfile, - Linux_PowerRegisteredProfile, + Linux_PowerSupplyRegisteredProfile, _cb, RegisteredProfileInitialize()) @@ -127,12 +127,12 @@ CMMethodMIStub( RegisteredProfile, - Linux_PowerRegisteredProfile, + Linux_PowerSupplyRegisteredProfile, _cb, RegisteredProfileInitialize()) KONKRET_REGISTRATION( "root/interop", - "Linux_PowerRegisteredProfile", - "Linux_PowerRegisteredProfile", + "Linux_PowerSupplyRegisteredProfile", + "Linux_PowerSupplyRegisteredProfile", "instance method"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c 2008-08-19 19:40:52 UTC (rev 866) @@ -65,7 +65,7 @@ struct RedundancyInfo info = { /* instanceID */ - "Linux_PowerRedundancySet:0", + "Linux_PowerSupplyRedundancySet:0", /* deviceID */ "Linux_PowerSupply:0", /* redundancyStatus */ @@ -96,7 +96,7 @@ struct RedundancyInfo info = { /* instanceID */ - "Linux_PowerRedundancySet:0", + "Linux_PowerSupplyRedundancySet:0", /* deviceID */ "Linux_PowerSupply:1", /* redundancyStatus */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-19 19:40:52 UTC (rev 866) @@ -87,31 +87,31 @@ struct RedundancyInfo { - /* Linux_PowerRedundancySet.InstanceID */ + /* Linux_PowerSupplyRedundancySet.InstanceID */ char instanceID[64]; - /* Linux_Power.DeviceID */ + /* Linux_PowerSupply.DeviceID */ char deviceID[64]; - /* Linux_PowerRedundancySet.RedundancyStatus */ + /* Linux_PowerSupplyRedundancySet.RedundancyStatus */ RedundancySet_RedundancyStatus_Enum redundancyStatus; - /* Linux_PowerRedundancySet.TypeOfSet */ + /* Linux_PowerSupplyRedundancySet.TypeOfSet */ RedundancySet_TypeOfSet_Enum typeOfSet[8]; - /* Linux_PowerRedundancySet.TypeOfSet size */ + /* Linux_PowerSupplyRedundancySet.TypeOfSet size */ size_t typeOfSetSize; - /* Linux_PowerRedundancySet.MinNumberNeeded */ + /* Linux_PowerSupplyRedundancySet.MinNumberNeeded */ unsigned int minNumberNeeded; /* Non-zero if fan given by deviceID is a spare */ CMPIBoolean isSpare; - /* Linux_PowerIsSpare.SpareStatus */ + /* Linux_PowerSupplyIsSpare.SpareStatus */ IsSpare_SpareStatus_Enum spareStatus; - /* Linux_PowerIsSpare.FailoverSupported */ + /* Linux_PowerSupplyIsSpare.FailoverSupported */ IsSpare_FailoverSupported_Enum failoverSupported; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerSystemDevice */ +/* classname=Linux_PowerSupplySystemDevice */ typedef struct _SystemDeviceRef { KBase __base; @@ -30,16 +30,17 @@ const KRef PartComponent; /* PowerSupply */ /* CIM_SystemComponent features */ /* CIM_SystemDevice features */ - /* Linux_PowerSystemDevice features */ + /* Linux_PowerSupplySystemDevice features */ } SystemDeviceRef; static const unsigned char __SystemDeviceRef_sig[] = { - 0x17,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x79,0x73, - 0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65,0x00,0x02,0x4e,0x0e,0x47,0x72, - 0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00,0x4e,0x0d, - 0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00, + 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x53,0x79,0x73,0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65, + 0x00,0x02,0x4e,0x0e,0x47,0x72,0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e, + 0x65,0x6e,0x74,0x00,0x4e,0x0d,0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f, + 0x6e,0x65,0x6e,0x74,0x00, }; KINLINE void SystemDeviceRef_Init( @@ -194,7 +195,7 @@ **============================================================================== */ -/* classname=Linux_PowerSystemDevice */ +/* classname=Linux_PowerSupplySystemDevice */ typedef struct _SystemDevice { KBase __base; @@ -203,16 +204,17 @@ const KRef PartComponent; /* PowerSupply */ /* CIM_SystemComponent features */ /* CIM_SystemDevice features */ - /* Linux_PowerSystemDevice features */ + /* Linux_PowerSupplySystemDevice features */ } SystemDevice; static const unsigned char __SystemDevice_sig[] = { - 0x17,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x79,0x73, - 0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65,0x00,0x02,0x4e,0x0e,0x47,0x72, - 0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00,0x4e,0x0d, - 0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00, + 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x53,0x79,0x73,0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65, + 0x00,0x02,0x4e,0x0e,0x47,0x72,0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e, + 0x65,0x6e,0x74,0x00,0x4e,0x0d,0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f, + 0x6e,0x65,0x6e,0x74,0x00, }; KINLINE void SystemDevice_Init( @@ -385,6 +387,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define SystemDevice_ClassName "Linux_PowerSystemDevice" +#define SystemDevice_ClassName "Linux_PowerSupplySystemDevice" #endif /* _konkrete_SystemDevice_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -203,18 +203,18 @@ CMInstanceMIStub( SystemDevice, - Linux_PowerSystemDevice, + Linux_PowerSupplySystemDevice, _cb, SystemDeviceInitialize()) CMAssociationMIStub( SystemDevice, - Linux_PowerSystemDevice, + Linux_PowerSupplySystemDevice, _cb, SystemDeviceInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerSystemDevice", - "Linux_PowerSystemDevice", + "Linux_PowerSupplySystemDevice", + "Linux_PowerSupplySystemDevice", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon 2008-08-19 19:40:52 UTC (rev 866) @@ -6,12 +6,12 @@ ## Linux_ComputerSystem=ComputerSystem Linux_PowerSupply=PowerSupply! -Linux_PowerSystemDevice=SystemDevice! -Linux_PowerRegisteredProfile=RegisteredProfile! -Linux_PowerRedundancySet=RedundancySet! -Linux_PowerHostedCollection=HostedCollection! -Linux_PowerIsSpare=IsSpare! -Linux_PowerMemberOfCollection=MemberOfCollection! -Linux_PowerOwningCollectionElement=OwningCollectionElement! -Linux_PowerElementConformsToProfile=ElementConformsToProfile! -Linux_PowerReferencedProfile=ReferencedProfile! +Linux_PowerSupplySystemDevice=SystemDevice! +Linux_PowerSupplyRegisteredProfile=RegisteredProfile! +Linux_PowerSupplyRedundancySet=RedundancySet! +Linux_PowerSupplyHostedCollection=HostedCollection! +Linux_PowerSupplyIsSpare=IsSpare! +Linux_PowerSupplyMemberOfCollection=MemberOfCollection! +Linux_PowerSupplyOwningCollectionElement=OwningCollectionElement! +Linux_PowerSupplyElementConformsToProfile=ElementConformsToProfile! +Linux_PowerSupplyReferencedProfile=ReferencedProfile! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 19:30:45
|
Revision: 865 http://omc.svn.sourceforge.net/omc/?rev=865&view=rev Author: mike-brasher Date: 2008-08-19 19:30:55 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Fixed GenProviderList script to handle multiple namespaces. Modified Paths: -------------- cmpiprofiles/test/trunk/GenProviderList.sh cmpiprofiles/test/trunk/ProviderList.txt Modified: cmpiprofiles/test/trunk/GenProviderList.sh =================================================================== --- cmpiprofiles/test/trunk/GenProviderList.sh 2008-08-19 19:12:13 UTC (rev 864) +++ cmpiprofiles/test/trunk/GenProviderList.sh 2008-08-19 19:30:55 UTC (rev 865) @@ -15,6 +15,12 @@ for i in $libs do - konkretreg -r $i | sed 's/[ \t].*//g' >> $fn + konkretreg -r $i | while read CLASSNAME NAMESPACES X1 X2 X3 X4 X5 X6 + do + for j in $NAMESPACES + do + echo "$CLASSNAME $j" >> $fn + done + done echo "" >> $fn done Modified: cmpiprofiles/test/trunk/ProviderList.txt =================================================================== --- cmpiprofiles/test/trunk/ProviderList.txt 2008-08-19 19:12:13 UTC (rev 864) +++ cmpiprofiles/test/trunk/ProviderList.txt 2008-08-19 19:30:55 UTC (rev 865) @@ -1,64 +1,64 @@ Linux_ComputerSystem -Linux_BootService -Linux_BootConfigSetting -Linux_BootElementConformsToProfile +Linux_BootService root/cimv2 +Linux_BootConfigSetting root/cimv2 +Linux_BootElementConformsToProfile root/cimv2 Linux_BootElementConformsToProfile root/interop -Linux_BootElementSettingData -Linux_BootHostedService -Linux_BootOrderedComponent +Linux_BootElementSettingData root/cimv2 +Linux_BootHostedService root/cimv2 +Linux_BootOrderedComponent root/cimv2 Linux_BootReferencedProfile root/interop Linux_BootRegisteredProfile root/interop -Linux_BootServiceAffectsElement -Linux_GrubBootSourceSetting +Linux_BootServiceAffectsElement root/cimv2 +Linux_GrubBootSourceSetting root/cimv2 -Linux_DeviceSAPImplementationEthernetPort -Linux_ElementCapabilitiesLANEndpoint -Linux_ElementCapabilitiesEthernetPort -Linux_ElementConformsToProfileEthernetPort -Linux_ElementConformsToProfileEthernetPort root/interop -Linux_EnabledLogicalElementCapabilitiesLANEndpoint -Linux_EnabledLogicalElementCapabilitiesEthernetPort -Linux_EthernetPort -Linux_HostedAccessPointEthernetPort -Linux_LANEndpoint -Linux_ReferencedProfileEthernetPort root/interop -Linux_RegisteredProfileEthernetPort root/interop -Linux_SystemDeviceEthernetPort +Linux_EthernetPortDeviceSAPImplementation root/cimv2 +Linux_EthernetPortElementCapabilities root/cimv2 +Linux_EthernetPortElementConformsToProfile root/cimv2 +Linux_EthernetPortElementConformsToProfile root/interop +Linux_EthernetPortEnabledLogicalElementCapabilities root/cimv2 +Linux_EthernetPort root/cimv2 +Linux_EthernetPortHostedAccessPoint root/cimv2 +Linux_LANEndpointElementCapabilities root/cimv2 +Linux_LANEndpointEnabledLogicalElementCapabilities root/cimv2 +Linux_LANEndpoint root/cimv2 +Linux_EthernetPortReferencedProfile root/interop +Linux_EthernetPortRegisteredProfile root/interop +Linux_EthernetPortSystemDevice root/cimv2 -Linux_FanElementConformsToProfile +Linux_FanElementConformsToProfile root/cimv2 Linux_FanElementConformsToProfile root/interop -Linux_Fan -Linux_FanHostedCollection -Linux_FanIsSpare -Linux_FanMemberOfCollection -Linux_FanOwningCollectionElement -Linux_FanRedundancySet -Linux_FanReferencedProfile root/interop -Linux_FanRegisteredProfile root/interop -Linux_FanSystemDevice +Linux_Fan root/cimv2 +Linux_FanHostedCollection root/cimv2 +Linux_FanIsSpare root/cimv2 +Linux_FanMemberOfCollection root/cimv2 +Linux_FanOwningCollectionElement root/cimv2 +Linux_FanRedundancySet root/cimv2 +Linux_FanReferencedProfile root/cimv2 +Linux_FanRegisteredProfile root/cimv2 +Linux_FanSystemDevice root/cimv2 -Linux_PowerElementConformsToProfile +Linux_PowerElementConformsToProfile root/cimv2 Linux_PowerElementConformsToProfile root/interop -Linux_PowerHostedCollection -Linux_PowerIsSpare -Linux_PowerMemberOfCollection -Linux_PowerOwningCollectionElement -Linux_PowerSupply -Linux_PowerRedundancySet +Linux_PowerHostedCollection root/cimv2 +Linux_PowerIsSpare root/cimv2 +Linux_PowerMemberOfCollection root/cimv2 +Linux_PowerOwningCollectionElement root/cimv2 +Linux_PowerSupply root/cimv2 +Linux_PowerRedundancySet root/cimv2 Linux_PowerReferencedProfile root/interop Linux_PowerRegisteredProfile root/interop -Linux_PowerSystemDevice +Linux_PowerSystemDevice root/cimv2 -Linux_SSHCapabilities -Linux_SSHElementCapabilities -Linux_SSHElementConformsToProfile +Linux_SSHCapabilities root/cimv2 +Linux_SSHElementCapabilities root/cimv2 +Linux_SSHElementConformsToProfile root/cimv2 Linux_SSHElementConformsToProfile root/interop -Linux_SSHHostedAccessPoint -Linux_SSHHostedService -Linux_SSHProtocolEndpoint -Linux_SSHProtocolService -Linux_SSHProvidesEndpoint +Linux_SSHHostedAccessPoint root/cimv2 +Linux_SSHHostedService root/cimv2 +Linux_SSHProtocolEndpoint root/cimv2 +Linux_SSHProtocolService root/cimv2 +Linux_SSHProvidesEndpoint root/cimv2 Linux_SSHReferencedProfile root/interop Linux_SSHRegisteredProfile root/interop This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 19:12:06
|
Revision: 864 http://omc.svn.sourceforge.net/omc/?rev=864&view=rev Author: mike-brasher Date: 2008-08-19 19:12:13 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Renamed classes from "Linux_<BASECLASSNAME>EthernetPort" to "Linux_EthernetPort<BASECLASSNAME>" style. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.mof cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementation.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilities.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilities.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPoint.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPointProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Makefile.am cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfile.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfile.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfileProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDevice.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDeviceProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/linux-ethernet-port-profile.kon Removed Paths: ------------- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpoint.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesLANEndpoint.h cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesLANEndpointProvider.c Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-19 19:12:13 UTC (rev 864) @@ -1,17 +1,17 @@ -class Linux_RegisteredProfileEthernetPort : CIM_RegisteredProfile +class Linux_EthernetPortRegisteredProfile : CIM_RegisteredProfile { }; [Association] -class Linux_ElementConformsToProfileEthernetPort : CIM_ElementConformsToProfile +class Linux_EthernetPortElementConformsToProfile : CIM_ElementConformsToProfile { - [Key] Linux_RegisteredProfileEthernetPort REF ConformantStandard; + [Key] Linux_EthernetPortRegisteredProfile REF ConformantStandard; [Key] Linux_EthernetPort REF ManagedElement; }; [Association] -class Linux_ReferencedProfileEthernetPort : CIM_ReferencedProfile +class Linux_EthernetPortReferencedProfile : CIM_ReferencedProfile { [Key] CIM_RegisteredProfile REF Antecedent; - [Key] Linux_RegisteredProfileEthernetPort REF Dependent; + [Key] Linux_EthernetPortRegisteredProfile REF Dependent; }; Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.mof =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.mof 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.mof 2008-08-19 19:12:13 UTC (rev 864) @@ -13,44 +13,44 @@ }; [Association] -class Linux_DeviceSAPImplementationEthernetPort : CIM_DeviceSAPImplementation +class Linux_EthernetPortDeviceSAPImplementation : CIM_DeviceSAPImplementation { Linux_EthernetPort REF Antecedent; Linux_LANEndpoint REF Dependent; }; [Association] -class Linux_SystemDeviceEthernetPort : CIM_SystemDevice +class Linux_EthernetPortSystemDevice : CIM_SystemDevice { [Key] Linux_ComputerSystem REF GroupComponent; [Key] Linux_EthernetPort REF PartComponent; }; [Association] -class Linux_HostedAccessPointEthernetPort : CIM_HostedAccessPoint +class Linux_EthernetPortHostedAccessPoint : CIM_HostedAccessPoint { }; -class Linux_EnabledLogicalElementCapabilitiesEthernetPort : +class Linux_EthernetPortEnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { }; [Association] -class Linux_ElementCapabilitiesEthernetPort : CIM_ElementCapabilities +class Linux_EthernetPortElementCapabilities : CIM_ElementCapabilities { [Key] Linux_EthernetPort REF ManagedElement; - [Key] Linux_EnabledLogicalElementCapabilitiesEthernetPort REF Capabilities; + [Key] Linux_EthernetPortEnabledLogicalElementCapabilities REF Capabilities; }; -class Linux_EnabledLogicalElementCapabilitiesLANEndpoint : +class Linux_LANEndpointEnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { }; [Association] -class Linux_ElementCapabilitiesLANEndpoint : CIM_ElementCapabilities +class Linux_LANEndpointElementCapabilities : CIM_ElementCapabilities { [Key] Linux_LANEndpoint REF ManagedElement; - [Key] Linux_EnabledLogicalElementCapabilitiesLANEndpoint REF Capabilities; + [Key] Linux_LANEndpointEnabledLogicalElementCapabilities REF Capabilities; }; Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg 2008-08-19 19:12:13 UTC (rev 864) @@ -1,71 +1,71 @@ -[Linux_DeviceSAPImplementationEthernetPort] - provider: Linux_DeviceSAPImplementationEthernetPort +[Linux_EthernetPortDeviceSAPImplementation] + provider: Linux_EthernetPortDeviceSAPImplementation location: linux_ethportprovider type: instance association namespace: root/cimv2 # -[Linux_ElementCapabilitiesLANEndpoint] - provider: Linux_ElementCapabilitiesLANEndpoint +[Linux_EthernetPortElementCapabilities] + provider: Linux_EthernetPortElementCapabilities location: linux_ethportprovider type: instance association namespace: root/cimv2 # -[Linux_ElementCapabilitiesEthernetPort] - provider: Linux_ElementCapabilitiesEthernetPort +[Linux_EthernetPortElementConformsToProfile] + provider: Linux_EthernetPortElementConformsToProfile location: linux_ethportprovider type: instance association - namespace: root/cimv2 -# -[Linux_ElementConformsToProfileEthernetPort] - provider: Linux_ElementConformsToProfileEthernetPort - location: linux_ethportprovider - type: instance association namespace: root/cimv2 root/interop # -[Linux_EnabledLogicalElementCapabilitiesLANEndpoint] - provider: Linux_EnabledLogicalElementCapabilitiesLANEndpoint +[Linux_EthernetPortEnabledLogicalElementCapabilities] + provider: Linux_EthernetPortEnabledLogicalElementCapabilities location: linux_ethportprovider type: instance method namespace: root/cimv2 # -[Linux_EnabledLogicalElementCapabilitiesEthernetPort] - provider: Linux_EnabledLogicalElementCapabilitiesEthernetPort +[Linux_EthernetPort] + provider: Linux_EthernetPort location: linux_ethportprovider type: instance method namespace: root/cimv2 # -[Linux_EthernetPort] - provider: Linux_EthernetPort +[Linux_EthernetPortHostedAccessPoint] + provider: Linux_EthernetPortHostedAccessPoint location: linux_ethportprovider - type: instance method + type: instance association namespace: root/cimv2 # -[Linux_HostedAccessPointEthernetPort] - provider: Linux_HostedAccessPointEthernetPort +[Linux_LANEndpointElementCapabilities] + provider: Linux_LANEndpointElementCapabilities location: linux_ethportprovider type: instance association namespace: root/cimv2 # +[Linux_LANEndpointEnabledLogicalElementCapabilities] + provider: Linux_LANEndpointEnabledLogicalElementCapabilities + location: linux_ethportprovider + type: instance method + namespace: root/cimv2 +# [Linux_LANEndpoint] provider: Linux_LANEndpoint location: linux_ethportprovider type: instance method namespace: root/cimv2 # -[Linux_ReferencedProfileEthernetPort] - provider: Linux_ReferencedProfileEthernetPort +[Linux_EthernetPortReferencedProfile] + provider: Linux_EthernetPortReferencedProfile location: linux_ethportprovider type: instance association namespace: root/interop # -[Linux_RegisteredProfileEthernetPort] - provider: Linux_RegisteredProfileEthernetPort +[Linux_EthernetPortRegisteredProfile] + provider: Linux_EthernetPortRegisteredProfile location: linux_ethportprovider type: instance method namespace: root/interop # -[Linux_SystemDeviceEthernetPort] - provider: Linux_SystemDeviceEthernetPort +[Linux_EthernetPortSystemDevice] + provider: Linux_EthernetPortSystemDevice location: linux_ethportprovider type: instance association namespace: root/cimv2 Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration 2008-08-19 19:12:13 UTC (rev 864) @@ -1,12 +1,12 @@ -Linux_DeviceSAPImplementationEthernetPort root/cimv2 Linux_DeviceSAPImplementationEthernetPort linux_ethportprovider instance association -Linux_ElementCapabilitiesLANEndpoint root/cimv2 Linux_ElementCapabilitiesLANEndpoint linux_ethportprovider instance association -Linux_ElementCapabilitiesEthernetPort root/cimv2 Linux_ElementCapabilitiesEthernetPort linux_ethportprovider instance association -Linux_ElementConformsToProfileEthernetPort root/cimv2\ root/interop Linux_ElementConformsToProfileEthernetPort linux_ethportprovider instance association -Linux_EnabledLogicalElementCapabilitiesLANEndpoint root/cimv2 Linux_EnabledLogicalElementCapabilitiesLANEndpoint linux_ethportprovider instance method -Linux_EnabledLogicalElementCapabilitiesEthernetPort root/cimv2 Linux_EnabledLogicalElementCapabilitiesEthernetPort linux_ethportprovider instance method +Linux_EthernetPortDeviceSAPImplementation root/cimv2 Linux_EthernetPortDeviceSAPImplementation linux_ethportprovider instance association +Linux_EthernetPortElementCapabilities root/cimv2 Linux_EthernetPortElementCapabilities linux_ethportprovider instance association +Linux_EthernetPortElementConformsToProfile root/cimv2\ root/interop Linux_EthernetPortElementConformsToProfile linux_ethportprovider instance association +Linux_EthernetPortEnabledLogicalElementCapabilities root/cimv2 Linux_EthernetPortEnabledLogicalElementCapabilities linux_ethportprovider instance method Linux_EthernetPort root/cimv2 Linux_EthernetPort linux_ethportprovider instance method -Linux_HostedAccessPointEthernetPort root/cimv2 Linux_HostedAccessPointEthernetPort linux_ethportprovider instance association +Linux_EthernetPortHostedAccessPoint root/cimv2 Linux_EthernetPortHostedAccessPoint linux_ethportprovider instance association +Linux_LANEndpointElementCapabilities root/cimv2 Linux_LANEndpointElementCapabilities linux_ethportprovider instance association +Linux_LANEndpointEnabledLogicalElementCapabilities root/cimv2 Linux_LANEndpointEnabledLogicalElementCapabilities linux_ethportprovider instance method Linux_LANEndpoint root/cimv2 Linux_LANEndpoint linux_ethportprovider instance method -Linux_ReferencedProfileEthernetPort root/interop Linux_ReferencedProfileEthernetPort linux_ethportprovider instance association -Linux_RegisteredProfileEthernetPort root/interop Linux_RegisteredProfileEthernetPort linux_ethportprovider instance method -Linux_SystemDeviceEthernetPort root/cimv2 Linux_SystemDeviceEthernetPort linux_ethportprovider instance association +Linux_EthernetPortReferencedProfile root/interop Linux_EthernetPortReferencedProfile linux_ethportprovider instance association +Linux_EthernetPortRegisteredProfile root/interop Linux_EthernetPortRegisteredProfile linux_ethportprovider instance method +Linux_EthernetPortSystemDevice root/cimv2 Linux_EthernetPortSystemDevice linux_ethportprovider instance association Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementation.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementation.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementation.h 2008-08-19 19:12:13 UTC (rev 864) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_DeviceSAPImplementationEthernetPort */ +/* classname=Linux_EthernetPortDeviceSAPImplementation */ typedef struct _DeviceSAPImplementationRef { KBase __base; @@ -29,15 +29,15 @@ const KRef Antecedent; /* EthernetPort */ const KRef Dependent; /* LANEndpoint */ /* CIM_DeviceSAPImplementation features */ - /* Linux_DeviceSAPImplementationEthernetPort features */ + /* Linux_EthernetPortDeviceSAPImplementation features */ } DeviceSAPImplementationRef; static const unsigned char __DeviceSAPImplementationRef_sig[] = { - 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x44,0x65,0x76,0x69,0x63,0x65,0x53,0x41, - 0x50,0x49,0x6d,0x70,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x61,0x74,0x69,0x6f,0x6e, - 0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x02,0x4e, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x44,0x65,0x76,0x69,0x63,0x65,0x53,0x41,0x50,0x49,0x6d, + 0x70,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x61,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e, 0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44, 0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, }; @@ -194,7 +194,7 @@ **============================================================================== */ -/* classname=Linux_DeviceSAPImplementationEthernetPort */ +/* classname=Linux_EthernetPortDeviceSAPImplementation */ typedef struct _DeviceSAPImplementation { KBase __base; @@ -202,15 +202,15 @@ const KRef Antecedent; /* EthernetPort */ const KRef Dependent; /* LANEndpoint */ /* CIM_DeviceSAPImplementation features */ - /* Linux_DeviceSAPImplementationEthernetPort features */ + /* Linux_EthernetPortDeviceSAPImplementation features */ } DeviceSAPImplementation; static const unsigned char __DeviceSAPImplementation_sig[] = { - 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x44,0x65,0x76,0x69,0x63,0x65,0x53,0x41, - 0x50,0x49,0x6d,0x70,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x61,0x74,0x69,0x6f,0x6e, - 0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x02,0x4e, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x44,0x65,0x76,0x69,0x63,0x65,0x53,0x41,0x50,0x49,0x6d, + 0x70,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x61,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e, 0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44, 0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, }; @@ -385,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define DeviceSAPImplementation_ClassName "Linux_DeviceSAPImplementationEthernetPort" +#define DeviceSAPImplementation_ClassName "Linux_EthernetPortDeviceSAPImplementation" #endif /* _konkrete_DeviceSAPImplementation_h */ Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c 2008-08-19 19:12:13 UTC (rev 864) @@ -235,18 +235,18 @@ CMInstanceMIStub( DeviceSAPImplementation, - Linux_DeviceSAPImplementationEthernetPort, + Linux_EthernetPortDeviceSAPImplementation, _cb, DeviceSAPImplementationInitialize()) CMAssociationMIStub( DeviceSAPImplementation, - Linux_DeviceSAPImplementationEthernetPort, + Linux_EthernetPortDeviceSAPImplementation, _cb, DeviceSAPImplementationInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_DeviceSAPImplementationEthernetPort", - "Linux_DeviceSAPImplementationEthernetPort", + "Linux_EthernetPortDeviceSAPImplementation", + "Linux_EthernetPortDeviceSAPImplementation", "instance association") Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilities.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilities.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilities.h 2008-08-19 19:12:13 UTC (rev 864) @@ -21,22 +21,22 @@ **============================================================================== */ -/* classname=Linux_ElementCapabilitiesEthernetPort */ +/* classname=Linux_EthernetPortElementCapabilities */ typedef struct _ElementCapabilitiesRef { KBase __base; /* CIM_ElementCapabilities features */ const KRef ManagedElement; /* EthernetPort */ const KRef Capabilities; /* EnabledLogicalElementCapabilities */ - /* Linux_ElementCapabilitiesEthernetPort features */ + /* Linux_EthernetPortElementCapabilities features */ } ElementCapabilitiesRef; static const unsigned char __ElementCapabilitiesRef_sig[] = { - 0x25,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x45,0x74,0x68,0x65, - 0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x02,0x4e,0x0e,0x4d,0x61,0x6e, + 0x25,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61, + 0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x02,0x4e,0x0e,0x4d,0x61,0x6e, 0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43, 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00, }; @@ -193,7 +193,7 @@ **============================================================================== */ -/* classname=Linux_ElementCapabilitiesEthernetPort */ +/* classname=Linux_EthernetPortElementCapabilities */ typedef struct _ElementCapabilities { KBase __base; @@ -201,15 +201,15 @@ const KRef ManagedElement; /* EthernetPort */ const KRef Capabilities; /* EnabledLogicalElementCapabilities */ const KUint16A Characteristics; - /* Linux_ElementCapabilitiesEthernetPort features */ + /* Linux_EthernetPortElementCapabilities features */ } ElementCapabilities; static const unsigned char __ElementCapabilities_sig[] = { - 0x25,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x45,0x74,0x68,0x65, - 0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x03,0x4e,0x0e,0x4d,0x61,0x6e, + 0x25,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61, + 0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x03,0x4e,0x0e,0x4d,0x61,0x6e, 0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43, 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x83,0x0f,0x43, 0x68,0x61,0x72,0x61,0x63,0x74,0x65,0x72,0x69,0x73,0x74,0x69,0x63,0x73,0x00, @@ -479,6 +479,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ElementCapabilities_ClassName "Linux_ElementCapabilitiesEthernetPort" +#define ElementCapabilities_ClassName "Linux_EthernetPortElementCapabilities" #endif /* _konkrete_ElementCapabilities_h */ Deleted: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpoint.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpoint.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpoint.h 2008-08-19 19:12:13 UTC (rev 864) @@ -1,484 +0,0 @@ -/* -**============================================================================== -** -** CAUTION: This file generated by KonkretCMPI. Please do not edit. -** -**============================================================================== -*/ - -#ifndef _konkrete_ElementCapabilitiesLANEndpoint_h -#define _konkrete_ElementCapabilitiesLANEndpoint_h - -#include <konkret/konkret.h> -#include "LANEndpoint.h" -#include "EnabledLogicalElementCapabilitiesLANEndpoint.h" - -/* -**============================================================================== -** -** struct ElementCapabilitiesLANEndpointRef -** -**============================================================================== -*/ - -/* classname=Linux_ElementCapabilitiesLANEndpoint */ -typedef struct _ElementCapabilitiesLANEndpointRef -{ - KBase __base; - /* CIM_ElementCapabilities features */ - const KRef ManagedElement; /* LANEndpoint */ - const KRef Capabilities; /* EnabledLogicalElementCapabilitiesLANEndpoint */ - /* Linux_ElementCapabilitiesLANEndpoint features */ -} -ElementCapabilitiesLANEndpointRef; - -static const unsigned char __ElementCapabilitiesLANEndpointRef_sig[] = -{ - 0x24,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x4c,0x41,0x4e,0x45, - 0x6e,0x64,0x70,0x6f,0x69,0x6e,0x74,0x00,0x02,0x4e,0x0e,0x4d,0x61,0x6e,0x61, - 0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00, -}; - -KINLINE void ElementCapabilitiesLANEndpointRef_Init( - ElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const char* ns) -{ - const unsigned char* sig = __ElementCapabilitiesLANEndpointRef_sig; - KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); - ((KRef*)&self->ManagedElement)->__sig = __LANEndpoint_sig; - ((KRef*)&self->Capabilities)->__sig = __EnabledLogicalElementCapabilitiesLANEndpoint_sig; -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpointRef_InitFromInstance( - ElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const CMPIInstance* x) -{ - ElementCapabilitiesLANEndpointRef_Init(self, cb, NULL); - return KBase_FromInstance(&self->__base, x); -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpointRef_InitFromObjectPath( - ElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const CMPIObjectPath* x) -{ - ElementCapabilitiesLANEndpointRef_Init(self, cb, NULL); - return KBase_FromObjectPath(&self->__base, x); -} - -KINLINE void ElementCapabilitiesLANEndpointRef_Print( - const ElementCapabilitiesLANEndpointRef* self, - FILE* os) -{ - KBase_Print(os, &self->__base, 'r'); -} - -KINLINE CMPIInstance* ElementCapabilitiesLANEndpointRef_ToInstance( - const ElementCapabilitiesLANEndpointRef* self, - CMPIStatus* status) -{ - return KBase_ToInstance(&self->__base, status); -} - -KINLINE CMPIObjectPath* ElementCapabilitiesLANEndpointRef_ToObjectPath( - const ElementCapabilitiesLANEndpointRef* self, - CMPIStatus* status) -{ - return KBase_ToObjectPath(&self->__base, status); -} - -KINLINE const char* ElementCapabilitiesLANEndpointRef_NameSpace( - ElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - return self->__base.ns ? KChars(self->__base.ns) : NULL; - return NULL; -} - -KINLINE void ElementCapabilitiesLANEndpointRef_SetObjectPath_ManagedElement( - ElementCapabilitiesLANEndpointRef* self, - const CMPIObjectPath* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_SetObjectPath(field, x); - } -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpointRef_Set_ManagedElement( - ElementCapabilitiesLANEndpointRef* self, - const LANEndpointRef* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - return KRef_Set(field, &x->__base); - } - CMReturn(CMPI_RC_ERR_FAILED); -} - -KINLINE void ElementCapabilitiesLANEndpointRef_Null_ManagedElement( - ElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_Null(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpointRef_Clr_ManagedElement( - ElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_Clr(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpointRef_SetObjectPath_Capabilities( - ElementCapabilitiesLANEndpointRef* self, - const CMPIObjectPath* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_SetObjectPath(field, x); - } -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpointRef_Set_Capabilities( - ElementCapabilitiesLANEndpointRef* self, - const EnabledLogicalElementCapabilitiesLANEndpointRef* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - return KRef_Set(field, &x->__base); - } - CMReturn(CMPI_RC_ERR_FAILED); -} - -KINLINE void ElementCapabilitiesLANEndpointRef_Null_Capabilities( - ElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_Null(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpointRef_Clr_Capabilities( - ElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_Clr(field); - } -} - -/* -**============================================================================== -** -** struct ElementCapabilitiesLANEndpoint -** -**============================================================================== -*/ - -/* classname=Linux_ElementCapabilitiesLANEndpoint */ -typedef struct _ElementCapabilitiesLANEndpoint -{ - KBase __base; - /* CIM_ElementCapabilities features */ - const KRef ManagedElement; /* LANEndpoint */ - const KRef Capabilities; /* EnabledLogicalElementCapabilitiesLANEndpoint */ - const KUint16A Characteristics; - /* Linux_ElementCapabilitiesLANEndpoint features */ -} -ElementCapabilitiesLANEndpoint; - -static const unsigned char __ElementCapabilitiesLANEndpoint_sig[] = -{ - 0x24,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x61,0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x4c,0x41,0x4e,0x45, - 0x6e,0x64,0x70,0x6f,0x69,0x6e,0x74,0x00,0x03,0x4e,0x0e,0x4d,0x61,0x6e,0x61, - 0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x83,0x0f,0x43,0x68, - 0x61,0x72,0x61,0x63,0x74,0x65,0x72,0x69,0x73,0x74,0x69,0x63,0x73,0x00, -}; - -KINLINE void ElementCapabilitiesLANEndpoint_Init( - ElementCapabilitiesLANEndpoint* self, - const CMPIBroker* cb, - const char* ns) -{ - const unsigned char* sig = __ElementCapabilitiesLANEndpoint_sig; - KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); - ((KRef*)&self->ManagedElement)->__sig = __LANEndpoint_sig; - ((KRef*)&self->Capabilities)->__sig = __EnabledLogicalElementCapabilitiesLANEndpoint_sig; -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpoint_InitFromInstance( - ElementCapabilitiesLANEndpoint* self, - const CMPIBroker* cb, - const CMPIInstance* x) -{ - ElementCapabilitiesLANEndpoint_Init(self, cb, NULL); - return KBase_FromInstance(&self->__base, x); -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpoint_InitFromObjectPath( - ElementCapabilitiesLANEndpoint* self, - const CMPIBroker* cb, - const CMPIObjectPath* x) -{ - ElementCapabilitiesLANEndpoint_Init(self, cb, NULL); - return KBase_FromObjectPath(&self->__base, x); -} - -KINLINE void ElementCapabilitiesLANEndpoint_Print( - const ElementCapabilitiesLANEndpoint* self, - FILE* os) -{ - KBase_Print(os, &self->__base, 'i'); -} - -KINLINE CMPIInstance* ElementCapabilitiesLANEndpoint_ToInstance( - const ElementCapabilitiesLANEndpoint* self, - CMPIStatus* status) -{ - return KBase_ToInstance(&self->__base, status); -} - -KINLINE CMPIObjectPath* ElementCapabilitiesLANEndpoint_ToObjectPath( - const ElementCapabilitiesLANEndpoint* self, - CMPIStatus* status) -{ - return KBase_ToObjectPath(&self->__base, status); -} - -KINLINE const char* ElementCapabilitiesLANEndpoint_NameSpace( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - return self->__base.ns ? KChars(self->__base.ns) : NULL; - return NULL; -} - -KINLINE void ElementCapabilitiesLANEndpoint_SetObjectPath_ManagedElement( - ElementCapabilitiesLANEndpoint* self, - const CMPIObjectPath* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_SetObjectPath(field, x); - } -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpoint_Set_ManagedElement( - ElementCapabilitiesLANEndpoint* self, - const LANEndpointRef* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - return KRef_Set(field, &x->__base); - } - CMReturn(CMPI_RC_ERR_FAILED); -} - -KINLINE void ElementCapabilitiesLANEndpoint_Null_ManagedElement( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_Null(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpoint_Clr_ManagedElement( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->ManagedElement; - KRef_Clr(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpoint_SetObjectPath_Capabilities( - ElementCapabilitiesLANEndpoint* self, - const CMPIObjectPath* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_SetObjectPath(field, x); - } -} - -KINLINE CMPIStatus ElementCapabilitiesLANEndpoint_Set_Capabilities( - ElementCapabilitiesLANEndpoint* self, - const EnabledLogicalElementCapabilitiesLANEndpointRef* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - return KRef_Set(field, &x->__base); - } - CMReturn(CMPI_RC_ERR_FAILED); -} - -KINLINE void ElementCapabilitiesLANEndpoint_Null_Capabilities( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_Null(field); - } -} - -KINLINE void ElementCapabilitiesLANEndpoint_Clr_Capabilities( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KRef* field = (KRef*)&self->Capabilities; - KRef_Clr(field); - } -} - -KINLINE CMPIBoolean ElementCapabilitiesLANEndpoint_Init_Characteristics( - ElementCapabilitiesLANEndpoint* self, - CMPICount count) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - return KUint16A_Init(field, self->__base.cb, count); - } - return 0; -} - -KINLINE void ElementCapabilitiesLANEndpoint_InitNull_Characteristics( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - KUint16A_InitNull(field); - } -} - -KINLINE CMPIBoolean ElementCapabilitiesLANEndpoint_Set_Characteristics( - ElementCapabilitiesLANEndpoint* self, - CMPICount i, - CMPIUint16 x) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - return KUint16A_Set(field, i, x); - } - return 0; -} - -KINLINE KUint16 ElementCapabilitiesLANEndpoint_Get_Characteristics( - ElementCapabilitiesLANEndpoint* self, - CMPICount i) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - return KUint16A_Get(field, i); - } - return KUint16A_Get(NULL, 0); -} - -KINLINE CMPIBoolean ElementCapabilitiesLANEndpoint_Null_Characteristics( - ElementCapabilitiesLANEndpoint* self, - CMPICount i) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - return KUint16A_Null(field, i); - } - return 0; -} - -KINLINE void ElementCapabilitiesLANEndpoint_Clr_Characteristics( - ElementCapabilitiesLANEndpoint* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KUint16A* field = (KUint16A*)&self->Characteristics; - KUint16A_Clr(field); - } -} - -typedef enum _ElementCapabilitiesLANEndpoint_Characteristics_Enum -{ - ElementCapabilitiesLANEndpoint_Characteristics_Default = 2, - ElementCapabilitiesLANEndpoint_Characteristics_Current = 3, - ElementCapabilitiesLANEndpoint_Characteristics_DMTF_Reserved = 0, - ElementCapabilitiesLANEndpoint_Characteristics_Vendor_Specific = 32768, -} -ElementCapabilitiesLANEndpoint_Characteristics_Enum; - -/* "Default" */ -#define ElementCapabilitiesLANEndpoint_Set_Characteristics_Default(SELF, INDEX)\ - ElementCapabilitiesLANEndpoint_Set_Characteristics(SELF, INDEX, 2) - -/* "Current" */ -#define ElementCapabilitiesLANEndpoint_Set_Characteristics_Current(SELF, INDEX)\ - ElementCapabilitiesLANEndpoint_Set_Characteristics(SELF, INDEX, 3) - -/* "DMTF Reserved" */ -#define ElementCapabilitiesLANEndpoint_Set_Characteristics_DMTF_Reserved(SELF, INDEX)\ - ElementCapabilitiesLANEndpoint_Set_Characteristics(SELF, INDEX, 0) - -/* "Vendor Specific" */ -#define ElementCapabilitiesLANEndpoint_Set_Characteristics_Vendor_Specific(SELF, INDEX)\ - ElementCapabilitiesLANEndpoint_Set_Characteristics(SELF, INDEX, 32768) - -/* -**============================================================================== -** -** ElementCapabilitiesLANEndpoint methods -** -**============================================================================== -*/ - -KINLINE CMPIStatus ElementCapabilitiesLANEndpoint_DispatchMethod( - const CMPIBroker* cb, - CMPIMethodMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* meth, - const CMPIArgs* in, - CMPIArgs* out) -{ - ElementCapabilitiesLANEndpointRef self; - - KReturnIf(ElementCapabilitiesLANEndpointRef_InitFromObjectPath(&self, cb, cop)); - - - KReturn(ERR_METHOD_NOT_FOUND); -} - -#define ElementCapabilitiesLANEndpoint_ClassName "Linux_ElementCapabilitiesLANEndpoint" - -#endif /* _konkrete_ElementCapabilitiesLANEndpoint_h */ Deleted: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c 2008-08-19 19:12:13 UTC (rev 864) @@ -1,218 +0,0 @@ -#include <konkret/konkret.h> -#include "ElementCapabilitiesLANEndpoint.h" -#include "Resource.h" - -static const CMPIBroker* _cb; - -static void ElementCapabilitiesLANEndpointInitialize() -{ -} - -static CMPIStatus ElementCapabilitiesLANEndpointCleanup( - CMPIInstanceMI* mi, - const CMPIContext* cc, - CMPIBoolean term) -{ - CMReturn(CMPI_RC_OK); -} - -static CMPIStatus ElementCapabilitiesLANEndpointEnumInstanceNames( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop) -{ - return KDefaultEnumerateInstanceNames( - _cb, mi, cc, cr, cop); -} - -static CMPIStatus ElementCapabilitiesLANEndpointEnumInstances( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char** properties) -{ - EnabledLogicalElementCapabilitiesLANEndpointRef x; - - EnabledLogicalElementCapabilitiesLANEndpointRef_Init( - &x, _cb, KNameSpace(cop)); - EnabledLogicalElementCapabilitiesLANEndpointRef_Set_InstanceID( - &x, "SBLIM:LANEndpoint"); - - return KDefaultEnumerateInstancesOneToAll( - _cb, - cc, - cr, - cop, - EnabledLogicalElementCapabilitiesLANEndpointRef_ToObjectPath(&x, NULL), - "Capabilities", - CMNewObjectPath(_cb, KNameSpace(cop), "Linux_LANEndpoint", NULL), - "ManagedElement"); -} - -static CMPIStatus ElementCapabilitiesLANEndpointGetInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char** properties) -{ - return KDefaultGetInstance( - _cb, mi, cc, cr, cop, properties); -} - -static CMPIStatus ElementCapabilitiesLANEndpointCreateInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const CMPIInstance* ci) -{ - CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); -} - -static CMPIStatus ElementCapabilitiesLANEndpointModifyInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const CMPIInstance* ci, - const char**properties) -{ - CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); -} - -static CMPIStatus ElementCapabilitiesLANEndpointDeleteInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop) -{ - CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); -} - -static CMPIStatus ElementCapabilitiesLANEndpointExecQuery( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* lang, - const char* query) -{ - CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); -} - -static CMPIStatus ElementCapabilitiesLANEndpointAssociationCleanup( - CMPIAssociationMI* mi, - const CMPIContext* cc, - CMPIBoolean term) -{ - CMReturn(CMPI_RC_OK); -} - -static CMPIStatus ElementCapabilitiesLANEndpointAssociators( - CMPIAssociationMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* assocClass, - const char* resultClass, - const char* role, - const char* resultRole, - const char** properties) -{ - return KDefaultAssociators( - _cb, - mi, - cc, - cr, - cop, - ElementCapabilitiesLANEndpoint_ClassName, - assocClass, - resultClass, - role, - resultRole, - properties); -} - -static CMPIStatus ElementCapabilitiesLANEndpointAssociatorNames( - CMPIAssociationMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* assocClass, - const char* resultClass, - const char* role, - const char* resultRole) -{ - return KDefaultAssociatorNames( - _cb, - mi, - cc, - cr, - cop, - ElementCapabilitiesLANEndpoint_ClassName, - assocClass, - resultClass, - role, - resultRole); -} - -static CMPIStatus ElementCapabilitiesLANEndpointReferences( - CMPIAssociationMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* assocClass, - const char* role, - const char** properties) -{ - return KDefaultReferences( - _cb, - mi, - cc, - cr, - cop, - ElementCapabilitiesLANEndpoint_ClassName, - assocClass, - role, - properties); -} - -static CMPIStatus ElementCapabilitiesLANEndpointReferenceNames( - CMPIAssociationMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char* assocClass, - const char* role) -{ - return KDefaultReferenceNames( - _cb, - mi, - cc, - cr, - cop, - ElementCapabilitiesLANEndpoint_ClassName, - assocClass, - role); -} - -CMInstanceMIStub( - ElementCapabilitiesLANEndpoint, - Linux_ElementCapabilitiesLANEndpoint, - _cb, - ElementCapabilitiesLANEndpointInitialize()) - -CMAssociationMIStub( - ElementCapabilitiesLANEndpoint, - Linux_ElementCapabilitiesLANEndpoint, - _cb, - ElementCapabilitiesLANEndpointInitialize()) - -KONKRET_REGISTRATION( - "root/cimv2", - "Linux_ElementCapabilitiesLANEndpoint", - "Linux_ElementCapabilitiesLANEndpoint", - "instance association") Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-19 19:12:13 UTC (rev 864) @@ -200,18 +200,18 @@ CMInstanceMIStub( ElementCapabilities, - Linux_ElementCapabilitiesEthernetPort, + Linux_EthernetPortElementCapabilities, _cb, ElementCapabilitiesInitialize()) CMAssociationMIStub( ElementCapabilities, - Linux_ElementCapabilitiesEthernetPort, + Linux_EthernetPortElementCapabilities, _cb, ElementCapabilitiesInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_ElementCapabilitiesEthernetPort", - "Linux_ElementCapabilitiesEthernetPort", + "Linux_EthernetPortElementCapabilities", + "Linux_EthernetPortElementCapabilities", "instance association") Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 19:12:13 UTC (rev 864) @@ -21,22 +21,22 @@ **============================================================================== */ -/* classname=Linux_ElementConformsToProfileEthernetPort */ +/* classname=Linux_EthernetPortElementConformsToProfile */ typedef struct _ElementConformsToProfileRef { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* EthernetPort */ - /* Linux_ElementConformsToProfileEthernetPort features */ + /* Linux_EthernetPortElementConformsToProfile features */ } ElementConformsToProfileRef; static const unsigned char __ElementConformsToProfileRef_sig[] = { - 0x2a,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c, - 0x65,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x02, + 0x2a,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66, + 0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02, 0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61, 0x6e,0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64, 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, @@ -194,22 +194,22 @@ **============================================================================== */ -/* classname=Linux_ElementConformsToProfileEthernetPort */ +/* classname=Linux_EthernetPortElementConformsToProfile */ typedef struct _ElementConformsToProfile { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* EthernetPort */ - /* Linux_ElementConformsToProfileEthernetPort features */ + /* Linux_EthernetPortElementConformsToProfile features */ } ElementConformsToProfile; static const unsigned char __ElementConformsToProfile_sig[] = { - 0x2a,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43, - 0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c, - 0x65,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x02, + 0x2a,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66, + 0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02, 0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61, 0x6e,0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64, 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, @@ -385,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ElementConformsToProfile_ClassName "Linux_ElementConformsToProfileEthernetPort" +#define ElementConformsToProfile_ClassName "Linux_EthernetPortElementConformsToProfile" #endif /* _konkrete_ElementConformsToProfile_h */ Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 19:12:13 UTC (rev 864) @@ -12,7 +12,7 @@ if (strcmp(cn, "Linux_EthernetPort") == 0) return 1; - if (strcmp(cn, "Linux_RegisteredProfileEthernetPort") == 0) + if (strcmp(cn, "Linux_EthernetPortRegisteredProfile") == 0) return 1; return 0; @@ -50,7 +50,7 @@ const char* ns = INTEROP_NAMESPACE; RegisteredProfileRef cs; - /* Linux_RegisteredProfileEthernetPort.ConformantStandard */ + /* Linux_EthernetPortRegisteredProfile.ConformantStandard */ RegisteredProfileRef_Init(&cs, _cb, ns); RegisteredProfileRef_Set_InstanceID(&cs, "SBLIM:Ethernet_Port"); @@ -215,18 +215,18 @@ CMInstanceMIStub( ElementConformsToProfile, - Linux_ElementConformsToProfileEthernetPort, + Linux_EthernetPortElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) CMAssociationMIStub( ElementConformsToProfile, - Linux_ElementConformsToProfileEthernetPort, + Linux_EthernetPortElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) KONKRET_REGISTRATION( "root/cimv2 root/interop", - "Linux_ElementConformsToProfileEthernetPort", - "Linux_ElementConformsToProfileEthernetPort", + "Linux_EthernetPortElementConformsToProfile", + "Linux_EthernetPortElementConformsToProfile", "instance association") Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilities.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilities.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilities.h 2008-08-19 19:12:13 UTC (rev 864) @@ -19,7 +19,7 @@ **============================================================================== */ -/* classname=Linux_EnabledLogicalElementCapabilitiesEthernetPort */ +/* classname=Linux_EthernetPortEnabledLogicalElementCapabilities */ typedef struct _EnabledLogicalElementCapabilitiesRef { KBase __base; @@ -27,16 +27,16 @@ /* CIM_Capabilities features */ const KString InstanceID; /* CIM_EnabledLogicalElementCapabilities features */ - /* Linux_EnabledLogicalElementCapabilitiesEthernetPort features */ + /* Linux_EthernetPortEnabledLogicalElementCapabilities features */ } EnabledLogicalElementCapabilitiesRef; static const unsigned char __EnabledLogicalElementCapabilitiesRef_sig[] = { - 0x33,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c, - 0x6f,0x67,0x69,0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x45,0x74,0x68,0x65,0x72, - 0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74, + 0x33,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69, + 0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62, + 0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74, 0x61,0x6e,0x63,0x65,0x49,0x44,0x00, }; @@ -146,7 +146,7 @@ **============================================================================== */ -/* classname=Linux_EnabledLogicalElementCapabilitiesEthernetPort */ +/* classname=Linux_EthernetPortEnabledLogicalElementCapabilities */ typedef struct _EnabledLogicalElementCapabilities { KBase __base; @@ -162,16 +162,16 @@ const KUint16A RequestedStatesSupported; const KString ElementNameMask; const KUint16A StateAwareness; - /* Linux_EnabledLogicalElementCapabilitiesEthernetPort features */ + /* Linux_EthernetPortEnabledLogicalElementCapabilities features */ } EnabledLogicalElementCapabilities; static const unsigned char __EnabledLogicalElementCapabilities_sig[] = { - 0x33,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c, - 0x6f,0x67,0x69,0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x45,0x74,0x68,0x65,0x72, - 0x6e,0x65,0x74,0x50,0x6f,0x72,0x74,0x00,0x09,0x0c,0x07,0x43,0x61,0x70,0x74, + 0x33,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x74,0x68,0x65,0x72,0x6e,0x65,0x74, + 0x50,0x6f,0x72,0x74,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c,0x6f,0x67,0x69, + 0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61,0x70,0x61,0x62, + 0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x00,0x09,0x0c,0x07,0x43,0x61,0x70,0x74, 0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69, 0x6f,0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d, 0x65,0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00, @@ -716,7 +716,7 @@ #define EnabledLogicalElementCapabilities_Set_StateAwareness_RequestStateChange(SELF, INDEX)\ EnabledLogicalElementCapabilities_Set_StateAwareness(SELF, INDEX, 3) -/* classname=Linux_EnabledLogicalElementCapabilitiesEthernetPort */ +/* classname=Linux_EthernetPortEnabledLogicalElementCapabilities */ typedef struct _EnabledLogicalElementCapabilities_CreateGoalSettings_Args { KBase __base; @@ -846,6 +846,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define EnabledLogicalElementCapabilities_ClassName "Linux_EnabledLogicalElementCapabilitiesEthernetPort" +#define EnabledLogicalElementCapabilities_ClassName "Linux_EthernetPortEnabledLogicalElementCapabilities" #endif /* _konkrete_EnabledLogicalElementCapabilities_h */ Deleted: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesLANEndpoint.h =================================================================== --- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesLANEndpoint.h 2008-08-19 18:31:43 UTC (rev 863) +++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/EnabledLogicalElementCapabilitiesLANEndpoint.h 2008-08-19 19:12:13 UTC (rev 864) @@ -1,851 +0,0 @@ -/* -**============================================================================== -** -** CAUTION: This file generated by KonkretCMPI. Please do not edit. -** -**============================================================================== -*/ - -#ifndef _konkrete_EnabledLogicalElementCapabilitiesLANEndpoint_h -#define _konkrete_EnabledLogicalElementCapabilitiesLANEndpoint_h - -#include <konkret/konkret.h> - -/* -**============================================================================== -** -** struct EnabledLogicalElementCapabilitiesLANEndpointRef -** -**============================================================================== -*/ - -/* classname=Linux_EnabledLogicalElementCapabilitiesLANEndpoint */ -typedef struct _EnabledLogicalElementCapabilitiesLANEndpointRef -{ - KBase __base; - /* CIM_ManagedElement features */ - /* CIM_Capabilities features */ - const KString InstanceID; - /* CIM_EnabledLogicalElementCapabilities features */ - /* Linux_EnabledLogicalElementCapabilitiesLANEndpoint features */ -} -EnabledLogicalElementCapabilitiesLANEndpointRef; - -static const unsigned char __EnabledLogicalElementCapabilitiesLANEndpointRef_sig[] = -{ - 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c, - 0x6f,0x67,0x69,0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x4c,0x41,0x4e,0x45,0x6e, - 0x64,0x70,0x6f,0x69,0x6e,0x74,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61, - 0x6e,0x63,0x65,0x49,0x44,0x00, -}; - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_Init( - EnabledLogicalElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const char* ns) -{ - const unsigned char* sig = __EnabledLogicalElementCapabilitiesLANEndpointRef_sig; - KBase_Init(&self->__base, cb, sizeof(*self), sig, ns); -} - -KINLINE CMPIStatus EnabledLogicalElementCapabilitiesLANEndpointRef_InitFromInstance( - EnabledLogicalElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const CMPIInstance* x) -{ - EnabledLogicalElementCapabilitiesLANEndpointRef_Init(self, cb, NULL); - return KBase_FromInstance(&self->__base, x); -} - -KINLINE CMPIStatus EnabledLogicalElementCapabilitiesLANEndpointRef_InitFromObjectPath( - EnabledLogicalElementCapabilitiesLANEndpointRef* self, - const CMPIBroker* cb, - const CMPIObjectPath* x) -{ - EnabledLogicalElementCapabilitiesLANEndpointRef_Init(self, cb, NULL); - return KBase_FromObjectPath(&self->__base, x); -} - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_Print( - const EnabledLogicalElementCapabilitiesLANEndpointRef* self, - FILE* os) -{ - KBase_Print(os, &self->__base, 'r'); -} - -KINLINE CMPIInstance* EnabledLogicalElementCapabilitiesLANEndpointRef_ToInstance( - const EnabledLogicalElementCapabilitiesLANEndpointRef* self, - CMPIStatus* status) -{ - return KBase_ToInstance(&self->__base, status); -} - -KINLINE CMPIObjectPath* EnabledLogicalElementCapabilitiesLANEndpointRef_ToObjectPath( - const EnabledLogicalElementCapabilitiesLANEndpointRef* self, - CMPIStatus* status) -{ - return KBase_ToObjectPath(&self->__base, status); -} - -KINLINE const char* EnabledLogicalElementCapabilitiesLANEndpointRef_NameSpace( - EnabledLogicalElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - return self->__base.ns ? KChars(self->__base.ns) : NULL; - return NULL; -} - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_SetString_InstanceID( - EnabledLogicalElementCapabilitiesLANEndpointRef* self, - CMPIString* x) -{ - if (self && self->__base.magic == KMAGIC) - { - KString* field = (KString*)&self->InstanceID; - KString_SetString(field, x); - } -} - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_Set_InstanceID( - EnabledLogicalElementCapabilitiesLANEndpointRef* self, - const char* s) -{ - if (self && self->__base.magic == KMAGIC) - { - KString* field = (KString*)&self->InstanceID; - KString_Set(field, self->__base.cb, s); - } -} - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_Null_InstanceID( - EnabledLogicalElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KString* field = (KString*)&self->InstanceID; - KString_Null(field); - } -} - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpointRef_Clr_InstanceID( - EnabledLogicalElementCapabilitiesLANEndpointRef* self) -{ - if (self && self->__base.magic == KMAGIC) - { - KString* field = (KString*)&self->InstanceID; - KString_Clr(field); - } -} - -/* -**============================================================================== -** -** struct EnabledLogicalElementCapabilitiesLANEndpoint -** -**============================================================================== -*/ - -/* classname=Linux_EnabledLogicalElementCapabilitiesLANEndpoint */ -typedef struct _EnabledLogicalElementCapabilitiesLANEndpoint -{ - KBase __base; - /* CIM_ManagedElement features */ - const KString Caption; - const KString Description; - const KString ElementName; - /* CIM_Capabilities features */ - const KString InstanceID; - /* CIM_EnabledLogicalElementCapabilities features */ - const KBoolean ElementNameEditSupported; - const KUint16 MaxElementNameLen; - const KUint16A RequestedStatesSupported; - const KString ElementNameMask; - const KUint16A StateAwareness; - /* Linux_EnabledLogicalElementCapabilitiesLANEndpoint features */ -} -EnabledLogicalElementCapabilitiesLANEndpoint; - -static const unsigned char __EnabledLogicalElementCapabilitiesLANEndpoint_sig[] = -{ - 0x32,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x45,0x6e,0x61,0x62,0x6c,0x65,0x64,0x4c, - 0x6f,0x67,0x69,0x63,0x61,0x6c,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x61, - 0x70,0x61,0x62,0x69,0x6c,0x69,0x74,0x69,0x65,0x73,0x4c,0x41,0x4e,0x45,0x6e, - 0x64,0x70,0x6f,0x69,0x6e,0x74,0x00,0x09,0x0c,0x07,0x43,0x61,0x70,0x74,0x69, - 0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f, - 0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65, - 0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x00, - 0x18,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x45,0x64,0x69, - 0x74,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x03,0x11,0x4d,0x61, - 0x78,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4c,0x65,0x6e, - 0x00,0x83,0x18,0x52,0x65,0x71,0x75,0x65,0x73,0x74,0x65,0x64,0x53,0x74,0x61, - 0x74,0x65,0x73,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x0c,0x0f, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x4d,0x61,0x73,0x6b, - 0x00,0x83,0x0e,0x53,0x74,0x61,0x74,0x65,0x41,0x77,0x61,0x72,0x65,0x6e,0x65, - 0x73,0x73,0x00, -}; - -KINLINE void EnabledLogicalElementCapabilitiesLANEndpoint_Init( - EnabledLogicalElementCapabilitiesLANEndpoint* self, - const CMPIBroker* cb, - const char* ns) -{ -... [truncated message content] |
From: <mik...@us...> - 2008-08-19 18:31:33
|
Revision: 863 http://omc.svn.sourceforge.net/omc/?rev=863&view=rev Author: mike-brasher Date: 2008-08-19 18:31:43 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Fixed failure of EnumInstances on Linux_GrubBootSourceSetting. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c 2008-08-19 18:20:34 UTC (rev 862) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/SourceSettingProvider.c 2008-08-19 18:31:43 UTC (rev 863) @@ -33,27 +33,6 @@ const CMPIObjectPath* cop, const char** properties) { - CMReturn(CMPI_RC_OK); -} - -static CMPIStatus SourceSettingGetInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const char** properties) -{ - return KDefaultGetInstance( - _cb, mi, cc, cr, cop, properties); -} - -static CMPIStatus SourceSettingCreateInstance( - CMPIInstanceMI* mi, - const CMPIContext* cc, - const CMPIResult* cr, - const CMPIObjectPath* cop, - const CMPIInstance* ci) -{ struct GrubMenu menu; size_t i; @@ -101,6 +80,27 @@ CMReturn(CMPI_RC_OK); } +static CMPIStatus SourceSettingGetInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const char** properties) +{ + return KDefaultGetInstance( + _cb, mi, cc, cr, cop, properties); +} + +static CMPIStatus SourceSettingCreateInstance( + CMPIInstanceMI* mi, + const CMPIContext* cc, + const CMPIResult* cr, + const CMPIObjectPath* cop, + const CMPIInstance* ci) +{ + CMReturn(CMPI_RC_OK); +} + static CMPIStatus SourceSettingModifyInstance( CMPIInstanceMI* mi, const CMPIContext* cc, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mik...@us...> - 2008-08-19 18:20:27
|
Revision: 862 http://omc.svn.sourceforge.net/omc/?rev=862&view=rev Author: mike-brasher Date: 2008-08-19 18:20:34 +0000 (Tue, 19 Aug 2008) Log Message: ----------- New utility to test grub resource code apart from profile. Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c Added Paths: ----------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c 2008-08-19 16:42:27 UTC (rev 861) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.c 2008-08-19 18:20:34 UTC (rev 862) @@ -174,7 +174,7 @@ return 0; } -#if 0 +#if LSGRUB static int _printGrubMenuItem(const struct GrubMenuItem* item) { printf(" GrubMenuItem\n"); Added: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak (rev 0) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/lsgrub.mak 2008-08-19 18:20:34 UTC (rev 862) @@ -0,0 +1,2 @@ +all: + gcc -I/usr/include/cmpi -o lsgrub -DLSGRUB Resource.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2008-08-19 16:42:17
|
Revision: 861 http://omc.svn.sourceforge.net/omc/?rev=861&view=rev Author: npaxton Date: 2008-08-19 16:42:27 +0000 (Tue, 19 Aug 2008) Log Message: ----------- register RegisteredProfile and ReferencedProfile in interop rather than cimv2 namespace Modified Paths: -------------- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg 2008-08-19 16:32:34 UTC (rev 860) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg 2008-08-19 16:42:27 UTC (rev 861) @@ -38,13 +38,13 @@ provider: Linux_BootReferencedProfile location: linux_bootctrlprovider type: instance association - namespace: root/cimv2 + namespace: root/interop # [Linux_BootRegisteredProfile] provider: Linux_BootRegisteredProfile location: linux_bootctrlprovider type: instance method - namespace: root/cimv2 + namespace: root/interop # [Linux_BootServiceAffectsElement] provider: Linux_BootServiceAffectsElement Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration 2008-08-19 16:32:34 UTC (rev 860) +++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration 2008-08-19 16:42:27 UTC (rev 861) @@ -4,7 +4,7 @@ Linux_BootElementSettingData root/cimv2 Linux_BootElementSettingData linux_bootctrlprovider instance association Linux_BootHostedService root/cimv2 Linux_BootHostedService linux_bootctrlprovider instance association Linux_BootOrderedComponent root/cimv2 Linux_BootOrderedComponent linux_bootctrlprovider instance association -Linux_BootReferencedProfile root/cimv2 Linux_BootReferencedProfile linux_bootctrlprovider instance association -Linux_BootRegisteredProfile root/cimv2 Linux_BootRegisteredProfile linux_bootctrlprovider instance method +Linux_BootReferencedProfile root/interop Linux_BootReferencedProfile linux_bootctrlprovider instance association +Linux_BootRegisteredProfile root/interop Linux_BootRegisteredProfile linux_bootctrlprovider instance method Linux_BootServiceAffectsElement root/cimv2 Linux_BootServiceAffectsElement linux_bootctrlprovider instance association Linux_GrubBootSourceSetting root/cimv2 Linux_GrubBootSourceSetting linux_bootctrlprovider instance method Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-19 16:32:34 UTC (rev 860) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-19 16:42:27 UTC (rev 861) @@ -44,13 +44,13 @@ provider: Linux_FanReferencedProfile location: linux_fanprovider type: instance association - namespace: root/cimv2 + namespace: root/interop # [Linux_FanRegisteredProfile] provider: Linux_FanRegisteredProfile location: linux_fanprovider type: instance method - namespace: root/cimv2 + namespace: root/interop # [Linux_FanSystemDevice] provider: Linux_FanSystemDevice Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-19 16:32:34 UTC (rev 860) +++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-19 16:42:27 UTC (rev 861) @@ -5,6 +5,6 @@ Linux_FanMemberOfCollection root/cimv2 Linux_FanMemberOfCollection linux_fanprovider instance association Linux_FanOwningCollectionElement root/cimv2 Linux_FanOwningCollectionElement linux_fanprovider instance association Linux_FanRedundancySet root/cimv2 Linux_FanRedundancySet linux_fanprovider instance method -Linux_FanReferencedProfile root/cimv2 Linux_FanReferencedProfile linux_fanprovider instance association -Linux_FanRegisteredProfile root/cimv2 Linux_FanRegisteredProfile linux_fanprovider instance method +Linux_FanReferencedProfile root/interop Linux_FanReferencedProfile linux_fanprovider instance association +Linux_FanRegisteredProfile root/interop Linux_FanRegisteredProfile linux_fanprovider instance method Linux_FanSystemDevice root/cimv2 Linux_FanSystemDevice linux_fanprovider instance association This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2008-08-19 16:32:26
|
Revision: 860 http://omc.svn.sourceforge.net/omc/?rev=860&view=rev Author: npaxton Date: 2008-08-19 16:32:34 +0000 (Tue, 19 Aug 2008) Log Message: ----------- minor fix for when class is passed in from cmd-line Modified Paths: -------------- cmpiprofiles/test/trunk/AllSanityTest.py Modified: cmpiprofiles/test/trunk/AllSanityTest.py =================================================================== --- cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-18 20:06:13 UTC (rev 859) +++ cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-19 16:32:34 UTC (rev 860) @@ -75,7 +75,7 @@ print if globalClass != None and globalClass != '': try: - self._test_provider(globalClass) + self._test_provider(globalClass, globalNamespace) except: print '-'*60 traceback.print_exc(file=sys.stdout) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jc...@us...> - 2008-08-18 20:06:13
|
Revision: 859 http://omc.svn.sourceforge.net/omc/?rev=859&view=rev Author: jcarey Date: 2008-08-18 20:06:13 +0000 (Mon, 18 Aug 2008) Log Message: ----------- Changed version number to 1.0.1 Modified Paths: -------------- contrib/xen-vm-builder/trunk/configure.ac Modified: contrib/xen-vm-builder/trunk/configure.ac =================================================================== --- contrib/xen-vm-builder/trunk/configure.ac 2008-08-18 19:40:23 UTC (rev 858) +++ contrib/xen-vm-builder/trunk/configure.ac 2008-08-18 20:06:13 UTC (rev 859) @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(sblim-cmpi-xenvm-builder, 1.0.0) +AC_INIT(sblim-cmpi-xenvm-builder, 1.0.1) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADER([config.h]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2008-08-18 19:40:21
|
Revision: 858 http://omc.svn.sourceforge.net/omc/?rev=858&view=rev Author: npaxton Date: 2008-08-18 19:40:23 +0000 (Mon, 18 Aug 2008) Log Message: ----------- move to new registration scheme with .reg file instead of .registration file; checkin the modifed spec to sync up with the one that has been working in obs for a while now Modified Paths: -------------- contrib/xen-vm-builder/trunk/mof/Makefile.am contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec Modified: contrib/xen-vm-builder/trunk/mof/Makefile.am =================================================================== --- contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-08-18 16:56:00 UTC (rev 857) +++ contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-08-18 19:40:23 UTC (rev 858) @@ -12,7 +12,8 @@ owning-job-peg.reg \ settings-define-build-peg.reg \ vmcreation-data-peg.reg \ - XEN_VMBuilder.registration + XEN_VMBuilder.registration \ + XEN_VMBuilder.reg mofdir = $(datadir)/mof/$(PACKAGE_NAME) Modified: contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec =================================================================== --- contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec 2008-08-18 16:56:00 UTC (rev 857) +++ contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec 2008-08-18 19:40:23 UTC (rev 858) @@ -1,7 +1,7 @@ # # spec file for package sblim-cmpi-xenvm-builder (Version 1.0.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,39 +9,38 @@ # # norootforbuild -# usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison blocxx blocxx-devel bzip2 cim-schema coreutils cpio cpp cracklib cvs cyrus-sasl db dbus-1 dbus-1-glib dejagnu diffutils docbook-xsl-stylesheets docbook_4 doxygen e2fsprogs expat expect file filesystem fillup findutils flex fop gawk gcc gcc-c++ gdbm gdbm-devel gettext gettext-devel glib2 glibc glibc-devel glibc-locale gnome-filesystem gpm grep groff gzip hal hwinfo hwinfo-devel info insserv java-1_4_2-sun jpackage-utils klogd less libacl libapr-util1 libapr1 libattr libcom_err libgcc libgcrypt libgpg-error libltdl libnscd libpng libstdc++ libstdc++-devel libtool libusb libvolume_id libxcrypt libxml2 libxslt libzio limal limal-devel limal-devtools limal-runlevel limal-runlevel-devel m4 make man mktemp module-init-tools ncurses ncurses-devel neon net-tools netcfg openldap2-client openslp openslp-devel openssl openssl-devel openwbem openwbem-devel pam pam-devel pam-modules patch pcre pcre-devel perl perl-Config-IniFiles perl-XML-Parser perl-XML-Writer permissions pkgconfig popt procinfo procps psmisc pwdutils rcs readline recode rpm sed strace subversion swig sysfsutils sysvinit tar tcl tcpd texinfo timezone udev unzip util-linux vim wireless-tools zlib zlib-devel + Name: sblim-cmpi-xenvm-builder -BuildRequires: gcc sblim-cmpi-devel sblim-cmpiutil-devel sqlite-devel pkgconfig +BuildRequires: gcc pkgconfig sblim-cmpi-devel sblim-cmpiutil sblim-cmpiutil-devel sqlite-devel sblim-sfcb sblim-cmpi-base %define tarname sblim-cmpi-xenvm-builder -URL: http://www.omc-project.org -%define sblimprefix /usr - +Url: http://www.omc-project.org # Increment the version every time the source code changes. -Version: 1.0.0 -Release: 1 +Version: 1.0.1 +Release: 0.2 Group: System/Management -Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation. -PreReq: %{_datadir}/sblim-cmpi-base/provider-register.sh coreutils -License: Other License(s), see package, Commercial - +Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation +PreReq: coreutils +License: Other uncritical OpenSource License # This is necessary to build the RPM as a non-root user. BuildRoot: %{_tmppath}/%{name}-%{version}-build # "yes" is the default, but we put it here explicitly to avoid someone # setting it to "no" -AutoReqProv: yes -Requires: cim-server, cim-schema, sblim-cmpiutil sblim-cmpi-base xen-tools +AutoReqProv: yes +Requires: sblim-sfcb cim-schema sblim-cmpiutil sblim-cmpi-base xen-tools Source0: %{tarname}-%{version}.tar.gz #Source1: %{tarname}-mof.tar.bz2 %description -Linux CIM providers for CMPI instrumentation of XEN virtual machine creation. +Linux CIM providers for CMPI instrumentation of XEN virtual machine +creation. + + Authors: -------- Jon Carey - %prep # Untar the sources. %setup -n %{tarname}-%{version} @@ -55,68 +54,61 @@ autoreconf --force --install CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ -./configure --prefix=%{sblimprefix} \ - --libdir=%_libdir -make %{?jobs:-j%jobs} +%configure +%{__make} %install %{__rm} -rf $RPM_BUILD_ROOT %{__mkdir} -p $RPM_BUILD_ROOT # Tell 'make install' to install into the BuildRoot make DESTDIR=$RPM_BUILD_ROOT install -MOFDIR=$RPM_BUILD_ROOT/%{sblimprefix}/share/%{name} -install -d $MOFDIR -install mof/*.mof $MOFDIR/ -install mof/*.registration $MOFDIR/ -install mof/*-peg.reg $MOFDIR/ -%{__rm} -f $RPM_BUILD_ROOT%{sblimprefix}/%_lib/cmpi/*.{a,la} -%{__rm} -f $RPM_BUILD_ROOT%{sblimprefix}/%_lib/libcmpixen*.{a,la} +#MOFDIR=$RPM_BUILD_ROOT/%{_datadir}/mof/%{name} +#install -d $MOFDIR +#install mof/*.mof $MOFDIR/ +#install mof/*.registration $MOFDIR/ +#install mof/*-peg.reg $MOFDIR/ +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.{a,la} +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libcmpixen*.{a,la} %clean %{__rm} -rf $RPM_BUILD_ROOT %pre # Conditional definition of schema and registration files -%define SCHEMA %{_datadir}/%{name}/XEN_VMBuilder.mof -%define REGISTRATION %{_datadir}/%{name}/XEN_VMBuilder.registration -%define PROVREG %{_datadir}/sblim-cmpi-base/provider-register.sh - -# If upgrading, deregister old version +%define SCHEMA %{_datadir}/mof/%{name}/XEN_VMBuilder.mof +%define REGISTRATION %{_datadir}/mof/%{name}/XEN_VMBuilder.reg +# If upgrading/not new install/not removing, deregister old version if [ $1 -gt 1 ] then - %{PROVREG} -d -r %{REGISTRATION} -m %{SCHEMA} > /dev/null +# /usr/sbin/provider-register.sh -d -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof + sfcbunstage -n root/cimv2 -r XEN_VMBuilder.reg XEN_VMBuilder.mof + sfcbrepos -f + /etc/init.d/sfcb condrestart fi %post -# Any RPM that installs a shared library into any directory -# listed in /etc/ld.so.conf (or into /usr/lib if it hasn't been -# fixed yet to install into the correct FHS compliant paths) -# must run ldconfig in its post install script. -%run_ldconfig -# load MOF -MOFDIR=%{sblimprefix}/share/%{name} +/sbin/ldconfig +#/usr/sbin/provider-register.sh -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof +sfcbstage -n root/cimv2 -r %{REGISTRATION} %{SCHEMA} +sfcbrepos -f +/etc/init.d/sfcb condrestart -%{PROVREG} -r %{REGISTRATION} -m %{SCHEMA} - %preun -%{PROVREG} -r %{REGISTRATION} -m %{SCHEMA} +# If removing (not upgrading) then de-register, before the files are gone +if [ "x$1" = "x0" ]; then +# /usr/sbin/provider-register.sh -d -r %{_datadir}/mof/%{name}/*.registration -m %{_datadir}/mof/%{name}/*.mof + sfcbunstage -n root/cimv2 -r XEN_VMBuilder.reg XEN_VMBuilder.mof + sfcbrepos -f + /etc/init.d/sfcb condrestart +fi -# if -e operation, not -U -#if remove/not an upgrade, then deregister -if [ "x$1" = "x0" ]; then -%{PROVREG} -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof -fi - -%postun -%run_ldconfig - %files %defattr(-,root,root) -%{sblimprefix}/%_lib/cmpi/*.so* -%{sblimprefix}/%_lib/libcmpixen*.so* +/%{_libdir}/cmpi/*.so* +/%{_libdir}/libcmpixen*.so* +%dir %{_datadir}/mof/%{name} +%{_datadir}/mof/%{name}/* -%dir %{sblimprefix}/share/%{name} -%{sblimprefix}/share/%{name}/* - -%changelog -n sblim-cmpi-xenvm-builder - +%changelog +* Mon Jul 07 2008 - jc...@no... +- Initial Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |