Hello community, here is the log from the commit of package cmpi-pywbem-base checked in at Sat Nov 8 00:50:06 CET 2008. -------- --- cmpi-pywbem-base/cmpi-pywbem-base.changes 2008-09-23 22:28:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmpi-pywbem-base/cmpi-pywbem-base.changes 2008-09-27 20:05:34.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 27 12:05:10 MDT 2008 - bwhiteley@suse.de + +- moved providers to root/suse namespace +- make use of cmpi-provider-register + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmpi-pywbem-base.spec ++++++ --- /var/tmp/diff_new_pack.g18178/_old 2008-11-08 00:48:56.000000000 +0100 +++ /var/tmp/diff_new_pack.g18178/_new 2008-11-08 00:48:56.000000000 +0100 @@ -20,9 +20,10 @@ Name: cmpi-pywbem-base BuildRequires: python-devel sblim-sfcb -BuildRequires: cmpi-bindings-pywbem +BuildRequires: cmpi-bindings-pywbem cmpi-provider-register +PreReq: /usr/sbin/cmpi-provider-register Version: 0.2.0 -Release: 1 +Release: 2 Group: System/Management Summary: Base System Providers License: BSD 3-Clause @@ -69,54 +70,64 @@ %pre if [ $1 -gt 1 ]; then - if [ -x /usr/bin/peg-loadmof.sh ]; then - peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof - peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg - fi - if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then - %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg - pushd /usr/share/mof/%{name}/ - for i in *.mof; do - %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i - done - popd - /usr/bin/sfcbrepos -f - fi + /usr/sbin/cmpi-provider-register -r -x -d /usr/share/mof/%{name} fi +#if [ $1 -gt 1 ]; then +# if [ -x /usr/bin/peg-loadmof.sh ]; then +# peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof +# peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg +# fi +# if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then +# %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg +# pushd /usr/share/mof/%{name}/ +# for i in *.mof; do +# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i +# done +# popd +# /usr/bin/sfcbrepos -f +# fi +#fi %post -if [ -x /usr/bin/peg-loadmof.sh ]; then - peg-loadmof.sh -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg - peg-loadmof.sh -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof -fi -if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then - mkdir -p /var/lib/sfcb/stage/mofs/root/cimv2/ - ln -sf /usr/share/mof/%{name}/*.mof /var/lib/sfcb/stage/mofs/root/cimv2/ - %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/OMC_Base.mof - ln -sf /usr/share/mof/%{name}/*.sfcb.reg /var/lib/sfcb/stage/regs/ - /usr/bin/sfcbrepos -f - /etc/init.d/sfcb condrestart -fi +/usr/sbin/cmpi-provider-register -d /usr/share/mof/%{name} +#if [ -x /usr/bin/peg-loadmof.sh ]; then +# peg-loadmof.sh -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg +# peg-loadmof.sh -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof +#fi +#if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then +# mkdir -p /var/lib/sfcb/stage/mofs/root/cimv2/ +# ln -sf /usr/share/mof/%{name}/*.mof /var/lib/sfcb/stage/mofs/root/cimv2/ +# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/OMC_Base.mof +# ln -sf /usr/share/mof/%{name}/*.sfcb.reg /var/lib/sfcb/stage/regs/ +# /usr/bin/sfcbrepos -f +# /etc/init.d/sfcb condrestart +#fi %preun if [ "$1" = "0" ] ; then - if [ -x /usr/bin/peg-loadmof.sh ] ; then - # last uninstall, not upgrade - peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg - peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof - fi - if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then - %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg - pushd /usr/share/mof/%{name}/ - for i in *.mof; do - %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i - done - popd - /usr/bin/sfcbrepos -f - /etc/init.d/sfcb condrestart - fi + /usr/sbin/cmpi-provider-register -r -d /usr/share/mof/%{name} fi +#if [ "$1" = "0" ] ; then +# if [ -x /usr/bin/peg-loadmof.sh ] ; then +# # last uninstall, not upgrade +# peg-loadmof.sh -r -n root/PG_InterOp /usr/share/mof/%{name}/*-peg.reg +# peg-loadmof.sh -r -n root/cimv2 /usr/share/mof/%{name}/OMC_Base.mof +# fi +# if [ -x /usr/bin/sfcbrepos -a -d /var/lib/sfcb/stage ]; then +# %{__rm} /var/lib/sfcb/stage/regs/OMC_Base.sfcb.reg +# pushd /usr/share/mof/%{name}/ +# for i in *.mof; do +# %{__rm} -f /var/lib/sfcb/stage/mofs/root/cimv2/$i +# done +# popd +# /usr/bin/sfcbrepos -f +# /etc/init.d/sfcb condrestart +# fi +#fi %changelog +* Sat Sep 27 2008 bwhiteley@suse.de +- moved providers to root/suse namespace +- make use of cmpi-provider-register * Tue Sep 23 2008 bwhiteley@suse.de - Initial package ++++++ cmpi-pywbem-base-0.2.0.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/deploy.mof new/cmpi-pywbem-base-0.2.0/deploy.mof --- old/cmpi-pywbem-base-0.2.0/deploy.mof 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/deploy.mof 2008-09-27 18:42:20.000000000 +0200 @@ -0,0 +1,8 @@ +#pragma namespace ("root/suse") +#pragma include ("OMC_ComputerSystem.mof") +#pragma include ("OMC_OperatingSystem.mof") +#pragma include ("OMC_LogicalFile.mof") +#pragma include ("OMC_UnixProcess.mof") +#pragma include ("OMC_InitdService.mof") +#pragma include ("OMC_TimeService.mof") +#pragma include ("OMC_SyslogNG.mof") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_Base.mof new/cmpi-pywbem-base-0.2.0/OMC_Base.mof --- old/cmpi-pywbem-base-0.2.0/OMC_Base.mof 2008-09-15 23:30:53.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_Base.mof 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#pragma include ("OMC_ComputerSystem.mof") -#pragma include ("OMC_OperatingSystem.mof") -#pragma include ("OMC_LogicalFile.mof") -#pragma include ("OMC_UnixProcess.mof") -#pragma include ("OMC_InitdService.mof") -#pragma include ("OMC_TimeService.mof") -#pragma include ("OMC_SyslogNG.mof") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_Base.sfcb.reg new/cmpi-pywbem-base-0.2.0/OMC_Base.sfcb.reg --- old/cmpi-pywbem-base-0.2.0/OMC_Base.sfcb.reg 2008-09-16 05:25:49.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_Base.sfcb.reg 2008-09-27 18:39:52.000000000 +0200 @@ -2,185 +2,185 @@ provider: OMC_ComputerSystem location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse # Operating System [OMC_OperatingSystem] provider: OMC_OperatingSystem location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse [OMC_InstalledOS] provider: OMC_OperatingSystem location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_RunningOS] provider: OMC_OperatingSystem location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse # Unix Process [OMC_UnixProcess] provider: OMC_UnixProcess location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse [OMC_ProcessExecutable] provider: OMC_UnixProcess location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_OSProcess] provider: OMC_UnixProcess location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse # Logical File [OMC_LinuxDirectoryContainsFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxFileIdentity] provider: OMC_LogicalFile location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxDataFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxSocketFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxDeviceFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxDirectory] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxFIFOPipeFile] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_LinuxSymbolicLink] provider: OMC_LogicalFile location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse # Initd service [OMC_InitdService] provider: OMC_InitdService location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse # Syslog [OMC_SyslogNGRecordLogCapabilities] provider: OMC_SyslogNG location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_SyslogNGRecordLogCapabilities] provider: OMC_SyslogNG location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_SyslogNGUseOfLog] provider: OMC_SyslogNG location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_SyslogNGLogManagesRecord] provider: OMC_SyslogNG location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_SyslogNGLogRecord] provider: OMC_SyslogNG location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_SyslogNGRecordLog] provider: OMC_SyslogNG location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse # TimeService [OMC_SystemTimeService] provider: OMC_TimeService location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse [OMC_HostedTimeService] provider: OMC_TimeService location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_RemoteTimeServicePort] provider: OMC_TimeService location: pyCmpiProvider type: instance method - namespace: root/cimv2 + namespace: root/suse [OMC_TimeServiceAccessBySAP] provider: OMC_TimeService location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_TimeZoneSettingData] provider: OMC_TimeService location: pyCmpiProvider type: instance - namespace: root/cimv2 + namespace: root/suse [OMC_TimeServiceTimeZoneSettingData] provider: OMC_TimeService location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse [OMC_TimeServiceAvailableToElement] provider: OMC_TimeService location: pyCmpiProvider type: instance association - namespace: root/cimv2 + namespace: root/suse diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem-peg.reg 2008-09-16 05:52:37.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -//////// OMC_ComputerSystem -instance of PG_ProviderModule -{ - Name = "/usr/lib/pycim/OMC_ComputerSystem.py"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "0.1.0"; -}; - -instance of PG_Provider -{ - Name = "OMC_ComputerSystem"; - ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_ComputerSystem"; - ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; - ProviderName = "OMC_ComputerSystem"; - ClassName = "OMC_ComputerSystem"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_HostNameSettingData"; - ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; - ProviderName = "OMC_ComputerSystem"; - ClassName = "OMC_HostNameSettingData"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_ComputerSystemHostNameSettingData"; - ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; - ProviderName = "OMC_ComputerSystem"; - ClassName = "OMC_ComputerSystemHostNameSettingData"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Associator -}; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.peg.reg 2008-09-27 18:40:21.000000000 +0200 @@ -0,0 +1,48 @@ +//////// OMC_ComputerSystem +instance of PG_ProviderModule +{ + Name = "/usr/lib/pycim/OMC_ComputerSystem.py"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "0.1.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_ComputerSystem"; + ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_ComputerSystem"; + ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; + ProviderName = "OMC_ComputerSystem"; + ClassName = "OMC_ComputerSystem"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_HostNameSettingData"; + ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; + ProviderName = "OMC_ComputerSystem"; + ClassName = "OMC_HostNameSettingData"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_ComputerSystemHostNameSettingData"; + ProviderModuleName = "/usr/lib/pycim/OMC_ComputerSystem.py"; + ProviderName = "OMC_ComputerSystem"; + ClassName = "OMC_ComputerSystemHostNameSettingData"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Associator +}; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.py new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.py --- old/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.py 2008-09-15 23:43:21.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_ComputerSystem.py 2008-09-17 05:49:18.000000000 +0200 @@ -46,28 +46,6 @@ """ def get_instance(self, env, model): - """Return an instance. - - Keyword arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - model -- A template of the pywbem.CIMInstance to be returned. The - key properties are set on this instance to correspond to the - instanceName that was requested. The properties of the model - are already filtered according to the PropertyList from the - request. Only properties present in the model need to be - given values. If you prefer, you can set all of the - values, and the instance will be filtered for you. - cim_class -- The pywbem.CIMClass - - Possible Errors: - CIM_ERR_ACCESS_DENIED - CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - or otherwise incorrect parameters) - CIM_ERR_NOT_FOUND (the CIM Class does exist, but the requested CIM - Instance does not exist in the specified namespace) - CIM_ERR_FAILED (some other unspecified error occurred) - - """ logger = env.get_logger() logger.log_debug('Entering %s.get_instance()' \ @@ -104,28 +82,6 @@ return model def enum_instances(self, env, model, keys_only): - """Enumerate instances. - - The WBEM operations EnumerateInstances and EnumerateInstanceNames - are both mapped to this method. - This method is a python generator - - Keyword arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - model -- A template of the pywbem.CIMInstances to be generated. - The properties of the model are already filtered according to - the PropertyList from the request. Only properties present in - the model need to be given values. If you prefer, you can - always set all of the values, and the instance will be filtered - for you. - cim_class -- The pywbem.CIMClass - keys_only -- A boolean. True if only the key properties should be - set on the generated instances. - - Possible Errors: - CIM_ERR_FAILED (some other unspecified error occurred) - - """ logger = env.get_logger() logger.log_debug('Entering %s.enum_instances()' \ @@ -140,40 +96,13 @@ yield model else: try: - yield self.get_instance(env, model, cim_class) + yield self.get_instance(env, model) except pywbem.CIMError, (num, msg): if num not in (pywbem.CIM_ERR_NOT_FOUND, pywbem.CIM_ERR_ACCESS_DENIED): raise def set_instance(self, env, instance, modify_existing): - """Return a newly created or modified instance. - - Keyword arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - instance -- The new pywbem.CIMInstance. If modifying an existing - instance, the properties on this instance have been filtered by - the PropertyList from the request. - previous_instance -- The previous pywbem.CIMInstance if modifying - an existing instance. None if creating a new instance. - cim_class -- The pywbem.CIMClass - - Return the new instance. The keys must be set on the new instance. - - Possible Errors: - CIM_ERR_ACCESS_DENIED - CIM_ERR_NOT_SUPPORTED - CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - or otherwise incorrect parameters) - CIM_ERR_ALREADY_EXISTS (the CIM Instance already exists -- only - valid if previous_instance is None, indicating that the operation - was CreateInstance) - CIM_ERR_NOT_FOUND (the CIM Instance does not exist -- only valid - if previous_instance is not None, indicating that the operation - was ModifyInstance) - CIM_ERR_FAILED (some other unspecified error occurred) - - """ logger = env.get_logger() logger.log_debug('Entering %s.set_instance()' \ @@ -183,26 +112,6 @@ return instance def delete_instance(self, env, instance_name): - """Delete an instance. - - Keyword arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - instance_name -- A pywbem.CIMInstanceName specifying the instance - to delete. - - Possible Errors: - CIM_ERR_ACCESS_DENIED - CIM_ERR_NOT_SUPPORTED - CIM_ERR_INVALID_NAMESPACE - CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - or otherwise incorrect parameters) - CIM_ERR_INVALID_CLASS (the CIM Class does not exist in the specified - namespace) - CIM_ERR_NOT_FOUND (the CIM Class does exist, but the requested CIM - Instance does not exist in the specified namespace) - CIM_ERR_FAILED (some other unspecified error occurred) - - """ logger = env.get_logger() logger.log_debug('Entering %s.delete_instance()' \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_InitdService-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_InitdService-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_InitdService-peg.reg 2008-09-16 05:52:40.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_InitdService-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -//////// OMC_InitdService -instance of PG_ProviderModule -{ - Name = "/usr/lib/pycim/OMC_InitdService.py"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "0.1.0"; -}; - -instance of PG_Provider -{ - Name = "OMC_InitdService"; - ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_InitdService"; - ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; - ProviderName = "OMC_InitdService"; - ClassName = "OMC_InitdService"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_InitdService.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_InitdService.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_InitdService.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_InitdService.peg.reg 2008-09-27 18:40:23.000000000 +0200 @@ -0,0 +1,28 @@ +//////// OMC_InitdService +instance of PG_ProviderModule +{ + Name = "/usr/lib/pycim/OMC_InitdService.py"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "0.1.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_InitdService"; + ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_InitdService"; + ProviderModuleName = "/usr/lib/pycim/OMC_InitdService.py"; + ProviderName = "OMC_InitdService"; + ClassName = "OMC_InitdService"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_InitdService.py new/cmpi-pywbem-base-0.2.0/OMC_InitdService.py --- old/cmpi-pywbem-base-0.2.0/OMC_InitdService.py 2008-09-16 04:52:30.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_InitdService.py 2008-10-24 22:47:15.000000000 +0200 @@ -38,7 +38,7 @@ import pywbem from pywbem.cim_provider2 import CIMProvider2 import os -from subprocess import call +from subprocess import call, Popen, PIPE from socket import getfqdn def _blacklist(file): @@ -79,6 +79,41 @@ return False +#------------------------------------------------------------------------------ +def _get_rpm_install_date(fullpath): + try: + l=Popen([r'/bin/rpm', '-qf', '--queryformat', \ + '%{INSTALLTIME}', fullpath], \ + stdout=PIPE).communicate()[0] + if len(l): + return pywbem.CIMDateTime.fromtimestamp(long(l)) + except: + pass + return None + +#------------------------------------------------------------------------------ +def _is_auto_start(name): + try: + fo = open('/etc/inittab', 'r') + for line in fo.xreadlines(): + if line.startswith('id:'): + runlevel = line.split(':')[1] + fo.close() + break + else: + fo.close() + return False + ents = os.listdir('/etc/init.d/rc%s.d' % runlevel) + for ent in ents: + if ent.startswith('S') and ent[3:] == name: + return True + else: + return False + except: + print '**** Exception caught in _is_auto_start() !!' + pass + return False + class OMC_InitdServiceProvider(CIMProvider2): """Instrument the CIM class OMC_InitdService @@ -99,17 +134,28 @@ logger.log_debug('Entering %s.get_instance() for %s' \ % (self.__class__.__name__, model['name'])) - #model['Caption'] = # TODO (type = unicode) - #model['Description'] = # TODO (type = unicode) #model['ElementName'] = # TODO (type = unicode) - #model['EnabledDefault'] = # TODO (type = pywbem.Uint16 self.Values.EnabledDefault) (default=2L) #model['EnabledState'] = # TODO (type = pywbem.Uint16 self.Values.EnabledState) (default=5L) #model['HealthState'] = # TODO (type = pywbem.Uint16 self.Values.HealthState) - #model['InstallDate'] = # TODO (type = pywbem.CIMDateTime) fullpath = '/etc/init.d/' + model['name'] if not filtered and (_blacklist(model['name']) or not os.path.isfile(fullpath)): raise pywbem.CIMError(CIM_ERR_NOT_FOUND) + + fo = open(fullpath, 'r') + caption = model['name'] + for line in fo.xreadlines(): + if line.startswith('#') and 'Short-Description:' in line: + caption = line[line.find(':')+1:] + break + if caption: + model['Caption'] = caption + model['Description'] = caption + + idt = _get_rpm_install_date(fullpath) + if idt: + model['InstallDate'] = idt + osts = [] cmd = fullpath + ' status' st = call(cmd, shell=True) @@ -127,6 +173,14 @@ if osts: model['OperationalStatus'] = osts + is_auto_start = _is_auto_start(model['name']) + model['StartMode'] = is_auto_start and 'Automatic' or 'Manual' + model['EnabledDefault'] = is_auto_start and \ + self.Values.EnabledDefault.Enabled or \ + self.Values.EnabledDefault.Disabled + + svcStarted = (st == self.Values.ServiceStatus.Service_Running) + model['Started'] = svcStarted #model['OperationalStatus'] = # TODO (type = [pywbem.Uint16,] self.Values.OperationalStatus) #model['OtherEnabledState'] = # TODO (type = unicode) #model['RequestedState'] = # TODO (type = pywbem.Uint16 self.Values.RequestedState) (default=12L) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_LogicalFile-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_LogicalFile-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_LogicalFile-peg.reg 2008-09-16 05:52:42.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_LogicalFile-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -//////// OMC_LogicalFile -instance of PG_ProviderModule -{ - Name = "/usr/lib/pycim/OMC_LogicalFile.py"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "0.1.0"; -}; - -instance of PG_Provider -{ - Name = "OMC_LogicalFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxDirectoryContainsFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxDirectoryContainsFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxFileIdentity"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxFileIdentity"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxDataFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxDataFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxSocketFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxSocketFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxDeviceFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxDeviceFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxDirectory"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxDirectory"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxFIFOPipeFile"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxFIFOPipeFile"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_LinuxSymbolicLink"; - ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; - ProviderName = "OMC_LogicalFile"; - ClassName = "OMC_LinuxSymbolicLink"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_LogicalFile.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_LogicalFile.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_LogicalFile.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_LogicalFile.peg.reg 2008-09-27 18:40:31.000000000 +0200 @@ -0,0 +1,109 @@ +//////// OMC_LogicalFile +instance of PG_ProviderModule +{ + Name = "/usr/lib/pycim/OMC_LogicalFile.py"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "0.1.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_LogicalFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxDirectoryContainsFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxDirectoryContainsFile"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxFileIdentity"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxFileIdentity"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxFile"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxDataFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxDataFile"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxSocketFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxSocketFile"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxDeviceFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxDeviceFile"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxDirectory"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxDirectory"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxFIFOPipeFile"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxFIFOPipeFile"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_LinuxSymbolicLink"; + ProviderModuleName = "/usr/lib/pycim/OMC_LogicalFile.py"; + ProviderName = "OMC_LogicalFile"; + ClassName = "OMC_LinuxSymbolicLink"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem-peg.reg 2008-09-16 05:52:44.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -//////// OMC_OperatingSystem -instance of PG_ProviderModule -{ - Name = "/usr/lib/pycim/OMC_OperatingSystem.py"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "0.1.0"; -}; - -instance of PG_Provider -{ - Name = "OMC_OperatingSystem"; - ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_OperatingSystem"; - ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; - ProviderName = "OMC_OperatingSystem"; - ClassName = "OMC_OperatingSystem"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_InstalledOS"; - ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; - ProviderName = "OMC_OperatingSystem"; - ClassName = "OMC_InstalledOS"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_RunningOS"; - ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; - ProviderName = "OMC_OperatingSystem"; - ClassName = "OMC_RunningOS"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_OperatingSystem.peg.reg 2008-09-27 18:40:35.000000000 +0200 @@ -0,0 +1,48 @@ +//////// OMC_OperatingSystem +instance of PG_ProviderModule +{ + Name = "/usr/lib/pycim/OMC_OperatingSystem.py"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "0.1.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_OperatingSystem"; + ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_OperatingSystem"; + ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; + ProviderName = "OMC_OperatingSystem"; + ClassName = "OMC_OperatingSystem"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_InstalledOS"; + ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; + ProviderName = "OMC_OperatingSystem"; + ClassName = "OMC_InstalledOS"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_RunningOS"; + ProviderModuleName = "/usr/lib/pycim/OMC_OperatingSystem.py"; + ProviderName = "OMC_OperatingSystem"; + ClassName = "OMC_RunningOS"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_SyslogNG-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_SyslogNG-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_SyslogNG-peg.reg 2008-09-16 05:52:47.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_SyslogNG-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,76 +0,0 @@ -// Pegasus Provider registration for OMC_SyslogNGRecordLog -instance of PG_ProviderModule -{ - Name = "/usr/lib/pycim/OMC_SyslogNG.py"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "1.0"; -}; -instance of PG_Provider -{ - Name = "OMC_SyslogNG"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; -}; -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGRecordLog"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGRecordLog"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGLogRecord"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGLogRecord"; - Namespaces = {"root/cimv2"}; // TODO - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGLogManagesRecord"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGLogManagesRecord"; - Namespaces = {"root/cimv2"}; // TODO - ProviderType = {2,3}; // Instance, Associator -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGUseOfLog"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGUseOfLog"; - Namespaces = {"root/cimv2"}; // TODO - ProviderType = {2,3}; // Instance, Associator -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGRecordLogCapabilities"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGRecordLogCapabilities"; - Namespaces = {"root/cimv2"}; // TODO - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_SyslogNGRecordLogToCapabilities"; - ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; - ProviderName = "OMC_SyslogNG"; - ClassName = "OMC_SyslogNGRecordLogToCapabilities"; - Namespaces = {"root/cimv2"}; // TODO - ProviderType = {2,3}; // Instance, Associator -}; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_SyslogNG.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_SyslogNG.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_SyslogNG.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_SyslogNG.peg.reg 2008-09-27 18:40:42.000000000 +0200 @@ -0,0 +1,76 @@ +// Pegasus Provider registration for OMC_SyslogNGRecordLog +instance of PG_ProviderModule +{ + Name = "/usr/lib/pycim/OMC_SyslogNG.py"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "1.0"; +}; +instance of PG_Provider +{ + Name = "OMC_SyslogNG"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; +}; +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGRecordLog"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGRecordLog"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGLogRecord"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGLogRecord"; + Namespaces = {"root/suse"}; // TODO + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGLogManagesRecord"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGLogManagesRecord"; + Namespaces = {"root/suse"}; // TODO + ProviderType = {2,3}; // Instance, Associator +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGUseOfLog"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGUseOfLog"; + Namespaces = {"root/suse"}; // TODO + ProviderType = {2,3}; // Instance, Associator +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGRecordLogCapabilities"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGRecordLogCapabilities"; + Namespaces = {"root/suse"}; // TODO + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_SyslogNGRecordLogToCapabilities"; + ProviderModuleName = "/usr/lib/pycim/OMC_SyslogNG.py"; + ProviderName = "OMC_SyslogNG"; + ClassName = "OMC_SyslogNGRecordLogToCapabilities"; + Namespaces = {"root/suse"}; // TODO + ProviderType = {2,3}; // Instance, Associator +}; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_TimeService-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_TimeService-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_TimeService-peg.reg 2008-09-16 05:53:41.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_TimeService-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,94 +0,0 @@ -instance of PG_ProviderModule -{ - Name = "OMC_TimeServiceProvider_Module"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "1.0"; -}; -instance of PG_Provider -{ - Name = "OMC_TimeService"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability1"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_SystemTimeService"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability4"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_HostedTimeService"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Associator -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability2"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_RemoteTimeServicePort"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability5"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_TimeServiceAccessBySAP"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Associator -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability3"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_TimeZoneSettingData"; - Namespaces = {"root/cimv2"}; - ProviderType = {2}; // Instance -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability6"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_TimeServiceTimeZoneSettingData"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Associator -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_TimeService_Capability7"; - ProviderModuleName = "OMC_TimeServiceProvider_Module"; - ProviderName = "OMC_TimeService"; - ClassName = "OMC_TimeServiceAvailableToElement"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Associator -}; - - - - - - - - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_TimeService.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_TimeService.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_TimeService.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_TimeService.peg.reg 2008-09-27 18:40:49.000000000 +0200 @@ -0,0 +1,94 @@ +instance of PG_ProviderModule +{ + Name = "OMC_TimeServiceProvider_Module"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + UserContext = 2; // Requestor + Vendor = "OMC"; + Version = "1.0"; +}; +instance of PG_Provider +{ + Name = "OMC_TimeService"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability1"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_SystemTimeService"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability4"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_HostedTimeService"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Associator +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability2"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_RemoteTimeServicePort"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability5"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_TimeServiceAccessBySAP"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Associator +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability3"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_TimeZoneSettingData"; + Namespaces = {"root/suse"}; + ProviderType = {2}; // Instance +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability6"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_TimeServiceTimeZoneSettingData"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Associator +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_TimeService_Capability7"; + ProviderModuleName = "OMC_TimeServiceProvider_Module"; + ProviderName = "OMC_TimeService"; + ClassName = "OMC_TimeServiceAvailableToElement"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Associator +}; + + + + + + + + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess-peg.reg new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess-peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess-peg.reg 2008-09-16 05:52:51.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess-peg.reg 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -instance of PG_ProviderModule -{ - Name = "OMC_UnixProcessProvider_Module"; - InterfaceType = "CMPI"; - InterfaceVersion = "2.0.0"; - Location = "pyCmpiProvider"; - UserContext = 2; // Requestor - Vendor = "OMC"; - Version = "1.0"; -}; - -instance of PG_Provider -{ - Name = "OMC_UnixProcess"; - ProviderModuleName = "OMC_UnixProcessProvider_Module"; -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_UnixProcess"; - ProviderModuleName = "OMC_UnixProcessProvider_Module"; - ProviderName = "OMC_UnixProcess"; - ClassName = "OMC_UnixProcess"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,5}; // Instance, Method -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_ProcessExecutable"; - ProviderModuleName = "OMC_UnixProcessProvider_Module"; - ProviderName = "OMC_UnixProcess"; - ClassName = "OMC_ProcessExecutable"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - -instance of PG_ProviderCapabilities -{ - CapabilityID = "OMC_OSProcess"; - ProviderModuleName = "OMC_UnixProcessProvider_Module"; - ProviderName = "OMC_UnixProcess"; - ClassName = "OMC_OSProcess"; - Namespaces = {"root/cimv2"}; - ProviderType = {2,3}; // Instance, Association -}; - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.peg.reg new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.peg.reg --- old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.peg.reg 1970-01-01 01:00:00.000000000 +0100 +++ new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.peg.reg 2008-10-10 02:03:15.000000000 +0200 @@ -0,0 +1,49 @@ +instance of PG_ProviderModule +{ + Name = "OMC_UnixProcessProvider_Module"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; + Location = "pyCmpiProvider"; + //UserContext = 2; // Requestor + UserContext = 5; // Requestor + Vendor = "OMC"; + Version = "1.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_UnixProcess"; + ProviderModuleName = "OMC_UnixProcessProvider_Module"; +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_UnixProcess"; + ProviderModuleName = "OMC_UnixProcessProvider_Module"; + ProviderName = "OMC_UnixProcess"; + ClassName = "OMC_UnixProcess"; + Namespaces = {"root/suse"}; + ProviderType = {2,5}; // Instance, Method +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_ProcessExecutable"; + ProviderModuleName = "OMC_UnixProcessProvider_Module"; + ProviderName = "OMC_UnixProcess"; + ClassName = "OMC_ProcessExecutable"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + +instance of PG_ProviderCapabilities +{ + CapabilityID = "OMC_OSProcess"; + ProviderModuleName = "OMC_UnixProcessProvider_Module"; + ProviderName = "OMC_UnixProcess"; + ClassName = "OMC_OSProcess"; + Namespaces = {"root/suse"}; + ProviderType = {2,3}; // Instance, Association +}; + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.py new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.py --- old/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.py 2008-09-16 01:26:30.000000000 +0200 +++ new/cmpi-pywbem-base-0.2.0/OMC_UnixProcess.py 2008-10-10 19:33:32.000000000 +0200 @@ -521,7 +521,7 @@ except: pass ''' - ux(ElementName= model['Name']) + ux(ElementName= pname) ux(HealthState= pywbem.Uint16(0)) ux(OperationalStatus= [pywbem.Uint16(0)]) return model @@ -769,6 +769,7 @@ logger = env.get_logger() logger.log_debug('Entering %s.enum_instances()' \ % self.__class__.__name__) + model.path.update(PartComponent=None, GroupComponent=None) for lp in LinuxProcess.procs(): model['PartComponent'] = lp.get_instance_name( model.path.namespace) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org