omc-commit Mailing List for OMC - Open Management with CIM (Page 24)

Status: Alpha

Brought to you by: bartw, bnicholes, jbgill, jcarey, and 2 others

omc-commit — Mailing list for subversion commit activity

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

Flat | Threaded

<< < 1 .. 22 23 24 25 26 .. 31 > >> (Page 24 of 31)

[Omc-commit] SF.net SVN: omc: [582] contrib/xen-vm-builder/trunk/mof

From: <jc...@us...> - 2008-04-23 17:47:01

Revision: 582
          http://omc.svn.sourceforge.net/omc/?rev=582&view=rev
Author:   jcarey
Date:     2008-04-23 10:45:50 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Clean up for initial import

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof

Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof	2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof	2008-04-23 17:45:50 UTC (rev 582)
@@ -1,15 +1,10 @@
-// Import DMTF dependencies
-#pragma include ("./dmtf/CIM_VirtualSystemSettingData.mof")
-#pragma include ("./dmtf/CIM_Job.mof")
-
 // Import OMC VM Builder schema
-#pragma include ("XEN_VMBuilderJob.mof")
 #pragma include ("XEN_VMBuilderService.mof")
+#pragma include ("XEN_VMBuilderJob.mof")
 #pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
 
-
 // Associations
-#pragma include ("XEN_VMBuilderHostedService.mof")
-//#pragma include ("XEN_VMBuilderOwningJobElement.mof")
-//#pragma include ("XEN_VMBuilderProcessOfJob.mof")
+#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_VMBuilderOwningJobElement.mof")
+#pragma include ("XEN_VMBuilderProcessOfJob.mof")
 

Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof	2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof	2008-04-23 17:45:50 UTC (rev 582)
@@ -5,7 +5,7 @@
 	"XEN_VMBuilderJob represents a vm installation(build) job")]
 class XEN_VMBuilderJob : CIM_Job
 {
-	[Key, Overrride("Name"),
+	[Key, Override("Name"),
 		Description("XEN:VMBUILDER:<JobID>")]
 	string Name;
 
@@ -29,7 +29,7 @@
 		"50",							// Memory
 		"60", "61", "62", "63",			// Disk
 		"70", "71", "72",				// Job Errors
-		"80", "81", "82"}				// Parameter Errors
+		"80", "81", "82"},				// Parameter Errors
 	Values {
 		// General Errors
 		"Success", 

Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof	2008-04-23 17:27:53 UTC (rev 581)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof	2008-04-23 17:45:50 UTC (rev 582)
@@ -16,6 +16,6 @@
 	[Override ("PartComponent"), Description (
 		"The Process that results from the execution of the VM Builder "
 		"job")]
-	XEN_UnixProcess REF PartComponent;
+	OMC_UnixProcess REF PartComponent;
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [581] contrib/xen-vm-builder/trunk/src/providers/ vm-builder/

From: <jc...@us...> - 2008-04-23 17:28:54

Revision: 581
          http://omc.svn.sourceforge.net/omc/?rev=581&view=rev
Author:   jcarey
Date:     2008-04-23 10:27:53 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
More svn:ignore...

Property Changed:
----------------
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/


Property changes on: contrib/xen-vm-builder/trunk/src/providers/vm-builder
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
Makefile

   + Makefile.in
Makefile
.deps
.libs
*.o
*.swp




This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [580] contrib/xen-vm-builder/trunk

From: <jc...@us...> - 2008-04-23 17:26:33

Revision: 580
          http://omc.svn.sourceforge.net/omc/?rev=580&view=rev
Author:   jcarey
Date:     2008-04-23 10:25:08 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Setting svn:ignore and adjustments to spec file

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec

Property Changed:
----------------
    contrib/xen-vm-builder/trunk/
    contrib/xen-vm-builder/trunk/mof/
    contrib/xen-vm-builder/trunk/src/
    contrib/xen-vm-builder/trunk/src/providers/
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/


Property changes on: contrib/xen-vm-builder/trunk
___________________________________________________________________
Name: svn:ignore
   + stamp-h1
configure
Makefile.in
mybuild
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
Makefile
omc-xenvm-builder-*.tar.gz
config.status
config.h.in
libtool
autom4te.cache
missing
aclocal.m4




Property changes on: contrib/xen-vm-builder/trunk/mof
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile


Modified: contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec
===================================================================
--- contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec	2008-04-23 17:13:07 UTC (rev 579)
+++ contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec	2008-04-23 17:25:08 UTC (rev 580)
@@ -1,5 +1,5 @@
 #
-# spec file for package omc-cmpibase
+# spec file for package omc-xenvm-builder
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -29,7 +29,7 @@
 AutoReqProv:    yes
 Requires:		tog-pegasus omccmpi omc-cmpibase
 Requires:       cim-schema >= 2.12
-Source0:		cmpibase-%{version}.tar.gz
+Source0:		omc-xenvm-builder-%{version}.tar.gz
 
 %description
 Linux providers for instrumentation of base operating system components  
@@ -38,12 +38,10 @@
 Authors:
 --------
     Jon Carey
-	Norm Paxton
-	Bart Whiteley
 
 %prep
 # Untar the sources.
-%setup -n cmpibase-%{version}
+%setup -n omc-xenvm-builder-%{version}
 
 %build
 # If the LD_RUN_PATH environment variable is set at link time,


Property changes on: contrib/xen-vm-builder/trunk/src
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile



Property changes on: contrib/xen-vm-builder/trunk/src/providers
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile



Property changes on: contrib/xen-vm-builder/trunk/src/providers/vm-builder
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [579] contrib

From: <jc...@us...> - 2008-04-23 17:13:53

Revision: 579
          http://omc.svn.sourceforge.net/omc/?rev=579&view=rev
Author:   jcarey
Date:     2008-04-23 10:13:07 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Created Project

Added Paths:
-----------
    contrib/xen-vm-builder/
    contrib/xen-vm-builder/branches/
    contrib/xen-vm-builder/tags/
    contrib/xen-vm-builder/trunk/
    contrib/xen-vm-builder/trunk/AUTHORS
    contrib/xen-vm-builder/trunk/COPYING
    contrib/xen-vm-builder/trunk/ChangeLog
    contrib/xen-vm-builder/trunk/INSTALL
    contrib/xen-vm-builder/trunk/LICENSE
    contrib/xen-vm-builder/trunk/Makefile.am
    contrib/xen-vm-builder/trunk/Makefile.incl.am
    contrib/xen-vm-builder/trunk/NEWS
    contrib/xen-vm-builder/trunk/README
    contrib/xen-vm-builder/trunk/bootstrap.sh
    contrib/xen-vm-builder/trunk/configure.ac
    contrib/xen-vm-builder/trunk/install-sh
    contrib/xen-vm-builder/trunk/mof/
    contrib/xen-vm-builder/trunk/mof/Makefile.am
    contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
    contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
    contrib/xen-vm-builder/trunk/omc-xenvm-builder.changes
    contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec
    contrib/xen-vm-builder/trunk/src/
    contrib/xen-vm-builder/trunk/src/Makefile.am
    contrib/xen-vm-builder/trunk/src/providers/
    contrib/xen-vm-builder/trunk/src/providers/Makefile.am
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am

Added: contrib/xen-vm-builder/trunk/AUTHORS
===================================================================

Added: contrib/xen-vm-builder/trunk/COPYING
===================================================================

Added: contrib/xen-vm-builder/trunk/ChangeLog
===================================================================
--- contrib/xen-vm-builder/trunk/ChangeLog	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/ChangeLog	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1 @@
+Initial.

Added: contrib/xen-vm-builder/trunk/INSTALL
===================================================================
--- contrib/xen-vm-builder/trunk/INSTALL	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/INSTALL	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Added: contrib/xen-vm-builder/trunk/LICENSE
===================================================================
--- contrib/xen-vm-builder/trunk/LICENSE	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/LICENSE	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,91 @@
+OMC is primarily constrained by BSD License.
+However, some files have a more restrictive license (GPL):
+* SysLog-NG
+
+Please pay attention to the license for each file.
+
+Below are some of the license notices you will encounter throughout the OMC project:
+
+Notice for Projects/Files Released Under the GPL
+
+/****************************************************************************
+ |
+ | Copyright (c) [YEARS] Novell, Inc.
+ | All Rights Reserved.
+ |
+ | This program is free software; you can redistribute it and/or
+ | modify it under the terms of version 2 of the GNU General Public License as
+ | published by the Free Software Foundation.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License
+ | along with this program; if not, contact Novell, Inc.
+ |
+ | To contact Novell about this file by physical or electronic mail,
+ | you may find current contact information at www.novell.com
+ |
+ |***************************************************************************
+
+
+Notice for Projects/Files Released Under the LGPL
+
+/****************************************************************************
+ |
+ | Copyright (c) [YEARS] Novell, Inc.
+ | All Rights Reserved.
+ |
+ | This library is free software; you can redistribute it and/or
+ | modify it under the terms of the GNU Lesser General Public License as
+ | published by the Free Software Foundation; version 2.1 of the license.
+ |
+ | This library is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU Lesser General Public License for more details.
+ |
+ | You should have received a copy of the GNU Lesser General Public License
+ | along with this library; if not, contact Novell, Inc.
+ |
+ | To contact Novell about this file by physical or electronic mail,
+ | you may find current contact information at www.novell.com
+ |
+ |***************************************************************************
+
+
+Notice for Projects/Files Released Under the BSD License
+
+/******************************************************************************
+* Copyright (c) [YEARS], Novell, Inc.  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 the Novell 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 THE COPYRIGHT OWNER OR 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.
+******************************************************************************/
+

Added: contrib/xen-vm-builder/trunk/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/Makefile.am	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/Makefile.am	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,10 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = gnu
+
+SUBDIRS = \
+	. \
+	src \
+	mof
+
+

Added: contrib/xen-vm-builder/trunk/Makefile.incl.am
===================================================================
--- contrib/xen-vm-builder/trunk/Makefile.incl.am	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/Makefile.incl.am	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,10 @@
+# ***********************************************************************
+# MACROS and VARIABLES
+# ***********************************************************************
+
+providerdir = $(libdir)/cmpi
+
+# ***********************************************************************
+# TARGETS
+# ***********************************************************************
+

Added: contrib/xen-vm-builder/trunk/NEWS
===================================================================
--- contrib/xen-vm-builder/trunk/NEWS	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/NEWS	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1 @@
+

Added: contrib/xen-vm-builder/trunk/README
===================================================================

Added: contrib/xen-vm-builder/trunk/bootstrap.sh
===================================================================
--- contrib/xen-vm-builder/trunk/bootstrap.sh	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/bootstrap.sh	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rm -rf config.cache config.guess config.sub depcomp missing mkinstalldirs autom4te.cache
+
+aclocal \
+&& autoconf \
+&& autoheader \
+&& libtoolize --force --copy \
+&& automake --add-missing 


Property changes on: contrib/xen-vm-builder/trunk/bootstrap.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/xen-vm-builder/trunk/configure.ac
===================================================================
--- contrib/xen-vm-builder/trunk/configure.ac	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/configure.ac	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,164 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.57)
+AC_INIT(omc-xenvm-builder, 1.0.0)
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([src])
+AC_CONFIG_HEADER([config.h])
+AC_PROG_LIBTOOL
+
+AC_PREFIX_DEFAULT(/usr)
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_LEX
+AC_PROG_YACC
+
+AC_PATH_PROG(RM, rm, rm)
+AC_PATH_PROG(MV, mv, mv)
+AC_PATH_PROG(CP, cp, cp)
+
+DEBUG_FLAGS="-DDEBUG -g" # Additional debugging flags.
+FULL_DEBUG_FLAGS="-D_GLIBCXX_DEBUG"	# Additional debugging flags.
+OPT_FLAGS="  -DNDEBUG -O2"	# Additional optimization flags.
+
+
+##NOTE:  whereever CXXFLAGS is used, we need to also use CPPFLAGS, for the AC_CHECK_HEADERS -
+## It now uses compile (primarily) but still uses pre-processor for interim transition / backward compatibility
+## pre-processor needs the CPPFLAGS
+
+
+#######################################################################
+# Process additional search dirs if specified
+AC_ARG_WITH(search-dir,
+	[ --with-search-dir=PATH   Specify an additional directory to look for include/ and lib/ sub dirs ],
+	[
+      if test "x$withval" != "xno" ; then
+        	CXXFLAGS="$CXXFLAGS -I$withval/include"
+        	CPPFLAGS="$CPPFLAGS -I$withval/include"
+        	CFLAGS="$CFLAGS -I$withval/include"
+        	LDFLAGS="$LDFLAGS -L$withval/lib"
+      fi
+	]
+)
+
+#######################################################################
+# Process additional search dirs if specified
+cmpiIncDir=""
+AC_ARG_WITH(cmpi-include-dir,
+	[ --with-cmpi-include-dir=PATH   Specify locaction of the CMPI header files ],
+	[
+      if test "x$withval" != "xno" ; then
+        	CXXFLAGS="$CXXFLAGS -I$withval"
+        	CPPFLAGS="$CPPFLAGS -I$withval"
+        	CFLAGS="$CFLAGS -I$withval"
+			cmpiIncDir="$withval"
+      fi
+	]
+)
+
+if test "x$cmpiIncDir" == "x"; then
+	AC_MSG_ERROR(You must specify the location of the cmpi include files. Use the --with-cmpi-include-dir option)
+fi
+
+debuglevel="0"
+#######################################################################
+# Set the debug flag if specified
+AC_ARG_ENABLE(debug-mode,
+        [--enable-debug-mode Enable debugging mode],
+        [
+			debuglevel="1"
+        ]
+)
+
+AC_ARG_WITH(debug-level,
+	[ --with-debug-level=LEVEL   Specify a debug level valid values: 0=none 1=partial debug 2=full debug ],
+	[
+		case "x$withval" in
+		x0|xno)
+			debuglevel="0";;
+		x1)
+			debuglevel="1";;
+		x2)
+			debuglevel="2";;
+		*)
+			AC_MSG_WARN("Invalid debug level specified. Valid values are 0, 1 or 2")
+			exit 1;;
+		esac
+	]
+)
+
+case $debuglevel in
+1)
+	AC_DEFINE(SMASH_DEBUG, 1, "Debugging flag.")
+	CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS -Wall"
+	CPPFLAGS="$CPPFLAGS $DEBUG_FLAGS -Wall"
+	CFLAGS="  $CFLAGS   $DEBUG_FLAGS -Wall"
+	LDFLAGS=" $LDFLAGS  $DEBUG_FLAGS";;
+2)
+	AC_DEFINE(SMASH_DEBUG, 2, "Debugging flag.")
+	CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS $FULL_DEBUG_FLAGS -Wall"
+	CPPFLAGS="$CPPFLAGS $DEBUG_FLAGS $FULL_DEBUG_FLAGS -Wall"
+	CFLAGS="  $CFLAGS   $DEBUG_FLAGS $FULL_DEBUG_FLAGS -Wall"
+	LDFLAGS=" $LDFLAGS  $DEBUG_FLAGS $FULL_DEBUG_FLAGS";;
+*)
+	CXXFLAGS="$CXXFLAGS $OPT_FLAGS -Wall"
+	CPPFLAGS="$CPPFLAGS $OPT_FLAGS -Wall"
+	CFLAGS="  $CFLAGS   $OPT_FLAGS -Wall"
+	LDFLAGS=" $LDFLAGS  $OPT_FLAGS";;
+esac
+
+#####################################################
+
+# Checks for libraries.
+#AC_CHECK_LIB([pthread], [main], [LIBS="$LIBS"],[AC_MSG_ERROR(Must have openwbem-devel or build will fail)])
+#AC_CHECK_LIB([crypto], [main], [LIBS="$LIBS"], [AC_MSG_ERROR(Must have libcrypto \(openssl-devel\) or build will fail)])
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h sys/time.h sys/param.h sys/vfs.h],,[AC_MSG_ERROR(Missing headers: likely won't compile)])
+
+#AC_LANG_CPLUSPLUS
+#AC_CHECK_HEADERS([cimple/cimple.h],[HAVE_CIMPLE="1"],[HAVE_CIMPLE="0"])
+#AM_CONDITIONAL(DO_CIMPLE_PROVIDERS, test "$HAVE_CIMPLE" = 1)
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_PID_T
+AC_TYPE_UID_T
+AC_HEADER_TIME
+AC_TYPE_MODE_T
+AC_TYPE_SIGNAL
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_CLOSEDIR_VOID
+AC_REPLACE_FNMATCH
+AC_FUNC_FORK
+AC_FUNC_LSTAT
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_CHOWN
+AC_FUNC_SETVBUF_REVERSED
+AC_FUNC_STAT
+AC_FUNC_STRERROR_R
+
+AC_CHECK_FUNCS([gettimeofday memset regcomp strchr strdup strerror strstr strtol strtoul uname])
+
+AC_CONFIG_FILES([Makefile
+	src/Makefile
+	src/providers/Makefile
+	src/providers/vm-builder/Makefile
+	mof/Makefile
+	])
+AC_OUTPUT

Added: contrib/xen-vm-builder/trunk/install-sh
===================================================================
--- contrib/xen-vm-builder/trunk/install-sh	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/install-sh	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,294 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+#
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd=$cpprog
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd=$stripprog
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "$0: no input file specified" >&2
+	exit 1
+else
+	:
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+
+	if [ -d "$dst" ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=$mkdirprog
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f "$src" ] || [ -d "$src" ]
+	then
+		:
+	else
+		echo "$0: $src does not exist" >&2
+		exit 1
+	fi
+
+	if [ x"$dst" = x ]
+	then
+		echo "$0: no destination specified" >&2
+		exit 1
+	else
+		:
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d "$dst" ]
+	then
+		dst=$dst/`basename "$src"`
+	else
+		:
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+	'
+IFS="${IFS-$defaultIFS}"
+
+oIFS=$IFS
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp=$pathcomp$1
+	shift
+
+	if [ ! -d "$pathcomp" ] ;
+        then
+		$mkdirprog "$pathcomp"
+	else
+		:
+	fi
+
+	pathcomp=$pathcomp/
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd "$dst" &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		dstfile=`basename "$dst" $transformbasename |
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		:
+	fi
+
+# Make a couple of temp file names in the proper directory.
+
+	dsttmp=$dstdir/_inst.$$_
+	rmtmp=$dstdir/_rm.$$_
+
+# Trap to clean up temp files at exit.
+
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
+
+# Now rename the file to the real destination.
+
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+fi &&
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+
+{
+	(exit 0); exit
+}

Added: contrib/xen-vm-builder/trunk/mof/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/mof/Makefile.am	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/Makefile.am	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,9 @@
+EXTRA_DIST = \
+	XEN_HostedVMBuilderService.mof \
+	XEN_VMBuilder.mof \
+	XEN_VMBuilderJob.mof \
+	XEN_VMBuilderOwningJobElement.mof \
+	XEN_VMBuilderProcessOfJob.mof \
+	XEN_VMBuilderService.mof \
+	XEN_VMBuilderVirtualSystemCreationData.mof
+

Added: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,20 @@
+// ==================================================================
+// XEN_VMBuilderHostedService
+// ==================================================================
+[Association, Description (
+	"XEN_VMBuilderHostedService is an association between the virtual "
+	"machine incubation service (XEN_VMBuilderService) and the hosting "
+	"computer system (CIM_ComputerSystem). The cardinality of "
+	"this association is one-to-one. A System can only host one virtual "
+	"machine builder.")]
+class XEN_VMBuilderHostedService : CIM_HostedService
+{
+	[Override ("Antecedent"), Min (1), Max (1),
+		Description ("The hosting System.")]
+	CIM_ComputerSystem REF Antecedent;
+
+	[Override ( "Dependent" ), Weak, Max(1),
+		Description ("The VM Incubation Service hosted on the System.")]
+	XEN_VMBuilderService REF Dependent;
+};
+

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,15 @@
+// Import DMTF dependencies
+#pragma include ("./dmtf/CIM_VirtualSystemSettingData.mof")
+#pragma include ("./dmtf/CIM_Job.mof")
+
+// Import OMC VM Builder schema
+#pragma include ("XEN_VMBuilderJob.mof")
+#pragma include ("XEN_VMBuilderService.mof")
+#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
+
+
+// Associations
+#pragma include ("XEN_VMBuilderHostedService.mof")
+//#pragma include ("XEN_VMBuilderOwningJobElement.mof")
+//#pragma include ("XEN_VMBuilderProcessOfJob.mof")
+

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,178 @@
+// ==================================================================
+// XEN_VMBuilderJob
+// ==================================================================
+[Abstract, Description (
+	"XEN_VMBuilderJob represents a vm installation(build) job")]
+class XEN_VMBuilderJob : CIM_Job
+{
+	[Key, Overrride("Name"),
+		Description("XEN:VMBUILDER:<JobID>")]
+	string Name;
+
+	[Propagated ("CIM_ComputerSystem.Name"),
+		Description("The name of the system that owns this job")]
+	string HostComputerSystemName;
+
+	[Description("Unique id of the vm-install job. "
+		"Use this jobId to track through the Incubation process. ")]
+	string JobID;
+
+	[Description("Process ID (if applicable) of the vm installation job")]
+	uint32 PID;
+
+	[Description("Exit code of the incubation creation process"),
+	ValueMap { "0", "1", 				// General Errors
+		"10", "11", "12", "13", "14",	// XEN Errors
+		"20", "21", "22", "23", "24", "25",	// VM Errors
+		"30", "31", "32", "33", "34", "35", //Installation Source Errors
+		"40", "41",						// Architecture Errors
+		"50",							// Memory
+		"60", "61", "62", "63",			// Disk
+		"70", "71", "72",				// Job Errors
+		"80", "81", "82"}				// Parameter Errors
+	Values {
+		// General Errors
+		"Success", 
+		"Other runtime error",
+		// XEN Errors
+		"An error occurred in Xen.", 
+		"The hypervisor is not running.", 
+		"An incompatible version of the hypervisor is running.",
+		"Unable to connect to the Xen daemon.", 
+		"Must be the 'root' user to manage Xen.",
+		// VM Errors
+		"Failed to start the VM.",
+		"The VM has crashed.",
+		"A VM by that name is already running.",
+		"A VM configuration already exists with that name.",
+		"A valid boot sector was not found.  The installation may have failed.",
+		"No kernel was found.  The installation may have failed.",
+		// Installation Source Errors
+		"The installation source is using an unsupported protocol.",
+		"An error occurred while reading from the installation source.",
+		"The installation source was not found.",
+		"The installation source is unusable.",
+		"No installation source was defined.",
+		"A CD-ROM or DVD must be specified from which to boot.",
+		// Architecture Errors
+		"The operating system is incompatible with the processor architecture of this machine.",
+		"The processor(s) in this machine do not support full virtualization.",
+		// Resources: Memory
+		"Not enough memory.",
+		// Resources: Disk
+		"The disk does not exist.",
+		"The disk is read-only.",
+		"Permission was denied while attempting to access the disk.",
+		"Two of the virtual disks have conflicting virtual names or physical devices.",
+		// Job Errors
+		"The job was canceled.",
+		"The job was not found.",
+		"The job is in the wrong state to perform that action.",
+		// Parameter Errors
+		"A parameter is invalid or missing.",
+		"The operating system does not support paravirtualization.",
+		"The operating system does not support automated installations."}]
+	uint32 ExitCode;
+
+	[Override("JobStatus"),
+		Values {"SETTINGS",
+			"PREP_INSTALL",
+			"INSTALL",
+			"POST_INSTALL",
+			"RUNTIME_CONF",
+			"RUNTIME",
+			"FINISHED",
+			"FAILED",
+			"CANCELED",
+			"UNKNOWN",
+			"PRE_DISPATCH",
+			"DISPATCHED"  }]
+	string JobStatus;
+
+	[Description("URL to VNC port to contact the vm.  NOTE: This does not "
+		"guarantee that the URL is active.  It is the last known VNC URL.")]
+	string VncURL;
+
+	[Description("UUID of resulting VM")]
+	string VM_UUID;
+
+	[Description("File name that the vm installation will post status "
+		"changes to")]
+	string StatusFileName;
+
+	[Description("Location (host:/path) of the installation log for the job")]
+	string InstallLogFileLocation;
+
+	// The parameters with which the installation was created
+
+	[Description("The user friendly name given to the VM")]
+	string VMName;
+
+	// make this an embedded instance?
+	[Description("The object path to the static instance of "
+		"XEN_VMBuilderVirtualSystemCreationData")]
+	string NewSystemCreationData;
+
+	[Description("Type of guest (vm) OS.  This defines many defaults and "
+		" provides bootstrap capability. "),
+		ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
+			"11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"},
+		Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
+			"oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
+			"rhel5", "solaris9", "solaris10", "windows", "windowsx64",
+			"windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
+			"windowsvistax64" }]
+		uint32 OSType;
+
+	[Description("A string containing the URL where the install source "
+		"can be obtained.  ie:"
+		"   nfs:host:/path "
+		"   http://host/path "
+		"   ftp://host/path "
+		" To install from virtual disk defined in the 'NewSystemCreationData' "
+		" instance: "
+		"   dev:/xvda  (example syntax - provide appropriate device name")]
+		string SourceURL;
+
+	[Description("Contents of response file to automate the "
+		"installation of the OS.  The format of the file depends on the OS. "
+		"Not all OS types support automated installations.")]
+		string ResponseFile;
+};
+
+
+
+// ==================================================================
+// XEN_VMBuilderLocalJob
+// ==================================================================
+[Description (
+	"XEN_VMBuilderLocalJob is an instance of a vm creation that is "
+	"occurring on the local box.")]
+//	Provider("cmpi::omc_vmbuilderlocaljob")]
+class XEN_VMBuilderLocalJob : XEN_VMBuilderJob
+{
+
+};
+
+
+
+// ==================================================================
+// XEN_VMBuilderDispatchJob
+// ==================================================================
+[Description (
+	"XEN_VMBuilderDispatchJob is an instance of a vm creation that has "
+	"been dispatched to some server in a network of incubation servers.  It "
+	"indicates that the IncubationServer on the local box dispatched the job, "
+	"and will have ongoing status information about that job.")]
+class XEN_VMBuilderDispatchJob : XEN_VMBuilderJob
+{
+	// ref to actual BuilderLocalJob on the remote box.
+	[Description("A String representation of the object path to the LocalJob "
+		"instance on the box where the actual install is occurring. ")]
+		string ActualIncubationJobPath;
+	[Propagated ("XEN_UnitaryComputerSystem.Name"),
+		Description("The name of the system where the actual incubation "
+			"took place")]
+	string IncubationSystemHostName;
+
+};

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,17 @@
+// ==================================================================
+// XEN_VMBuilderOwningJobElement
+// ==================================================================
+[Association, Description (
+	"XEN_VMBuilderOwningJobElement describes the association between "
+	"the virtual machine builder service and a running builder job")]
+class XEN_VMBuilderOwningJobElement : CIM_OwningJobElement
+{
+	[Override("OwningElement"), Description(
+		"The builder service that owns the job")]
+	XEN_VMBuilderService REF OwningElement;
+
+	[Override("OwnedElement"), Description(
+		"The incubation job")]
+	XEN_VMBuilderJob REF OwnedElement;
+};
+

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,21 @@
+// ==================================================================
+// XEN_VMBuilderProcessOfJob
+// ==================================================================
+[Association, Aggregation, Composition, Description (
+	"XEN_VMBuilderProcessOfJob describes the relationship between a VM "
+	"Builder Job that was submitted by the CIM Provider and a running "
+	"process on the system.")]
+class XEN_VMBuilderProcessOfJob : CIM_ProcessOfJob
+{
+	[Aggregate, Override ("GroupComponent"), Description (
+		"Execution of a VM Builder Job results in the createion of a "
+		"process running on the local machine. The Job aggregates the "
+		"process(es) that created when it is executed")]
+	XEN_VMBuilderJob REF GroupComponent;
+
+	[Override ("PartComponent"), Description (
+		"The Process that results from the execution of the VM Builder "
+		"job")]
+	XEN_UnixProcess REF PartComponent;
+};
+

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,131 @@
+// ==================================================================
+// XEN_VMBuilderService
+// ==================================================================
+[Description (
+        "XEN_VMBuilderService represents the virtual machine incubator "
+        "functionality/service")]
+//      Provider("cmpi::omc_vmincubatorservice")]
+class XEN_VMBuilderService : CIM_Service
+{
+        [Description("Initiate the creation of a VM.  Result will be the object path "
+                "to the instance of XEN_VMBuilderJob representing the "
+                "vm creation job, via the OUT parameter.  Return code = 0 if success "
+                "or error code.  All ongoing status about the vm creation will be "
+                "reflected in the properties of that instance.")]
+        uint32 CreateVM(
+                [IN, Description("This flag applies to distributed incubation "
+                        "environments.  It indicates whether this request should be forced "
+                        "to occur on the local box or can be dispatched.  If FALSE and in "
+                        "a distributed environment, the dispatcher should set to true before "
+                        "dispatching, so that the system the the request is dispatched to "
+                        "sees it as ForceLocal=TRUE")]
+                        boolean ForceLocal,
+
+                [IN, Description("The name that the VM will be given.")]
+                        string VMName,
+
+                [IN, Description("The object path to the static instance of "
+                        "XEN_VMBuilderVirtualSystemCreationData  "
+                        "NOTE: Either NewSystemCreationData or NewSystemCreationDataInstance "
+                        "      must be provided")]
+                        XEN_VMBuilderVirtualSystemCreationData REF NewSystemCreationData,
+
+                [IN, Description("The embedded instance (MOF, not CIM-XML) of the static instance of "
+                        "XEN_VMBuilderVirtualSystemCreationData. "
+                        "NOTE: Either NewSystemCreationData or NewSystemCreationDataInstance "
+                        "      must be provided"),
+                        EmbeddedInstance ( "XEN_VMBuilderVirtualSystemCreationData" )]
+                        string  NewSystemCreationDataInstance,
+
+                [IN, Description("Type of guest (vm) OS.  This defines many defaults and "
+                        " provides bootstrap capability. "),
+                        ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
+                                "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"},
+                        Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
+                                "oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
+                                "rhel5", "solaris9", "solaris10", "windows", "windowsx64",
+                                "windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
+                                "windowsvistax64" }]
+                        uint32 OSType,
+
+                [IN, Description("A string containing the URL where the install source "
+                        "can be obtained.  ie:"
+                        "   nfs:host:/path "
+                        "   http://host/path "
+                        "   ftp://host/path "
+                        " To install from virtual disk defined in the 'NewSystemCreationData' "
+                        " instance: "
+                        "   dev:/xvda  (example syntax - provide appropriate device name")]
+                        string SourceURL,
+
+                [IN, Description("Either path to, or the contents of, response file to automate "
+                        "the installation of the OS.  The format of the file depends on the OS. "
+                        "Not all OS types support automated installations. "
+                        "If path to file, must start with FILE:, then fully-qualified path "
+                        "relative to the incubation machine.  If contents, then full contents "
+                        "of the file.  Any text that doesn't start with FILE: will be considered "
+                        "contents.")]
+                        string ResponseFile,
+
+                [IN, Description("Additional arguments to pass to the paravirtualized OS. "
+                        "(No need to provide OS-specific arguments to bootstrap the "
+                        "installation")]
+                        string ExtraInstallArgs,
+
+                [IN, Description("The dispatched job ID, ie ZosJobID.  Only applicable "
+                        "if this createVM call is made from the dispatcher")]
+                        string ZosJobID,
+
+                [IN ( false ), OUT, Description ("REF to the new "
+                        "XEN_VMBuilderJob instance.  If forceLocal=True, returns a "
+                        "XEN_VMBuilderLocalJob instance.  If false, returns a "
+                        "XEN_VMBuilderDispatchJob instance")]
+                        XEN_VMBuilderJob REF VMBuilderJob);
+
+
+        [Description("Cancel a vm installation job that was previously initiated.")]
+        boolean CancelIncubationJob(
+                [IN, Description("The jobID of the XEN_VMIncubationJob to cancel. "
+                        "Cancel will remove all remnants of the incubation job, leaving "
+                        "only an entry in the XEN_VMIncubationJobRecordLog.")]
+                        string JobID,
+                [IN, Description("This flag applies to distributed incubation "
+                        "environments.  It indicates whether this request should be forced "
+                        "to occur on the local box or can be dispatched.  If FALSE, "
+                        "the ZOS job ID should be given for the JobID parameter. "
+                        "If TRUE, the vm-install Local job ID should be given for "
+                        "the JobID parameter.")]
+                        boolean ForceLocal);
+
+        [Description("Delete a vm installation job that was previously initiated. "
+                "Delete will remove all remnants of the incubation job, leaving "
+                "only an entry in the XEN_VMIncubationJobRecordLog.")]
+        boolean DeleteIncubationJob(
+                [IN, Description("The jobID of the XEN_VMIncubationJob to delete. ")]
+                        string JobID,
+                [IN, Description("This flag applies to distributed incubation "
+                        "environments.  It indicates whether this request should be forced "
+                        "to occur on the local box or can be dispatched.  If FALSE, "
+                        "the ZOS job ID should be given for the JobID parameter. "
+                        "If TRUE, the vm-install Local job ID should be given for "
+                        "the JobID parameter.")]
+                        boolean ForceLocal);
+
+        [Description("Cancel a vm installation job that was previously initiated. "
+                "Detach will remove knowledge of the incubation job / incubated vm, "
+                "but it will leave the incubated vm on the system.  It will also leave "
+                "an entry in XEN_VMIncubationJobRecordLog.")]
+        boolean DetachIncubationJob(
+                [IN, Description("The jobID of the XEN_VMIncubationJob to detach. ")]
+                        string JobID);
+
+
+        [Description("Retrieve the location (host:path) of the installation log "
+                "of the specified jobID.")]
+        string GetJobLogLocation(
+                [IN, Description("The jobID of the XEN_VMIncubationJob.")]
+                        string JobID);
+
+        [Description("VM builder service version")]
+        string BuilderVersion;
+};

Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,92 @@
+// ==================================================================
+// XEN_VMBuilderVirtualSystemCreationData
+// ==================================================================
+[Description (
+	"XEN_VMBuilderVirtualSystemCreationData defines the incubator aspects of a "
+	"virtual system through a set of virtualization specific properties, for "
+	"vm creation. "
+	"It is intended that incubator clients to create a static instance of this "
+	"class filling in appropriate properties as a means of passing all the vssd "
+	"specific parameters for creating a vm, in one parameter, to the CreateVM "
+	"method on XEN_VMBuilderService.")]
+class XEN_VMBuilderVirtualSystemCreationData : CIM_VirtualSystemSettingData
+{
+	[Description(
+		"UUID contains the universal unique identifier for the virtual machine. "
+		"If none is given, a random UUID will be generated.")]
+	string UUID;
+
+	[Description("type of virtualization.  Values: "
+		" Unknown:  undefined behavior - maybe try to determine best? "
+		" Para: Para Virtualization:  OS Must support para virtualization. "
+		" Full: Full Virtualization:  Hardware must support full virtualization."),
+		ValueMap { "0", "1", "2"},
+		Values { "Unknown", "Para", "Full" }]
+	uint32 VirtType;
+
+	[Description("Number of virtual CPUs for the virtual machine")]
+	uint8 NumVCPUs;
+
+	[Description("Megabytes of RAM to initially allocate to the VM")]
+	uint32 Memory;
+
+	[Description("Max Megabytes of RAM to allocate to the VM")]
+	uint32 MaxMemory;
+
+	[Description("Disk definitions for the virtual machine."
+		" Format: 'PDEV,VDEV[,TYPE[,MODE[,MB]]]', where TYPE='disk' or 'cdrom' "
+		" ie       /x/y/$$VMNAME$$/disk0,xvda,disk,w,10 "
+		" TAGS:    if $$VMNAME$$ is found in the disk string, it will be "
+		"          replaced by the vmName specified by parameter to "
+		"          XEN_VMBuilderService::CreateVM ")]
+	string Disks[];
+
+	[Description("Network Interface definitions for the virtual machine."
+		" This is a multi-value property:  each array entry represents a "
+		"   separate value. "
+		" Format for each entry: "
+		"   A comma-separated list of key/value pairs.  Valid keys: "
+		"   mac=AA.BB.CC.DD.EE.FF   randomly generated if not specified"
+		"   bridge=BRIDGE           "
+		"   model=MODEL             only applicable for full-virt. can be one of: "
+		"       'pcnet'      AMD PCnet 32 "
+		"       'ne2k_isa'   NE2000 on ISA bus "
+		"       'ne2k_pci'   NE2000 on PCI bus "
+		"       'rtl8139'    Realtec 8139 "
+		" To define a NIC with all defaults, specify only 'default' ")]
+	string Nics[];
+
+	[Description("type of virtualized graphics hardware:"
+		" 'unknown': default to none "
+		" 'cirrus' : cirrus logic gc5446 pci vga:  for full virt only. "
+		" 'none'   : no graphics support; use serial console or network access. "
+		" 'para'   : paravirtualized framebuffer; requires driver in os. "
+		" 'vesa'   : standard vga with vesa extensions:  for full virt only."),
+		ValueMap { "0", "1", "2", "3", "4"},
+		Values { "Unknown", "Cirrus", "None", "Para", "Vesa" }]
+	uint32 GraphicsType;
+
+	[Description("type of graphics viewer.  Values: "
+		" Unknown:  undefined behavior - default to VNC? "
+		" SDL:  use SDL for graphics viewer - best when the vm will usually "
+		"       be viewed locally. "
+		" VNC:  use VNC for graphics viewer."),
+		ValueMap { "0", "1", "2"},
+		Values { "Unknown", "SDL", "VNC" }]
+	uint32 GraphicsViewerType;
+
+	[Description("CPU Architecture for the virtual machine.  For incubation, also "
+		" serves as the constraint for where to dispatch the incubation job." ),
+		Values { "Unknown", "x86", "x86_64", "ia64", "ppc" }]
+	string CPUArchitecture;
+
+	[Description("Port to use for VNC server")]
+	uint32 VNCPort;
+
+	[Description("Field for users of this object to store additional data related "
+		"to this object.  This is not used by the providers.  It is user-defined "
+		"and user consumed.  It is defined as a string array to allow for "
+		"key:value pairs within each element of the array, if the user so desires.")]
+	String ExtraConfigInfo[];
+};
+

Added: contrib/xen-vm-builder/trunk/omc-xenvm-builder.changes
===================================================================
--- contrib/xen-vm-builder/trunk/omc-xenvm-builder.changes	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/omc-xenvm-builder.changes	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Tue Apr 22 17:02:33 MDT 2008 - jc...@no...
+
+- Initial Revision
+

Added: contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec
===================================================================
--- contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/omc-xenvm-builder.spec	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,97 @@
+#
+# spec file for package omc-cmpibase
+#
+# 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/
+#
+
+# norootforbuild
+%define omcprefix /usr
+
+Name:           omc-xenvm-builder
+BuildRequires:  gcc gcc-c++ cimple-devel omccmpi-devel tog-pegasus-devel
+URL:            http://sourceforge.net/projects/omc
+# Increment the version every time the source code changes.
+Version:        1.0.0
+Release:        01
+Group:          System/Management
+Vendor:         Novell, Inc.
+Summary:        Open-source implementation of CIM Providers for XEN VM builds.
+PreReq:         /usr/bin/peg-loadmof.sh
+License:        BSD
+# 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:		tog-pegasus omccmpi omc-cmpibase
+Requires:       cim-schema >= 2.12
+Source0:		cmpibase-%{version}.tar.gz
+
+%description
+Linux providers for instrumentation of base operating system components  
+such as computer, system, operating system, and processes.
+
+Authors:
+--------
+    Jon Carey
+	Norm Paxton
+	Bart Whiteley
+
+%prep
+# Untar the sources.
+%setup -n cmpibase-%{version}
+
+%build
+# If the LD_RUN_PATH environment variable is set at link time,
+# it's value is embedded in the resulting binary.  At run time,
+# The binary will look here first for shared libraries.  This way
+# we link against the libraries we want at run-time even if libs
+# by the same name are in /usr/lib or some other path in /etc/ld.so.conf
+autoreconf --force --install
+CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
+CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
+./configure --prefix=%{omcprefix} --libdir=%_libdir --with-cmpi-include-dir=/usr/include/Pegasus/Provider/CMPI
+make %{?jobs:-j%jobs}
+
+%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/%{omcprefix}/share/mof/%{name}
+install -d $MOFDIR
+install mof/*.{mof,reg} $MOFDIR
+%{__rm} -f $RPM_BUILD_ROOT%{omcprefix}/%_lib/*.{a,la}  
+%{__rm} -f $RPM_BUILD_ROOT%{omcprefix}/%_lib/cmpi/*.{a,la} 
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%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=%{omcprefix}/share/mof/%{name}
+peg-loadmof.sh -n root/cimv2 $MOFDIR/omc-cmpi-base.mof || /bin/true
+peg-loadmof.sh -n root/PG_InterOp $MOFDIR/*.reg || /bin/true
+
+%postun
+%run_ldconfig
+
+%files
+%defattr(-,root,root)
+%{omcprefix}/%_lib/*.so*  
+%{omcprefix}/%_lib/cmpi/*.so*  
+%dir %{omcprefix}/share/mof/%{name}  
+%{omcprefix}/share/mof/%{name}/*  
+
+
+%changelog
+

Added: contrib/xen-vm-builder/trunk/src/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/src/Makefile.am	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/src/Makefile.am	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,5 @@
+AUTOMAKE_OPTIONS = gnu
+
+SUBDIRS = \
+	providers
+

Added: contrib/xen-vm-builder/trunk/src/providers/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/Makefile.am	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/src/providers/Makefile.am	2008-04-23 17:13:07 UTC (rev 579)
@@ -0,0 +1,5 @@
+AUTOMAKE_OPTIONS = gnu
+
+SUBDIRS = \
+	vm-builder
+

Added: contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
===================================================================
--- contrib/xen-vm-builder/tru...
 
[truncated message content]

[Omc-commit] SF.net SVN: omc: [578] cmpibase/trunk

From: <jc...@us...> - 2008-04-23 15:43:55

Revision: 578
          http://omc.svn.sourceforge.net/omc/?rev=578&view=rev
Author:   jcarey
Date:     2008-04-23 08:43:59 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
RPM Spec file and adjustment for...

Modified Paths:
--------------
    cmpibase/trunk/Makefile.am
    cmpibase/trunk/configure.ac

Added Paths:
-----------
    cmpibase/trunk/omc-cmpibase.changes
    cmpibase/trunk/omc-cmpibase.spec

Property Changed:
----------------
    cmpibase/trunk/
    cmpibase/trunk/mof/


Property changes on: cmpibase/trunk
___________________________________________________________________
Name: svn:ignore
   - stamp-h1
configure
Makefile.in
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
Makefile
omccmpi-*.tar.gz
config.status
config.h.in
libtool
autom4te.cache
missing
aclocal.m4


   + stamp-h1
configure
Makefile.in
mybuild
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
Makefile
omccmpi-*.tar.gz
config.status
config.h.in
libtool
autom4te.cache
missing
aclocal.m4



Modified: cmpibase/trunk/Makefile.am
===================================================================
--- cmpibase/trunk/Makefile.am	2008-04-22 22:55:29 UTC (rev 577)
+++ cmpibase/trunk/Makefile.am	2008-04-23 15:43:59 UTC (rev 578)
@@ -4,6 +4,7 @@
 
 SUBDIRS = \
 	. \
-	src
+	src \
+	mof
 
 

Modified: cmpibase/trunk/configure.ac
===================================================================
--- cmpibase/trunk/configure.ac	2008-04-22 22:55:29 UTC (rev 577)
+++ cmpibase/trunk/configure.ac	2008-04-23 15:43:59 UTC (rev 578)
@@ -198,5 +198,6 @@
 	src/providers/time-service/Makefile
 	src/providers/logical-file/Makefile
 	src/providers/logical-file/schema/Makefile
+	mof/Makefile
 	])
 AC_OUTPUT


Property changes on: cmpibase/trunk/mof
___________________________________________________________________
Name: svn:ignore
   + Makefile.in


Added: cmpibase/trunk/omc-cmpibase.changes
===================================================================
--- cmpibase/trunk/omc-cmpibase.changes	                        (rev 0)
+++ cmpibase/trunk/omc-cmpibase.changes	2008-04-23 15:43:59 UTC (rev 578)
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Tue Apr 22 17:02:33 MDT 2008 - jc...@no...
+
+- Initial Revision
+

Added: cmpibase/trunk/omc-cmpibase.spec
===================================================================
--- cmpibase/trunk/omc-cmpibase.spec	                        (rev 0)
+++ cmpibase/trunk/omc-cmpibase.spec	2008-04-23 15:43:59 UTC (rev 578)
@@ -0,0 +1,97 @@
+#
+# spec file for package omc-cmpibase
+#
+# 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/
+#
+
+# norootforbuild
+%define omcprefix /usr
+
+Name:           omc-cmpibase
+BuildRequires:  gcc gcc-c++ cimple-devel omccmpi-devel tog-pegasus-devel
+URL:            http://sourceforge.net/projects/omc
+# Increment the version every time the source code changes.
+Version:        1.0.0
+Release:        01
+Group:          System/Management
+Vendor:         Novell, Inc.
+Summary:        Open-source implementation of CIM Providers for base components.
+PreReq:         /usr/bin/peg-loadmof.sh
+License:        BSD
+# 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:		tog-pegasus cimple omccmpi
+Requires:       cim-schema >= 2.12
+Source0:		cmpibase-%{version}.tar.gz
+
+%description
+Linux providers for instrumentation of base operating system components  
+such as computer, system, operating system, and processes.
+
+Authors:
+--------
+    Jon Carey
+	Norm Paxton
+	Bart Whiteley
+
+%prep
+# Untar the sources.
+%setup -n cmpibase-%{version}
+
+%build
+# If the LD_RUN_PATH environment variable is set at link time,
+# it's value is embedded in the resulting binary.  At run time,
+# The binary will look here first for shared libraries.  This way
+# we link against the libraries we want at run-time even if libs
+# by the same name are in /usr/lib or some other path in /etc/ld.so.conf
+autoreconf --force --install
+CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
+CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \
+./configure --prefix=%{omcprefix} --libdir=%_libdir --with-cmpi-include-dir=/usr/include/Pegasus/Provider/CMPI
+make %{?jobs:-j%jobs}
+
+%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/%{omcprefix}/share/mof/%{name}
+install -d $MOFDIR
+install mof/*.{mof,reg} $MOFDIR
+%{__rm} -f $RPM_BUILD_ROOT%{omcprefix}/%_lib/*.{a,la}  
+%{__rm} -f $RPM_BUILD_ROOT%{omcprefix}/%_lib/cmpi/*.{a,la} 
+
+%clean
+%{__rm} -rf $RPM_BUILD_ROOT
+
+%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=%{omcprefix}/share/mof/%{name}
+peg-loadmof.sh -n root/cimv2 $MOFDIR/omc-cmpi-base.mof || /bin/true
+peg-loadmof.sh -n root/PG_InterOp $MOFDIR/*.reg || /bin/true
+
+%postun
+%run_ldconfig
+
+%files
+%defattr(-,root,root)
+%{omcprefix}/%_lib/*.so*  
+%{omcprefix}/%_lib/cmpi/*.so*  
+%dir %{omcprefix}/share/mof/%{name}  
+%{omcprefix}/share/mof/%{name}/*  
+
+
+%changelog
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [577] cmpibase/trunk/mof/Makefile.am

From: <jc...@us...> - 2008-04-22 22:55:31

Revision: 577
          http://omc.svn.sourceforge.net/omc/?rev=577&view=rev
Author:   jcarey
Date:     2008-04-22 15:55:29 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Added

Added Paths:
-----------
    cmpibase/trunk/mof/Makefile.am

Added: cmpibase/trunk/mof/Makefile.am
===================================================================
--- cmpibase/trunk/mof/Makefile.am	                        (rev 0)
+++ cmpibase/trunk/mof/Makefile.am	2008-04-22 22:55:29 UTC (rev 577)
@@ -0,0 +1,13 @@
+EXTRA_DIST = \
+	computer-system-peg.reg \
+	logical-file-peg.reg \
+	omc-cmpi-base.mof \
+	omc-computer-system.mof \
+	omc-core.mof \
+	omc-logical-file.mof \
+	omc-operating-system.mof \
+	omc-processes.mof \
+	omc-time-service.mof \
+	operating-system-peg.reg \
+	processes-peg.reg \
+	time-service-peg.reg


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [576] cmpibase/trunk/mof

From: <jc...@us...> - 2008-04-22 22:53:28

Revision: 576
          http://omc.svn.sourceforge.net/omc/?rev=576&view=rev
Author:   jcarey
Date:     2008-04-22 15:53:10 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
moving reg files

Added Paths:
-----------
    cmpibase/trunk/mof/computer-system-peg.reg
    cmpibase/trunk/mof/logical-file-peg.reg
    cmpibase/trunk/mof/operating-system-peg.reg
    cmpibase/trunk/mof/processes-peg.reg
    cmpibase/trunk/mof/time-service-peg.reg

Removed Paths:
-------------
    cmpibase/trunk/mof/reg/

Added: cmpibase/trunk/mof/computer-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/computer-system-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/computer-system-peg.reg	2008-04-22 22:53:10 UTC (rev 576)
@@ -0,0 +1,85 @@
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_CS_HostNameSettingData_Module";
+   Location = "omccmpi_cshostnamesettingdata";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_HostNameSettingData_Module";
+   Location = "omccmpi_hostnamesettingdata";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_UnitaryComputerSystem_Module";
+   Location = "omccmpi_computer_system";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_CS_HostNameSettingData_Provider";
+   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_HostNameSettingData_Provider";
+   ProviderModuleName = "OMC_HostNameSettingData_Module";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_UnitaryComputerSystem_Provider";
+   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
+   ProviderName = "OMC_UnitaryComputerSystem_Provider";
+   ClassName = "OMC_UnitaryComputerSystem";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_UnitaryComputerSystem-1";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_HostNameSettingData_Module";
+   ProviderName = "OMC_HostNameSettingData_Provider";
+   ClassName = "OMC_HostNameSettingData";
+   ProviderType = { 2, 5 };	// Instance, Method
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_HostNameSettingData-2";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
+   ProviderName = "OMC_CS_HostNameSettingData_Provider";
+   ClassName = "OMC_ComputerSystemHostNameSettingData";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_ComputerSystemHostNameSettingData-3";
+};
+

Added: cmpibase/trunk/mof/logical-file-peg.reg
===================================================================
--- cmpibase/trunk/mof/logical-file-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/logical-file-peg.reg	2008-04-22 22:53:10 UTC (rev 576)
@@ -0,0 +1,134 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxLogicalFile_Module";
+	Location = "CIM_LogicalFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "CIM_LogicalFile_Provider";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "CIM_LogicalFile_Provider";
+    ClassName = "OMC_LinuxDataFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,5}; // Instance, Method
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0002";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "CIM_LogicalFile_Provider";
+    ClassName = "OMC_LinuxDeviceFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0003";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "CIM_LogicalFile_Provider";
+    ClassName = "OMC_LinuxSymbolicLink";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0004";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "CIM_LogicalFile_Provider";
+    ClassName = "OMC_LinuxDirectory";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0005";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "CIM_LogicalFile_Provider";
+    ClassName = "OMC_LinuxFIFOPipeFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxFile_Module";
+	Location = "OMC_LinuxFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxFile_Provider";
+	ProviderModuleName = "OMC_LinuxFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxFile_Module";
+	ProviderName = "OMC_LinuxFile_Provider";
+    ClassName = "OMC_LinuxFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxDirectoryContainsFile_Module";
+	Location = "OMC_LinuxDirectoryContainsFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxDirectoryContainsFile_Provider";
+	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+	CapabilityID = "OMC_LinuxDirectoryContainsFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
+	ProviderName = "OMC_LinuxDirectoryContainsFile_Provider";
+    ClassName = "OMC_LinuxDirectoryContainsFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,3}; // Instance, Associator
+};
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxFileIdentity_Module";
+	Location = "OMC_LinuxFileIdentity_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxFileIdentity_Provider";
+	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
+};
+instance of PG_ProviderCapabilities
+{
+	CapabilityID = "OMC_LinuxFileIdentity_Capability0001";
+	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
+	ProviderName = "OMC_LinuxFileIdentity_Provider";
+    ClassName = "OMC_LinuxFileIdentity";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,3}; // Instance, Associator
+};
+

Added: cmpibase/trunk/mof/operating-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/operating-system-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/operating-system-peg.reg	2008-04-22 22:53:10 UTC (rev 576)
@@ -0,0 +1,86 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_OperatingSystemProviderModule";
+	Location = "OMC_LinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_OperatingSystemProviderModule";
+	Name = "OMC_LinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_OperatingSystemProviderModule";
+	ProviderName = "OMC_LinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_OperatingSystem";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 5 }; // Instance, Method
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_RunningLinuxOSProviderModule";
+	Location = "OMC_RunningLinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
+	Name = "OMC_RunningLinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
+	ProviderName = "OMC_RunningLinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_RunningOS";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Associator
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_InstalledLinuxOSProviderModule";
+	Location = "OMC_InstalledLinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
+	Name = "OMC_InstalledLinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
+	ProviderName = "OMC_InstalledLinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_InstalledOS";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Associator
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+

Added: cmpibase/trunk/mof/processes-peg.reg
===================================================================
--- cmpibase/trunk/mof/processes-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/processes-peg.reg	2008-04-22 22:53:10 UTC (rev 576)
@@ -0,0 +1,40 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_UnixProcessProviderModule";
+	Location = "OMC_UnixProcess";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	Name = "OMC_UnixProcess";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	ProviderName = "OMC_UnixProcess";
+	CapabilityID = "1";
+	ClassName = "OMC_UnixProcess";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 5 }; // Instance, Method
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL; // All methods
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	ProviderName = "OMC_UnixProcess";
+	CapabilityID = "2";
+	ClassName = "OMC_OSProcess";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Association
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;
+};
+

Added: cmpibase/trunk/mof/time-service-peg.reg
===================================================================
--- cmpibase/trunk/mof/time-service-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/time-service-peg.reg	2008-04-22 22:53:10 UTC (rev 576)
@@ -0,0 +1,215 @@
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_SystemTimeService_Module";
+   Location = "omccmpi_systemTimeService";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_SystemTimeService_Provider";
+   ProviderModuleName = "OMC_SystemTimeService_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_SystemTimeService_Module";
+   ProviderName = "OMC_SystemTimeService_Provider";
+   ClassName = "OMC_SystemTimeService";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_SystemTimeService-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_RemoteTimeServicePort_Module";
+   Location = "omccmpi_remoteTimeServicePort";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_RemoteTimeServicePort_Provider";
+   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
+   ProviderName = "OMC_RemoteTimeServicePort_Provider";
+   ClassName = "OMC_RemoteTimeServicePort";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_RemoteTimeServicePort-2";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeZoneSettingData_Module";
+   Location = "omccmpi_timeZoneSettingData";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeZoneSettingData_Provider";
+   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
+   ProviderName = "OMC_TimeZoneSettingData_Provider";
+   ClassName = "OMC_TimeZoneSettingData";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeZoneSettingData-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_HostedTimeService_Module";
+   Location = "omccmpi_hostedTimeService";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_HostedTimeService_Provider";
+   ProviderModuleName = "OMC_HostedTimeService_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_HostedTimeService_Module";
+   ProviderName = "OMC_HostedTimeService_Provider";
+   ClassName = "OMC_HostedTimeService";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_HostedTimeService-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceTimeZoneSettingData_Module";
+   Location = "omccmpi_timeServiceTimeZoneSettingData";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceTimeZoneSettingData_Provider";
+   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
+   ProviderName = "OMC_TimeServiceTimeZoneSettingData_Provider";
+   ClassName = "OMC_TimeServiceTimeZoneSettingData";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceTimeZoneSettingData-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceAccessBySAP_Module";
+   Location = "omccmpi_timeServiceAccessBySAP";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceAccessBySAP_Provider";
+   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
+   ProviderName = "OMC_TimeServiceAccessBySAP_Provider";
+   ClassName = "OMC_TimeServiceAccessBySAP";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceAccessBySAP-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceAvailableToElement_Module";
+   Location = "omccmpi_timeServiceAvailableToElement";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceAvailableToElement_Provider";
+   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
+   ProviderName = "OMC_TimeServiceAvailableToElement_Provider";
+   ClassName = "OMC_TimeServiceAvailableToElement";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceAvailableToElement-1";
+};
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [575] cmpibase/trunk/mof/reg

From: <jc...@us...> - 2008-04-22 22:52:29

Revision: 575
          http://omc.svn.sourceforge.net/omc/?rev=575&view=rev
Author:   jcarey
Date:     2008-04-22 15:52:19 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
moving reg files

Removed Paths:
-------------
    cmpibase/trunk/mof/reg/computer-system-peg.reg
    cmpibase/trunk/mof/reg/logical-file-peg.reg
    cmpibase/trunk/mof/reg/operating-system-peg.reg
    cmpibase/trunk/mof/reg/processes-peg.reg
    cmpibase/trunk/mof/reg/time-service-peg.reg

Deleted: cmpibase/trunk/mof/reg/computer-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/computer-system-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
+++ cmpibase/trunk/mof/reg/computer-system-peg.reg	2008-04-22 22:52:19 UTC (rev 575)
@@ -1,85 +0,0 @@
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_CS_HostNameSettingData_Module";
-   Location = "omccmpi_cshostnamesettingdata";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_HostNameSettingData_Module";
-   Location = "omccmpi_hostnamesettingdata";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_UnitaryComputerSystem_Module";
-   Location = "omccmpi_computer_system";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_CS_HostNameSettingData_Provider";
-   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_HostNameSettingData_Provider";
-   ProviderModuleName = "OMC_HostNameSettingData_Module";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_UnitaryComputerSystem_Provider";
-   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
-   ProviderName = "OMC_UnitaryComputerSystem_Provider";
-   ClassName = "OMC_UnitaryComputerSystem";
-   ProviderType = { 2 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_UnitaryComputerSystem-1";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_HostNameSettingData_Module";
-   ProviderName = "OMC_HostNameSettingData_Provider";
-   ClassName = "OMC_HostNameSettingData";
-   ProviderType = { 2, 5 };	// Instance, Method
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_HostNameSettingData-2";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
-   ProviderName = "OMC_CS_HostNameSettingData_Provider";
-   ClassName = "OMC_ComputerSystemHostNameSettingData";
-   ProviderType = { 2, 3 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_ComputerSystemHostNameSettingData-3";
-};
-

Deleted: cmpibase/trunk/mof/reg/logical-file-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/logical-file-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
+++ cmpibase/trunk/mof/reg/logical-file-peg.reg	2008-04-22 22:52:19 UTC (rev 575)
@@ -1,134 +0,0 @@
-instance of PG_ProviderModule
-{
-	Name = "OMC_LinuxLogicalFile_Module";
-	Location = "CIM_LogicalFile_Provider";
-	Vendor = "OMC";
-	Version = "2.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-}; 
-instance of PG_Provider
-{
-	Name = "CIM_LogicalFile_Provider";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxLogicalFile_Capability0001";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "CIM_LogicalFile_Provider";
-    ClassName = "OMC_LinuxDataFile";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2,5}; // Instance, Method
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxLogicalFile_Capability0002";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "CIM_LogicalFile_Provider";
-    ClassName = "OMC_LinuxDeviceFile";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2}; // Instance
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxLogicalFile_Capability0003";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "CIM_LogicalFile_Provider";
-    ClassName = "OMC_LinuxSymbolicLink";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2}; // Instance
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxLogicalFile_Capability0004";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "CIM_LogicalFile_Provider";
-    ClassName = "OMC_LinuxDirectory";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2}; // Instance
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxLogicalFile_Capability0005";
-	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "CIM_LogicalFile_Provider";
-    ClassName = "OMC_LinuxFIFOPipeFile";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2}; // Instance
-};
-
-
-instance of PG_ProviderModule
-{
-	Name = "OMC_LinuxFile_Module";
-	Location = "OMC_LinuxFile_Provider";
-	Vendor = "OMC";
-	Version = "2.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-}; 
-instance of PG_Provider
-{
-	Name = "OMC_LinuxFile_Provider";
-	ProviderModuleName = "OMC_LinuxFile_Module";
-};
-instance of PG_ProviderCapabilities
-{
-    CapabilityID = "OMC_LinuxFile_Capability0001";
-	ProviderModuleName = "OMC_LinuxFile_Module";
-	ProviderName = "OMC_LinuxFile_Provider";
-    ClassName = "OMC_LinuxFile";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2}; // Instance
-};
-
-
-instance of PG_ProviderModule
-{
-	Name = "OMC_LinuxDirectoryContainsFile_Module";
-	Location = "OMC_LinuxDirectoryContainsFile_Provider";
-	Vendor = "OMC";
-	Version = "2.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-}; 
-instance of PG_Provider
-{
-	Name = "OMC_LinuxDirectoryContainsFile_Provider";
-	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
-};
-instance of PG_ProviderCapabilities
-{
-	CapabilityID = "OMC_LinuxDirectoryContainsFile_Capability0001";
-	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
-	ProviderName = "OMC_LinuxDirectoryContainsFile_Provider";
-    ClassName = "OMC_LinuxDirectoryContainsFile";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2,3}; // Instance, Associator
-};
-
-instance of PG_ProviderModule
-{
-	Name = "OMC_LinuxFileIdentity_Module";
-	Location = "OMC_LinuxFileIdentity_Provider";
-	Vendor = "OMC";
-	Version = "2.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-}; 
-instance of PG_Provider
-{
-	Name = "OMC_LinuxFileIdentity_Provider";
-	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
-};
-instance of PG_ProviderCapabilities
-{
-	CapabilityID = "OMC_LinuxFileIdentity_Capability0001";
-	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
-	ProviderName = "OMC_LinuxFileIdentity_Provider";
-    ClassName = "OMC_LinuxFileIdentity";
-    Namespaces = {"root/cimv2"};
-    ProviderType = {2,3}; // Instance, Associator
-};
-

Deleted: cmpibase/trunk/mof/reg/operating-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/operating-system-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
+++ cmpibase/trunk/mof/reg/operating-system-peg.reg	2008-04-22 22:52:19 UTC (rev 575)
@@ -1,86 +0,0 @@
-instance of PG_ProviderModule
-{
-	Name = "OMC_OperatingSystemProviderModule";
-	Location = "OMC_LinuxOS";
-	Vendor = "OMC";
-	Version = "1.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-	ProviderModuleName = "OMC_OperatingSystemProviderModule";
-	Name = "OMC_LinuxOS";
-};
-
-instance of PG_ProviderCapabilities
-{
-	ProviderModuleName = "OMC_OperatingSystemProviderModule";
-	ProviderName = "OMC_LinuxOS";
-	CapabilityID = "1";
-	ClassName = "OMC_OperatingSystem";
-	Namespaces = {"root/cimv2"};
-	ProviderType = { 2, 5 }; // Instance, Method
-	SupportedProperties = NULL; // All properties
-	SupportedMethods = NULL;	// All Methods
-};
-
-instance of PG_ProviderModule
-{
-	Name = "OMC_RunningLinuxOSProviderModule";
-	Location = "OMC_RunningLinuxOS";
-	Vendor = "OMC";
-	Version = "1.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
-	Name = "OMC_RunningLinuxOS";
-};
-
-instance of PG_ProviderCapabilities
-{
-	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
-	ProviderName = "OMC_RunningLinuxOS";
-	CapabilityID = "1";
-	ClassName = "OMC_RunningOS";
-	Namespaces = {"root/cimv2"};
-	ProviderType = { 2, 3 }; // Instance, Associator
-	SupportedProperties = NULL; // All properties
-	SupportedMethods = NULL;	// All Methods
-};
-
-
-instance of PG_ProviderModule
-{
-	Name = "OMC_InstalledLinuxOSProviderModule";
-	Location = "OMC_InstalledLinuxOS";
-	Vendor = "OMC";
-	Version = "1.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
-	Name = "OMC_InstalledLinuxOS";
-};
-
-instance of PG_ProviderCapabilities
-{
-	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
-	ProviderName = "OMC_InstalledLinuxOS";
-	CapabilityID = "1";
-	ClassName = "OMC_InstalledOS";
-	Namespaces = {"root/cimv2"};
-	ProviderType = { 2, 3 }; // Instance, Associator
-	SupportedProperties = NULL; // All properties
-	SupportedMethods = NULL;	// All Methods
-};
-
-

Deleted: cmpibase/trunk/mof/reg/processes-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/processes-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
+++ cmpibase/trunk/mof/reg/processes-peg.reg	2008-04-22 22:52:19 UTC (rev 575)
@@ -1,40 +0,0 @@
-instance of PG_ProviderModule
-{
-	Name = "OMC_UnixProcessProviderModule";
-	Location = "OMC_UnixProcess";
-	Vendor = "OMC";
-	Version = "1.0.0";
-	InterfaceType = "CMPI";
-	InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-	ProviderModuleName = "OMC_UnixProcessProviderModule";
-	Name = "OMC_UnixProcess";
-};
-
-instance of PG_ProviderCapabilities
-{
-	ProviderModuleName = "OMC_UnixProcessProviderModule";
-	ProviderName = "OMC_UnixProcess";
-	CapabilityID = "1";
-	ClassName = "OMC_UnixProcess";
-	Namespaces = {"root/cimv2"};
-	ProviderType = { 2, 5 }; // Instance, Method
-	SupportedProperties = NULL; // All properties
-	SupportedMethods = NULL; // All methods
-};
-
-instance of PG_ProviderCapabilities
-{
-	ProviderModuleName = "OMC_UnixProcessProviderModule";
-	ProviderName = "OMC_UnixProcess";
-	CapabilityID = "2";
-	ClassName = "OMC_OSProcess";
-	Namespaces = {"root/cimv2"};
-	ProviderType = { 2, 3 }; // Instance, Association
-	SupportedProperties = NULL; // All properties
-	SupportedMethods = NULL;
-};
-

Deleted: cmpibase/trunk/mof/reg/time-service-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/time-service-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
+++ cmpibase/trunk/mof/reg/time-service-peg.reg	2008-04-22 22:52:19 UTC (rev 575)
@@ -1,215 +0,0 @@
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_SystemTimeService_Module";
-   Location = "omccmpi_systemTimeService";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_SystemTimeService_Provider";
-   ProviderModuleName = "OMC_SystemTimeService_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_SystemTimeService_Module";
-   ProviderName = "OMC_SystemTimeService_Provider";
-   ClassName = "OMC_SystemTimeService";
-   ProviderType = { 2 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_SystemTimeService-1";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_RemoteTimeServicePort_Module";
-   Location = "omccmpi_remoteTimeServicePort";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_RemoteTimeServicePort_Provider";
-   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
-   ProviderName = "OMC_RemoteTimeServicePort_Provider";
-   ClassName = "OMC_RemoteTimeServicePort";
-   ProviderType = { 2 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_RemoteTimeServicePort-2";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_TimeZoneSettingData_Module";
-   Location = "omccmpi_timeZoneSettingData";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_TimeZoneSettingData_Provider";
-   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
-   ProviderName = "OMC_TimeZoneSettingData_Provider";
-   ClassName = "OMC_TimeZoneSettingData";
-   ProviderType = { 2 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_TimeZoneSettingData-1";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_HostedTimeService_Module";
-   Location = "omccmpi_hostedTimeService";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_HostedTimeService_Provider";
-   ProviderModuleName = "OMC_HostedTimeService_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_HostedTimeService_Module";
-   ProviderName = "OMC_HostedTimeService_Provider";
-   ClassName = "OMC_HostedTimeService";
-   ProviderType = { 2, 3 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_HostedTimeService-1";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_TimeServiceTimeZoneSettingData_Module";
-   Location = "omccmpi_timeServiceTimeZoneSettingData";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_TimeServiceTimeZoneSettingData_Provider";
-   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
-   ProviderName = "OMC_TimeServiceTimeZoneSettingData_Provider";
-   ClassName = "OMC_TimeServiceTimeZoneSettingData";
-   ProviderType = { 2, 3 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_TimeServiceTimeZoneSettingData-1";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_TimeServiceAccessBySAP_Module";
-   Location = "omccmpi_timeServiceAccessBySAP";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_TimeServiceAccessBySAP_Provider";
-   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
-   ProviderName = "OMC_TimeServiceAccessBySAP_Provider";
-   ClassName = "OMC_TimeServiceAccessBySAP";
-   ProviderType = { 2, 3 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_TimeServiceAccessBySAP-1";
-};
-
-
-
-
-instance of PG_ProviderModule
-{
-   Name = "OMC_TimeServiceAvailableToElement_Module";
-   Location = "omccmpi_timeServiceAvailableToElement";
-   Vendor = "OMC";
-   Version = "2.0.0";
-   InterfaceType = "CMPI";
-   InterfaceVersion = "2.0.0";
-};
-
-instance of PG_Provider
-{
-   Name = "OMC_TimeServiceAvailableToElement_Provider";
-   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
-};
-
-instance of PG_ProviderCapabilities
-{
-   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
-   ProviderName = "OMC_TimeServiceAvailableToElement_Provider";
-   ClassName = "OMC_TimeServiceAvailableToElement";
-   ProviderType = { 2, 3 };
-   Namespaces = {"root/cimv2"};
-   SupportedProperties = NULL;
-   SupportedMethods = NULL;
-   CapabilityID = "OMC_TimeServiceAvailableToElement-1";
-};
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [574] cmpibase/trunk/mof/reg/logical-file-peg.reg

From: <jc...@us...> - 2008-04-22 22:21:18

Revision: 574
          http://omc.svn.sourceforge.net/omc/?rev=574&view=rev
Author:   jcarey
Date:     2008-04-22 15:21:23 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Fixed logical file reg

Modified Paths:
--------------
    cmpibase/trunk/mof/reg/logical-file-peg.reg

Modified: cmpibase/trunk/mof/reg/logical-file-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/logical-file-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
+++ cmpibase/trunk/mof/reg/logical-file-peg.reg	2008-04-22 22:21:23 UTC (rev 574)
@@ -9,14 +9,14 @@
 }; 
 instance of PG_Provider
 {
-	Name = "OMC_LinuxLogicalFile_Provider";
+	Name = "CIM_LogicalFile_Provider";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
 };
 instance of PG_ProviderCapabilities
 {
     CapabilityID = "OMC_LinuxLogicalFile_Capability0001";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "OMC_LinuxLogicalFile_Provider";
+	ProviderName = "CIM_LogicalFile_Provider";
     ClassName = "OMC_LinuxDataFile";
     Namespaces = {"root/cimv2"};
     ProviderType = {2,5}; // Instance, Method
@@ -25,7 +25,7 @@
 {
     CapabilityID = "OMC_LinuxLogicalFile_Capability0002";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "OMC_LinuxLogicalFile_Provider";
+	ProviderName = "CIM_LogicalFile_Provider";
     ClassName = "OMC_LinuxDeviceFile";
     Namespaces = {"root/cimv2"};
     ProviderType = {2}; // Instance
@@ -34,7 +34,7 @@
 {
     CapabilityID = "OMC_LinuxLogicalFile_Capability0003";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "OMC_LinuxLogicalFile_Provider";
+	ProviderName = "CIM_LogicalFile_Provider";
     ClassName = "OMC_LinuxSymbolicLink";
     Namespaces = {"root/cimv2"};
     ProviderType = {2}; // Instance
@@ -43,7 +43,7 @@
 {
     CapabilityID = "OMC_LinuxLogicalFile_Capability0004";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "OMC_LinuxLogicalFile_Provider";
+	ProviderName = "CIM_LogicalFile_Provider";
     ClassName = "OMC_LinuxDirectory";
     Namespaces = {"root/cimv2"};
     ProviderType = {2}; // Instance
@@ -52,7 +52,7 @@
 {
     CapabilityID = "OMC_LinuxLogicalFile_Capability0005";
 	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
-	ProviderName = "OMC_LinuxLogicalFile_Provider";
+	ProviderName = "CIM_LogicalFile_Provider";
     ClassName = "OMC_LinuxFIFOPipeFile";
     Namespaces = {"root/cimv2"};
     ProviderType = {2}; // Instance


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [573] cmpibase/trunk

From: <jc...@us...> - 2008-04-22 22:00:18

Revision: 573
          http://omc.svn.sourceforge.net/omc/?rev=573&view=rev
Author:   jcarey
Date:     2008-04-22 15:00:14 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Mof and peg provider reg files

Added Paths:
-----------
    cmpibase/trunk/mof/
    cmpibase/trunk/mof/omc-cmpi-base.mof
    cmpibase/trunk/mof/omc-computer-system.mof
    cmpibase/trunk/mof/omc-core.mof
    cmpibase/trunk/mof/omc-logical-file.mof
    cmpibase/trunk/mof/omc-operating-system.mof
    cmpibase/trunk/mof/omc-processes.mof
    cmpibase/trunk/mof/omc-time-service.mof
    cmpibase/trunk/mof/reg/
    cmpibase/trunk/mof/reg/computer-system-peg.reg
    cmpibase/trunk/mof/reg/logical-file-peg.reg
    cmpibase/trunk/mof/reg/operating-system-peg.reg
    cmpibase/trunk/mof/reg/processes-peg.reg
    cmpibase/trunk/mof/reg/time-service-peg.reg

Added: cmpibase/trunk/mof/omc-cmpi-base.mof
===================================================================
--- cmpibase/trunk/mof/omc-cmpi-base.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-cmpi-base.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,7 @@
+#pragma include ("omc-core.mof")
+#pragma include ("omc-computer-system.mof")
+#pragma include ("omc-operating-system.mof")
+#pragma include ("omc-logical-file.mof")
+#pragma include ("omc-processes.mof")
+#pragma include ("omc-time-service.mof")
+

Added: cmpibase/trunk/mof/omc-computer-system.mof
===================================================================
--- cmpibase/trunk/mof/omc-computer-system.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-computer-system.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,33 @@
+#pragma locale ("en_US")
+
+
+//////////////////////////////////////////////////////////////////////////////
+[ Description("OMC Unitary Computer System") ]
+class OMC_UnitaryComputerSystem : CIM_UnitaryComputerSystem
+{
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Description("OMC Host Name Setting Data") ]
+class OMC_HostNameSettingData : CIM_SettingData
+{
+	[Description ("The name of this computer"),
+		Required ]
+	string ComputerName;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Version ( "2.7.0" ), 
+	Description ("OMC_ComputerSystemSettingData is associates "
+		" the computer name setting with the computer system") ]
+class OMC_ComputerSystemHostNameSettingData : CIM_ElementSettingData 
+{
+	[ Override("ManagedElement"),  Key, 
+		Description ("The computer system.")]
+	OMC_UnitaryComputerSystem REF ManagedElement;
+
+	[ Override("SettingData"), Key, 
+		Description ("The computer name setting the computer.")]
+	OMC_HostNameSettingData REF SettingData;
+};
+

Added: cmpibase/trunk/mof/omc-core.mof
===================================================================
--- cmpibase/trunk/mof/omc-core.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-core.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,35 @@
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract, Description("OMC base class for Services.") ]
+class OMC_Service : CIM_Service
+{
+	[Override("StartService"),
+		ValueMap {"0", "1", "2", "3", "4", "5"},
+		Values {"Success", "Request Not Supported", "Already Running",
+			"Service Does Not Exist", "Access Denied", "General Failure"}]
+	uint32 StartService();
+
+	[Override("StopService"),
+		ValueMap {"0", "1", "2", "3", "4", "5"},
+		Values {"Success", "Request Not Supported", "Service Not Running",
+			"Service Does Not Exist", "Access Denied", "General Failure"}]
+	uint32 StopService();
+	
+	uint32 ReloadService();
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract, Description("OMC base class for software identity") ]
+class OMC_SoftwareIdentity : CIM_SoftwareIdentity
+{
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_TimeService : CIM_TimeService
+{
+};
+
+//////////////////////////////////////////////////////////////////////////////
+

Added: cmpibase/trunk/mof/omc-logical-file.mof
===================================================================
--- cmpibase/trunk/mof/omc-logical-file.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-logical-file.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,183 @@
+/*******************************************************************************
+ * Novell_LinuxSSHService and associated classes
+ *
+ *
+ * Copyright (C) 2004 Novell, Inc. 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 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 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.
+ ******************************************************************************/
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_DataFile : CIM_DataFile
+{
+	sint32 append([IN(true), OUT(false), REQUIRED(true)] string newtext); 
+	sint32 write([IN(true), OUT(false), REQUIRED(true)] string newtext); 
+	sint32 read([IN(false), OUT(true), REQUIRED(true)] string filetext); 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixDeviceFile : CIM_UnixDeviceFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_SymbolicLink : CIM_SymbolicLink
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixDirectory : CIM_UnixDirectory
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_FIFOPipeFile : CIM_FIFOPipeFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixFile : CIM_UnixFile
+{
+	boolean UserReadable; 
+	boolean UserWritable; 
+	boolean UserExecutable; 
+	boolean GroupReadable; 
+	boolean GroupWritable; 
+	boolean GroupExecutable; 
+	boolean WorldReadable; 
+	boolean WorldWritable; 
+	boolean WorldExecutable; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Aggregation, Composition, Abstract,
+	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
+	"Directory.")] 
+class OMC_DirectoryContainsFile : CIM_DirectoryContainsFile
+{
+	[Override ("GroupComponent"), Aggregate, Max(1), 
+		Description ("The Directory") ]
+	OMC_UnixDirectory REF GroupComponent; 
+
+	[Override ("PartComponent"), 
+		Description ("The LogicalFile 'contained within' the Directory.") ]
+	CIM_LogicalFile REF PartComponent; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Abstract, Description (
+		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
+		"specific aspects of the various subclasses of LogicalFile. "
+		"The association exists since it forces UnixFile to be "
+		"weak to (scoped by) the LogicalFile. This is not true in "
+		"the association's superclass, LogicalIdentity.")]
+class OMC_FileIdentity : CIM_FileIdentity
+{
+	[Override ("SystemElement"), Min (1), Max (1),
+		Description ("The Logical File.") ]
+	CIM_LogicalFile ref SystemElement;
+
+	[Override ("SameElement"), Weak, Max (1), 
+		Description ("SameElement represents the additional aspects of the "
+			"Unix/Linux Logical file.") ]
+	OMC_UnixFile ref SameElement;
+
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxDataFile : OMC_DataFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxDeviceFile : OMC_UnixDeviceFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxSymbolicLink : OMC_SymbolicLink
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxDirectory : OMC_UnixDirectory
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxFIFOPipeFile : OMC_FIFOPipeFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+class OMC_LinuxFile : OMC_UnixFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[Association, Aggregation, Composition, 
+	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
+	"Directory.")
+]
+class OMC_LinuxDirectoryContainsFile : OMC_DirectoryContainsFile
+{
+	[Override ("GroupComponent"), Aggregate, Max(1), 
+		Description ("The Directory") ]
+	OMC_LinuxDirectory REF GroupComponent; 
+
+	[Override ("PartComponent"), 
+		Description ("The LogicalFile 'contained within' the Directory.") ]
+	CIM_LogicalFile REF PartComponent; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[Association, Description (
+		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
+		"specific aspects of the various subclasses of LogicalFile. "
+		"The association exists since it forces UnixFile to be "
+		"weak to (scoped by) the LogicalFile. This is not true in "
+		"the association's superclass, LogicalIdentity.")]
+class OMC_LinuxFileIdentity : OMC_FileIdentity
+{
+	[Override ("SystemElement"), Min (1), Max (1),
+	Description ("The Logical File.") ]
+		CIM_LogicalFile ref SystemElement;
+
+	[Override ("SameElement"), Weak, Max (1), Description (
+			"SameElement represents the additional aspects of the "
+			"Unix/Linux Logical file.") ]
+		OMC_LinuxFile ref SameElement;
+
+}; 
+

Added: cmpibase/trunk/mof/omc-operating-system.mof
===================================================================
--- cmpibase/trunk/mof/omc-operating-system.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-operating-system.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,72 @@
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+[ Description("OMC Operating System") ]
+class OMC_OperatingSystem : CIM_OperatingSystem
+{
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Description("Kernel statistics for the running os kernel") ]
+class OMC_OSStatisticalInformation : CIM_StatisticalInformation
+{
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, 
+	Description("OMC_OSStatistics relates "
+		"OMC_OSStatisticalInformation with "
+		"OMC_OperatingSystem") ]
+class OMC_OSStatistics : CIM_Statistics
+{
+	[ Override("Stats"), Weak,
+		Description("The OS Statistical object") ]
+	OMC_OSStatisticalInformation REF Stats; 
+
+	[ Override("Element"), Min(1), Max(1),
+		Description("The operating system object") ]
+	OMC_OperatingSystem REF Element;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[Association, Description (
+       "RunningOS indicates the currently executing OperatingSystem. "
+       "At most one OperatingSystem can execute at any time on a "
+       "ComputerSystem. 'At most one' is specified, since the Computer "
+       "System may not be currently booted, or its OperatingSystem may "
+       "be unknown.")]
+class OMC_RunningOS : CIM_RunningOS 
+{
+      [Override ( "Antecedent" ), Max ( 1 ), Description (
+          "The OperatingSystem currently running on the "
+          "ComputerSystem.")]
+   OMC_OperatingSystem REF Antecedent;
+
+      [Override ( "Dependent" ), Max ( 1 ), Description (
+          "The ComputerSystem.")]
+   CIM_ComputerSystem REF Dependent;
+};
+
+// ===================================================================
+// InstalledOS
+// ===================================================================
+   [Association, Aggregation, Composition, Version ( "2.7.0" ),
+    Description (
+       "A link between the ComputerSystem and the OperatingSystem(s) "
+       "installed or loaded on it. An OperatingSystem is 'installed' "
+       "on a ComputerSystem, when placed on one of its StorageExtents "
+       "- for example, copied to a disk drive or downloaded to Memory. "
+       "Using this definition, an OperatingSystem is 'installed' on a "
+       "NetPC when downloaded via the network.")]
+class OMC_InstalledOS : CIM_InstalledOS
+{
+      [Aggregate, Override ( "GroupComponent" ), Min ( 1 ), Max ( 1 ),
+       Description (
+          "The ComputerSystem.")]
+   CIM_ComputerSystem REF GroupComponent;
+
+      [Override ( "PartComponent" ), Weak, Description (
+          "The OperatingSystem installed on the ComputerSystem.")]
+   OMC_OperatingSystem REF PartComponent;
+};
+

Added: cmpibase/trunk/mof/omc-processes.mof
===================================================================
--- cmpibase/trunk/mof/omc-processes.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-processes.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,53 @@
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+[ Description ("A Unix Process") ]
+class OMC_UnixProcess : CIM_UnixProcess
+{
+	[ Description("Send a signal to some running processes. Only the "
+		"root/admin user is allowed to invoke this method") ]
+	string KillAll([IN] string arg);
+
+	[ Description("Send a signal to a running process") ]
+	string SendSignal([IN] sint32 signal);
+
+	[Description ("Virtual memory size in KBytes") ]
+	uint32 VirtualMemorySize;
+
+	[Description ("Percentage of CPU used by process") ]
+	real32 PercentCPU;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Aggregation, Composition, Version ( "2.7.0" ), 
+	Description ("A link between the OperatingSystem and Process(es) "
+		"running in the context of this OperatingSystem.") ]
+class OMC_OSProcess : CIM_OSProcess
+{
+	[Aggregate, Override ( "GroupComponent" ), Min ( 1 ), Max ( 1 ),
+		Description ("The OperatingSystem.")]
+	OMC_OperatingSystem REF GroupComponent;
+
+	[Override ( "PartComponent" ), Weak, 
+		Description (
+		"The Process running in the context of the OperatingSystem.") ]
+   OMC_UnixProcess REF PartComponent;
+};
+
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, 
+	Description("A link between a Process and a DataFile indicating "
+		"that the File participates in the execution of the Process.") ]
+class OMC_ProcessExecutable : CIM_ProcessExecutable
+{
+	[ Override("Antecedent"), 
+		Description("The DataFile participating in the execution of the"
+			"Process.") ]
+	OMC_DataFile REF Antecedent;
+
+	[ Override("Dependent"),
+		Description("The process.") ]
+	OMC_UnixProcess REF Dependent;
+};
+

Added: cmpibase/trunk/mof/omc-time-service.mof
===================================================================
--- cmpibase/trunk/mof/omc-time-service.mof	                        (rev 0)
+++ cmpibase/trunk/mof/omc-time-service.mof	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,241 @@
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_ManagedElement
+//		CIM_ManagedSystemElement
+//			CIM_LogicalElement
+//				CIM_EnabledLogicalElement
+//					CIM_Service
+//						CIM_TimeService
+//							OMC_TimeService
+// **							OMC_SystemTimeService
+//
+[ Description("OMC_SystemTimeService represents the configuration "
+	" and function of the system time") ]
+class OMC_SystemTimeService : OMC_TimeService
+{
+	[ Key, Override("SystemCreationClassName") ]
+	string SystemCreationClassName;
+
+	[ Key, Override("SystemName") ]
+	string SystemName;
+
+	[ Key, Override("CreationClassName") ]
+	string CreationClassName = "OMC_SystemTimeService";
+
+	[ Key, Override("Name") ]
+	string Name = "timeservice";
+
+	[ Static(true),
+		Description (
+			"This method gets or sets the time for the system."),
+		ValueMap { "0", "1", "2", "3", "4", "5", "6..32767",
+			"32768..65535" },
+		Values { "Success", "Not Supported", "Unknown", "Timeout",
+			"Failed", "Invalid Parameter", "DMTF Reserved",
+			"Vendor Specific" } ]
+	uint32 ManageSystemTime (
+		[ IN, DESCRIPTION (
+			"Indicates what type of request this is: "
+			"TRUE - Get time request "
+			"FALSE - Set time request.") ]
+		boolean GetRequest,
+
+		[ IN, OUT, DESCRIPTION (
+			"The current date and time. On input, this is the time "
+			"that is set on the specified element, if the GetRequest "
+			"input parameter is TRUE. Otherwise, the input time is "
+			"ignored. On output, this is the time as known by the "
+			"element.") ]
+		datetime TimeData);
+
+	[ INVISIBLE(true),
+		Description (
+			"NOT IMPLEMENTED - DON'T USE. "
+			"This method is inherited from CIM_TimeService. "
+			"Since this method always pertains to the ComputerSystem, "
+			"The ManagedElement element parameter is not necessary. "
+			"For this reason the ManageSystemTime method should be "
+			"used instead of ManageTime") ]
+	uint32 ManageTime (
+		[ IN ]
+		boolean GetRequest,
+		[ IN, OUT ]
+		datetime TimeData,
+		[ REQUIRED, IN ]
+		CIM_ManagedElement REF ManagedElement); 
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_ManagedElement
+//		CIM_ManagedSystemElement
+//			CIM_LogicalElement
+//				CIM_EnabledLogicalElement
+//					CIM_ServiceAccessPoint
+//						CIM_RemoteServiceAccessPoint
+//							CIM_RemotePort
+// **							OMC_RemoteTimeServicePort
+//
+[ Description("OMC_RemoteTimeServicePort represent the NTP "
+	"configuration for the time service") ]
+class OMC_RemoteTimeServicePort : CIM_RemotePort
+{
+	[ Override("AccessInfo"), Write(true),
+		Description (
+			"Access and/or addressing information for a remote "
+			"connection. This can be a host name, network address or "
+			"similar information. This is inherited from "
+			"CIM_RemoteServiceAccessPoint"),
+		ModelCorrespondence { "CIM_RemoteServiceAccessPoint.InfoFormat"} ]
+	string AccessInfo;
+
+	[ Override("PortInfo"), Write(true),
+		Description("Address of remote NTP server. This is "
+			" inherited from CIM_RemotePort. This will be in "
+			" the form of a DNS name of an IP address. "
+			" A port may be specified in this field by using "
+			" the ':' character as a delimeter. Example: "
+			" 137.65.1.1:123 or time.server.com:123 "
+			" If not port is specified the NTP well known port "
+			" (123) will be assumed") ]
+	string PortInfo;
+
+	[Description ("An enumerated integer describing the protocol of the port "
+		"addressed by PortInformation."),
+		ValueMap { "1", "2", "3", "32768..65535" },
+		Values { "Other", "TCP", "UDP", "Vendor Specific" },
+		ModelCorrespondence { "CIM_RemotePort.OtherProtocolDescription"}]
+	uint16 PortProtocol = 2;
+
+	[ Description ("The Prefer property Marks the host as a preferred "
+		"time source. This host is not subject to preliminary filtering.") ]
+	boolean Prefer;
+
+	[ Description ("The Key property specifies that all packets sent to "
+		"the time source include authentication fields encrypted using the "
+		"specified key number. The value of Key is the range of an "
+		"unsigned 32 bit integer.") ]
+	uint32 Key;
+
+	[ Description(
+		"The NTPversion property specifies the version number to use for "
+		"outgoing NTP packets. The values for NTPversion can be 1 thru 4."),
+		ValueMap { "1", "2", "3", "4" } ]
+	uint32 NTPversion;
+
+	[ Description(
+		"The MinPoll property specifies the minimum poll interval allowed by "
+		"any peer of the Internet system. The minimum poll interval is "
+		"calculated, in seconds, as 2 to the power of minpoll value. "
+		"The default value of minpoll is 6, i.e. the corresponding poll "
+		"interval is 64 seconds.") ]
+	uint32 MinPoll;
+
+	[ Description(
+		"The MaxPoll property specifies the maximum poll interval allowed by "
+		"any peer of the Internet system. The maximum poll interval is "
+		"calculated, in seconds, as 2 to the power of maxpoll value. "
+		"The default value of maxpoll is 10, therefore the corresponding "
+		"poll interval is ~17 minutes.") ]
+	uint32 MaxPoll;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_ManagedElement
+//		CIM_SettingData
+// **		OMC_TimeZoneSettingData
+//
+[ Description("OMC_TimeZoneSettingData represents the "
+	"configuration of the system time zone.") ]
+class OMC_TimeZoneSettingData : CIM_SettingData
+{
+	[ Key, Description(
+		"InstanceID is the key field inherited from CIM_SettingData. "
+		"Since there is only one instance of this class, the key "
+		"value is 'OMC:SUSE:TIMEZONE'") ]
+	string InstanceID;
+
+	[ Required(true), Description("The time zone"),
+		Write(true) ]
+	string TimeZone;
+
+	[ Description("If the value of UTCHardwareClock is set to true, "
+		" then the hardware clock is set to UTC. Otherwise the "
+		" hardware clock is set to local time."),
+		Write(true) ]
+	boolean UTCHardwareClock = true;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_Dependency
+//		CIM_HostedDependency
+//			CIM_HostedService
+// **			OMC_HostedTimeService
+//
+[ Association,
+	Description("OMC_HostedTimeService associates the time service "
+	"to the computer system") ]
+class OMC_HostedTimeService : CIM_HostedService
+{
+	[ Override("Antecedent"), Min(1), Max(1),
+		Description("The hosting computer system") ]
+	OMC_UnitaryComputerSystem REF Antecedent;
+
+	[ Override("Dependent"), Weak,
+		Description("The hosted system time service") ]
+	OMC_SystemTimeService REF Dependent;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_Dependency
+//		CIM_ServiceAccessBySAP
+// **		OMC_TimeServiceAccessBySAP
+//
+[ Association,
+	Description("OMC_TimeServiceAccessBySAP is an association "
+	"that identifies the configuration for NTP access for the "
+	"time service") ]
+class OMC_TimeServiceAccessBySAP : CIM_ServiceAccessBySAP
+{
+	[ Override("Antecedent"),
+		Description("The time service") ]
+	OMC_SystemTimeService REF Antecedent;
+
+	[ Override("Dependent"),
+		Description("Access point for the time service") ]
+	OMC_RemoteTimeServicePort REF Dependent;
+};
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_ElementSettingData
+// **	OMC_TimeServiceTimeZoneSettingData
+//
+[ Association,
+	Description("OMC_TimeServiceTimeZoneSettingData associates the time "
+	"service with the time zone configuration") ]
+class OMC_TimeServiceTimeZoneSettingData : CIM_ElementSettingData
+{
+	[ Override("ManagedElement") ]
+	OMC_SystemTimeService REF ManagedElement;
+
+	[ Override("SettingData") ]
+	OMC_TimeZoneSettingData REF SettingData;
+};
+
+
+//////////////////////////////////////////////////////////////////////////////
+//	CIM_ServiceAvailableToElement
+//		OMC_TimeServiceAvailableToElement
+//
+[ Association,
+    Description("OMC_TimeServiceAvailableToElement indicates that this time "
+    "service is available for the use of the managed element") ]
+class OMC_TimeServiceAvailableToElement : CIM_ServiceAvailableToElement
+{
+	[ Override("ServiceProvided") ]
+	OMC_TimeService REF ServiceProvided;
+
+	[ Override("UserOfService") ]
+	CIM_ManagedElement REF UserOfService;
+};
+

Added: cmpibase/trunk/mof/reg/computer-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/computer-system-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/reg/computer-system-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,85 @@
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_CS_HostNameSettingData_Module";
+   Location = "omccmpi_cshostnamesettingdata";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_HostNameSettingData_Module";
+   Location = "omccmpi_hostnamesettingdata";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_UnitaryComputerSystem_Module";
+   Location = "omccmpi_computer_system";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_CS_HostNameSettingData_Provider";
+   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_HostNameSettingData_Provider";
+   ProviderModuleName = "OMC_HostNameSettingData_Module";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_UnitaryComputerSystem_Provider";
+   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_UnitaryComputerSystem_Module";
+   ProviderName = "OMC_UnitaryComputerSystem_Provider";
+   ClassName = "OMC_UnitaryComputerSystem";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_UnitaryComputerSystem-1";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_HostNameSettingData_Module";
+   ProviderName = "OMC_HostNameSettingData_Provider";
+   ClassName = "OMC_HostNameSettingData";
+   ProviderType = { 2, 5 };	// Instance, Method
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_HostNameSettingData-2";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_CS_HostNameSettingData_Module";
+   ProviderName = "OMC_CS_HostNameSettingData_Provider";
+   ClassName = "OMC_ComputerSystemHostNameSettingData";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_ComputerSystemHostNameSettingData-3";
+};
+

Added: cmpibase/trunk/mof/reg/logical-file-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/logical-file-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/reg/logical-file-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,134 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxLogicalFile_Module";
+	Location = "CIM_LogicalFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxLogicalFile_Provider";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "OMC_LinuxLogicalFile_Provider";
+    ClassName = "OMC_LinuxDataFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,5}; // Instance, Method
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0002";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "OMC_LinuxLogicalFile_Provider";
+    ClassName = "OMC_LinuxDeviceFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0003";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "OMC_LinuxLogicalFile_Provider";
+    ClassName = "OMC_LinuxSymbolicLink";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0004";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "OMC_LinuxLogicalFile_Provider";
+    ClassName = "OMC_LinuxDirectory";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxLogicalFile_Capability0005";
+	ProviderModuleName = "OMC_LinuxLogicalFile_Module";
+	ProviderName = "OMC_LinuxLogicalFile_Provider";
+    ClassName = "OMC_LinuxFIFOPipeFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxFile_Module";
+	Location = "OMC_LinuxFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxFile_Provider";
+	ProviderModuleName = "OMC_LinuxFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+    CapabilityID = "OMC_LinuxFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxFile_Module";
+	ProviderName = "OMC_LinuxFile_Provider";
+    ClassName = "OMC_LinuxFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2}; // Instance
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxDirectoryContainsFile_Module";
+	Location = "OMC_LinuxDirectoryContainsFile_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxDirectoryContainsFile_Provider";
+	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
+};
+instance of PG_ProviderCapabilities
+{
+	CapabilityID = "OMC_LinuxDirectoryContainsFile_Capability0001";
+	ProviderModuleName = "OMC_LinuxDirectoryContainsFile_Module";
+	ProviderName = "OMC_LinuxDirectoryContainsFile_Provider";
+    ClassName = "OMC_LinuxDirectoryContainsFile";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,3}; // Instance, Associator
+};
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_LinuxFileIdentity_Module";
+	Location = "OMC_LinuxFileIdentity_Provider";
+	Vendor = "OMC";
+	Version = "2.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+}; 
+instance of PG_Provider
+{
+	Name = "OMC_LinuxFileIdentity_Provider";
+	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
+};
+instance of PG_ProviderCapabilities
+{
+	CapabilityID = "OMC_LinuxFileIdentity_Capability0001";
+	ProviderModuleName = "OMC_LinuxFileIdentity_Module";
+	ProviderName = "OMC_LinuxFileIdentity_Provider";
+    ClassName = "OMC_LinuxFileIdentity";
+    Namespaces = {"root/cimv2"};
+    ProviderType = {2,3}; // Instance, Associator
+};
+

Added: cmpibase/trunk/mof/reg/operating-system-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/operating-system-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/reg/operating-system-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,86 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_OperatingSystemProviderModule";
+	Location = "OMC_LinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_OperatingSystemProviderModule";
+	Name = "OMC_LinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_OperatingSystemProviderModule";
+	ProviderName = "OMC_LinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_OperatingSystem";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 5 }; // Instance, Method
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_RunningLinuxOSProviderModule";
+	Location = "OMC_RunningLinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
+	Name = "OMC_RunningLinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_RunningLinuxOSProviderModule";
+	ProviderName = "OMC_RunningLinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_RunningOS";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Associator
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+
+instance of PG_ProviderModule
+{
+	Name = "OMC_InstalledLinuxOSProviderModule";
+	Location = "OMC_InstalledLinuxOS";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
+	Name = "OMC_InstalledLinuxOS";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_InstalledLinuxOSProviderModule";
+	ProviderName = "OMC_InstalledLinuxOS";
+	CapabilityID = "1";
+	ClassName = "OMC_InstalledOS";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Associator
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;	// All Methods
+};
+
+

Added: cmpibase/trunk/mof/reg/processes-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/processes-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/reg/processes-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,40 @@
+instance of PG_ProviderModule
+{
+	Name = "OMC_UnixProcessProviderModule";
+	Location = "OMC_UnixProcess";
+	Vendor = "OMC";
+	Version = "1.0.0";
+	InterfaceType = "CMPI";
+	InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	Name = "OMC_UnixProcess";
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	ProviderName = "OMC_UnixProcess";
+	CapabilityID = "1";
+	ClassName = "OMC_UnixProcess";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 5 }; // Instance, Method
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL; // All methods
+};
+
+instance of PG_ProviderCapabilities
+{
+	ProviderModuleName = "OMC_UnixProcessProviderModule";
+	ProviderName = "OMC_UnixProcess";
+	CapabilityID = "2";
+	ClassName = "OMC_OSProcess";
+	Namespaces = {"root/cimv2"};
+	ProviderType = { 2, 3 }; // Instance, Association
+	SupportedProperties = NULL; // All properties
+	SupportedMethods = NULL;
+};
+

Added: cmpibase/trunk/mof/reg/time-service-peg.reg
===================================================================
--- cmpibase/trunk/mof/reg/time-service-peg.reg	                        (rev 0)
+++ cmpibase/trunk/mof/reg/time-service-peg.reg	2008-04-22 22:00:14 UTC (rev 573)
@@ -0,0 +1,215 @@
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_SystemTimeService_Module";
+   Location = "omccmpi_systemTimeService";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_SystemTimeService_Provider";
+   ProviderModuleName = "OMC_SystemTimeService_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_SystemTimeService_Module";
+   ProviderName = "OMC_SystemTimeService_Provider";
+   ClassName = "OMC_SystemTimeService";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_SystemTimeService-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_RemoteTimeServicePort_Module";
+   Location = "omccmpi_remoteTimeServicePort";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_RemoteTimeServicePort_Provider";
+   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_RemoteTimeServicePort_Module";
+   ProviderName = "OMC_RemoteTimeServicePort_Provider";
+   ClassName = "OMC_RemoteTimeServicePort";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_RemoteTimeServicePort-2";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeZoneSettingData_Module";
+   Location = "omccmpi_timeZoneSettingData";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeZoneSettingData_Provider";
+   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeZoneSettingData_Module";
+   ProviderName = "OMC_TimeZoneSettingData_Provider";
+   ClassName = "OMC_TimeZoneSettingData";
+   ProviderType = { 2 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeZoneSettingData-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_HostedTimeService_Module";
+   Location = "omccmpi_hostedTimeService";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_HostedTimeService_Provider";
+   ProviderModuleName = "OMC_HostedTimeService_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_HostedTimeService_Module";
+   ProviderName = "OMC_HostedTimeService_Provider";
+   ClassName = "OMC_HostedTimeService";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_HostedTimeService-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceTimeZoneSettingData_Module";
+   Location = "omccmpi_timeServiceTimeZoneSettingData";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceTimeZoneSettingData_Provider";
+   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceTimeZoneSettingData_Module";
+   ProviderName = "OMC_TimeServiceTimeZoneSettingData_Provider";
+   ClassName = "OMC_TimeServiceTimeZoneSettingData";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceTimeZoneSettingData-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceAccessBySAP_Module";
+   Location = "omccmpi_timeServiceAccessBySAP";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceAccessBySAP_Provider";
+   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module";
+   ProviderName = "OMC_TimeServiceAccessBySAP_Provider";
+   ClassName = "OMC_TimeServiceAccessBySAP";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceAccessBySAP-1";
+};
+
+
+
+
+instance of PG_ProviderModule
+{
+   Name = "OMC_TimeServiceAvailableToElement_Module";
+   Location = "omccmpi_timeServiceAvailableToElement";
+   Vendor = "OMC";
+   Version = "2.0.0";
+   InterfaceType = "CMPI";
+   InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+   Name = "OMC_TimeServiceAvailableToElement_Provider";
+   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
+};
+
+instance of PG_ProviderCapabilities
+{
+   ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module";
+   ProviderName = "OMC_TimeServiceAvailableToElement_Provider";
+   ClassName = "OMC_TimeServiceAvailableToElement";
+   ProviderType = { 2, 3 };
+   Namespaces = {"root/cimv2"};
+   SupportedProperties = NULL;
+   SupportedMethods = NULL;
+   CapabilityID = "OMC_TimeServiceAvailableToElement-1";
+};
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [572] cmpibase/trunk/src/providers/logical-file

From: <ba...@us...> - 2008-04-22 20:08:41

Revision: 572
          http://omc.svn.sourceforge.net/omc/?rev=572&view=rev
Author:   bartw
Date:     2008-04-22 13:08:13 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
updated for newer version of cimple

Modified Paths:
--------------
    cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp
    cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h
    cmpibase/trunk/src/providers/logical-file/Makefile.am
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.h
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.cpp
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.h
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.cpp
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.h
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.h
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.cpp
    cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.h
    cmpibase/trunk/src/providers/logical-file/schema/repository.cpp
    cmpibase/trunk/src/providers/logical-file/schema/repository.h

Modified: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -101,7 +101,7 @@
 }
 
 Create_Instance_Status CIM_LogicalFile_Provider::create_instance(
-    const CIM_LogicalFile* instance)
+    CIM_LogicalFile* instance)
 {
     return CREATE_INSTANCE_UNSUPPORTED;
 }
@@ -113,6 +113,7 @@
 }
 
 Modify_Instance_Status CIM_LogicalFile_Provider::modify_instance(
+    const CIM_LogicalFile* model,
     const CIM_LogicalFile* instance)
 {
     return MODIFY_INSTANCE_UNSUPPORTED;

Modified: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -29,13 +29,14 @@
 	Enum_Instances_Handler<CIM_LogicalFile>* handler);
 
     Create_Instance_Status create_instance(
-	const CIM_LogicalFile* instance);
+        CIM_LogicalFile* instance);
 
     Delete_Instance_Status delete_instance(
 	const CIM_LogicalFile* instance);
 
     Modify_Instance_Status modify_instance(
-	const CIM_LogicalFile* instance);
+        const CIM_LogicalFile* model,
+        const CIM_LogicalFile* instance);
 
     static int proc(
 	const Registration* registration,

Modified: cmpibase/trunk/src/providers/logical-file/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/logical-file/Makefile.am	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/Makefile.am	2008-04-22 20:08:13 UTC (rev 572)
@@ -64,14 +64,10 @@
 CIM_LogicalFile_Provider.h	\
 CIM_LogicalFile_Provider_module.cpp
 
-stubs : classes
+stubs : 
 	export CIMPLE_MOF_PATH=/usr/share/mof/cim-current && \
-	genprov -M omc-logical-file.mof -m CIM_LogicalFile && \
-	mv module.cpp CIM_LogicalFile_Provider_module.cpp && \
-	genprov -M omc-logical-file.mof -m OMC_LinuxDirectoryContainsFile && \
-	mv module.cpp OMC_LinuxDirectoryContainsFile_Provider_module.cpp && \
-	genprov -M omc-logical-file.mof -m OMC_LinuxFileIdentity && \
-	mv module.cpp OMC_LinuxFileIdentity_Provider_module.cpp && \
-	genprov -M omc-logical-file.mof -m OMC_LinuxFile && \
-	mv module.cpp OMC_LinuxFile_Provider_module.cpp 
+	genprov -M omc-logical-file.mof CIM_LogicalFile && \
+	genprov -M omc-logical-file.mof OMC_LinuxDirectoryContainsFile && \
+	genprov -M omc-logical-file.mof OMC_LinuxFileIdentity && \
+	genprov -M omc-logical-file.mof OMC_LinuxFile 
 	

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -80,7 +80,7 @@
 }
 
 Create_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::create_instance(
-    const OMC_LinuxDirectoryContainsFile* instance)
+    OMC_LinuxDirectoryContainsFile* instance)
 {
     return CREATE_INSTANCE_UNSUPPORTED;
 }
@@ -92,6 +92,7 @@
 }
 
 Modify_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::modify_instance(
+    const OMC_LinuxDirectoryContainsFile* model,
     const OMC_LinuxDirectoryContainsFile* instance)
 {
     return MODIFY_INSTANCE_UNSUPPORTED;
@@ -255,4 +256,16 @@
 	operation, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
 
+Enum_Associators_Status OMC_LinuxDirectoryContainsFile_Provider::enum_associators(
+    const Instance* instance,
+    const String& result_class,
+    const String& role,
+    const String& result_role,
+    Enum_Associators_Handler<Instance>* handler)
+{
+    return ENUM_ASSOCIATORS_UNSUPPORTED;
+}
+
+/*@END@*/
+
 CIMPLE_NAMESPACE_END

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -29,13 +29,14 @@
 	Enum_Instances_Handler<OMC_LinuxDirectoryContainsFile>* handler);
 
     Create_Instance_Status create_instance(
-	const OMC_LinuxDirectoryContainsFile* instance);
+        OMC_LinuxDirectoryContainsFile* instance);
 
     Delete_Instance_Status delete_instance(
 	const OMC_LinuxDirectoryContainsFile* instance);
 
     Modify_Instance_Status modify_instance(
-	const OMC_LinuxDirectoryContainsFile* instance);
+        const OMC_LinuxDirectoryContainsFile* model,
+        const OMC_LinuxDirectoryContainsFile* instance);
 
     Enum_Associator_Names_Status enum_associator_names(
 	const Instance* instance,
@@ -50,6 +51,15 @@
 	const String& role,
 	Enum_References_Handler<OMC_LinuxDirectoryContainsFile>* handler);
 
+	Enum_Associators_Status enum_associators(
+        const Instance* instance,
+        const String& result_class,
+        const String& role,
+        const String& result_role,
+        Enum_Associators_Handler<Instance>* handler);
+    /*@END@*/
+
+
     static int proc(
 	const Registration* registration,
 	int operation, 
@@ -63,6 +73,7 @@
 	void* arg7);
 };
 
+
 CIMPLE_NAMESPACE_END
 
 #endif /* _OMC_LinuxDirectoryContainsFile_Provider_h */

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -75,7 +75,7 @@
 }
 
 Create_Instance_Status OMC_LinuxFileIdentity_Provider::create_instance(
-    const OMC_LinuxFileIdentity* instance)
+    OMC_LinuxFileIdentity* instance)
 {
     return CREATE_INSTANCE_UNSUPPORTED;
 }
@@ -87,6 +87,7 @@
 }
 
 Modify_Instance_Status OMC_LinuxFileIdentity_Provider::modify_instance(
+    const OMC_LinuxFileIdentity* model,
     const OMC_LinuxFileIdentity* instance)
 {
     return MODIFY_INSTANCE_UNSUPPORTED;
@@ -259,4 +260,16 @@
 	operation, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
 
+    Enum_Associators_Status OMC_LinuxFileIdentity_Provider::enum_associators(
+    const Instance* instance,
+    const String& result_class,
+    const String& role,
+    const String& result_role,
+    Enum_Associators_Handler<Instance>* handler)
+{
+    return ENUM_ASSOCIATORS_UNSUPPORTED;
+}
+
+/*@END@*/
+
 CIMPLE_NAMESPACE_END

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -29,13 +29,14 @@
 	Enum_Instances_Handler<OMC_LinuxFileIdentity>* handler);
 
     Create_Instance_Status create_instance(
-	const OMC_LinuxFileIdentity* instance);
+        OMC_LinuxFileIdentity* instance);
 
     Delete_Instance_Status delete_instance(
 	const OMC_LinuxFileIdentity* instance);
 
     Modify_Instance_Status modify_instance(
-	const OMC_LinuxFileIdentity* instance);
+        const OMC_LinuxFileIdentity* model,
+        const OMC_LinuxFileIdentity* instance);
 
     Enum_Associator_Names_Status enum_associator_names(
 	const Instance* instance,
@@ -49,7 +50,16 @@
 	const OMC_LinuxFileIdentity* model,
 	const String& role,
 	Enum_References_Handler<OMC_LinuxFileIdentity>* handler);
+	 
+	Enum_Associators_Status enum_associators(
+        const Instance* instance,
+        const String& result_class,
+        const String& role,
+        const String& result_role,
+        Enum_Associators_Handler<Instance>* handler);
 
+    /*@END@*/
+
     static int proc(
 	const Registration* registration,
 	int operation, 

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -113,7 +113,7 @@
 }
 
 Create_Instance_Status OMC_LinuxFile_Provider::create_instance(
-    const OMC_LinuxFile* instance)
+    OMC_LinuxFile* instance)
 {
     return CREATE_INSTANCE_UNSUPPORTED;
 }
@@ -125,6 +125,7 @@
 }
 
 Modify_Instance_Status OMC_LinuxFile_Provider::modify_instance(
+    const OMC_LinuxFile* model,
     const OMC_LinuxFile* instance)
 {
     struct stat st; 

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -29,13 +29,14 @@
 	Enum_Instances_Handler<OMC_LinuxFile>* handler);
 
     Create_Instance_Status create_instance(
-	const OMC_LinuxFile* instance);
+        OMC_LinuxFile* instance);
 
     Delete_Instance_Status delete_instance(
 	const OMC_LinuxFile* instance);
 
     Modify_Instance_Status modify_instance(
-	const OMC_LinuxFile* instance);
+        const OMC_LinuxFile* model,
+        const OMC_LinuxFile* instance);
 
     static int proc(
 	const Registration* registration,

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,15 +14,17 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_Component_GroupComponent;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_Component_GroupComponent =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY|CIMPLE_FLAG_AGGREGATE,
     "GroupComponent",
     0, /* meta_qualifiers */
@@ -32,13 +34,15 @@
     CIMPLE_OFF(CIM_Component,GroupComponent)
 };
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_Component_PartComponent;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_Component_PartComponent =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY,
     "PartComponent",
     0, /* meta_qualifiers */
@@ -48,21 +52,24 @@
     CIMPLE_OFF(CIM_Component,PartComponent)
 };
 
+/*[2026]*/
 static Meta_Feature* _CIM_Component_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_Component_GroupComponent,
     (Meta_Feature*)(void*)&_CIM_Component_PartComponent,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {1},
     {1},
 };
 
+/*[2093]*/
 const Meta_Class CIM_Component::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_ASSOCIATION|CIMPLE_FLAG_ABSTRACT|CIMPLE_FLAG_AGGREGATION,
     "CIM_Component",
     0, /* meta_qualifiers */
@@ -73,10 +80,8 @@
     _locals,
     0, /* super_class */ 
     2, /* num_keys */
-    0xD1D41B62, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,6 +14,9 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_Component keys:
+
+/*[929]*/
 class CIM_Component : public Instance
 {
 public:

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,80 +14,121 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Caption;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Description;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_ElementName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_InstallDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Name;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_OperationalStatus;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_StatusDescriptions;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_Status;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_HealthState;
 
+/*[1303]*/
 extern const Meta_Property
+_CIM_ManagedSystemElement_PrimaryStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_DetailedStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_OperatingStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_CommunicationStatus;
+
+/*[1303]*/
+extern const Meta_Property
 _CIM_LogicalFile_CSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FileSize;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastModified;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastAccessed;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Readable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Writeable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Executable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CompressionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_EncryptionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_InUseCount;
 
+/*[2026]*/
 static Meta_Feature* _CIM_DataFile_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption,
@@ -99,6 +140,10 @@
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_PrimaryStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_DetailedStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperatingStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_CommunicationStatus,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName,
@@ -116,6 +161,7 @@
     (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {0},
@@ -142,11 +188,16 @@
     {0},
     {0},
     {0},
+    {0},
+    {0},
+    {0},
+    {0},
 };
 
+/*[2093]*/
 const Meta_Class CIM_DataFile::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_CLASS,
     "CIM_DataFile",
     0, /* meta_qualifiers */
@@ -157,10 +208,8 @@
     _locals,
     &CIM_LogicalFile::static_meta_class,
     6, /* num_keys */
-    0xCE1F7591, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -13,6 +13,15 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_DataFile keys:
+//     Name
+//     CSCreationClassName
+//     CSName
+//     FSCreationClassName
+//     FSName
+//     CreationClassName
+
+/*[929]*/
 class CIM_DataFile : public Instance
 {
 public:
@@ -73,15 +82,91 @@
         uint8 null;
     }
     HealthState;
+    struct _PrimaryStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_OK = 1,
+            enum_Degraded = 2,
+            enum_Error = 3,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    PrimaryStatus;
+    struct _DetailedStatus
+    {
+        enum
+        {
+            enum_Not_Available = 0,
+            enum_No_Additional_Information = 1,
+            enum_Stressed = 2,
+            enum_Predictive_Failure = 3,
+            enum_Non_Recoverable_Error = 4,
+            enum_Supporting_Entity_in_Error = 5,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    DetailedStatus;
+    struct _OperatingStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Servicing = 2,
+            enum_Starting = 3,
+            enum_Stopping = 4,
+            enum_Stopped = 5,
+            enum_Aborted = 6,
+            enum_Dormant = 7,
+            enum_Completed = 8,
+            enum_Migrating = 9,
+            enum_Emigrating = 10,
+            enum_Immigrating = 11,
+            enum_Snapshotting = 12,
+            enum_Shutting_Down = 13,
+            enum_In_Test = 14,
+            enum_Transitioning = 15,
+            enum_In_Service = 16,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    OperatingStatus;
+    struct _CommunicationStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Communication_OK = 2,
+            enum_Lost_Communication = 3,
+            enum_No_Contact = 4,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    CommunicationStatus;
 
     // CIM_LogicalElement features:
 
     // CIM_LogicalFile features:
-    Property<String> CSCreationClassName; // KEY
-    Property<String> CSName; // KEY
-    Property<String> FSCreationClassName; // KEY
-    Property<String> FSName; // KEY
-    Property<String> CreationClassName; // KEY
+    Property<String> CSCreationClassName;
+    Property<String> CSName;
+    Property<String> FSCreationClassName;
+    Property<String> FSName;
+    Property<String> CreationClassName;
     Property<uint64> FileSize;
     Property<Datetime> CreationDate;
     Property<Datetime> LastModified;

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,80 +14,121 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Caption;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Description;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_ElementName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_InstallDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Name;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_OperationalStatus;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_StatusDescriptions;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_Status;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_HealthState;
 
+/*[1303]*/
 extern const Meta_Property
+_CIM_ManagedSystemElement_PrimaryStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_DetailedStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_OperatingStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_CommunicationStatus;
+
+/*[1303]*/
+extern const Meta_Property
 _CIM_LogicalFile_CSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FileSize;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastModified;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastAccessed;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Readable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Writeable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Executable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CompressionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_EncryptionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_InUseCount;
 
+/*[2026]*/
 static Meta_Feature* _CIM_DeviceFile_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption,
@@ -99,6 +140,10 @@
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_PrimaryStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_DetailedStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperatingStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_CommunicationStatus,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName,
@@ -116,6 +161,7 @@
     (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {0},
@@ -142,11 +188,16 @@
     {0},
     {0},
     {0},
+    {0},
+    {0},
+    {0},
+    {0},
 };
 
+/*[2093]*/
 const Meta_Class CIM_DeviceFile::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_CLASS,
     "CIM_DeviceFile",
     0, /* meta_qualifiers */
@@ -157,10 +208,8 @@
     _locals,
     &CIM_LogicalFile::static_meta_class,
     6, /* num_keys */
-    0xB3825686, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -13,6 +13,15 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_DeviceFile keys:
+//     Name
+//     CSCreationClassName
+//     CSName
+//     FSCreationClassName
+//     FSName
+//     CreationClassName
+
+/*[929]*/
 class CIM_DeviceFile : public Instance
 {
 public:
@@ -73,15 +82,91 @@
         uint8 null;
     }
     HealthState;
+    struct _PrimaryStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_OK = 1,
+            enum_Degraded = 2,
+            enum_Error = 3,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    PrimaryStatus;
+    struct _DetailedStatus
+    {
+        enum
+        {
+            enum_Not_Available = 0,
+            enum_No_Additional_Information = 1,
+            enum_Stressed = 2,
+            enum_Predictive_Failure = 3,
+            enum_Non_Recoverable_Error = 4,
+            enum_Supporting_Entity_in_Error = 5,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    DetailedStatus;
+    struct _OperatingStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Servicing = 2,
+            enum_Starting = 3,
+            enum_Stopping = 4,
+            enum_Stopped = 5,
+            enum_Aborted = 6,
+            enum_Dormant = 7,
+            enum_Completed = 8,
+            enum_Migrating = 9,
+            enum_Emigrating = 10,
+            enum_Immigrating = 11,
+            enum_Snapshotting = 12,
+            enum_Shutting_Down = 13,
+            enum_In_Test = 14,
+            enum_Transitioning = 15,
+            enum_In_Service = 16,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    OperatingStatus;
+    struct _CommunicationStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Communication_OK = 2,
+            enum_Lost_Communication = 3,
+            enum_No_Contact = 4,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    CommunicationStatus;
 
     // CIM_LogicalElement features:
 
     // CIM_LogicalFile features:
-    Property<String> CSCreationClassName; // KEY
-    Property<String> CSName; // KEY
-    Property<String> FSCreationClassName; // KEY
-    Property<String> FSName; // KEY
-    Property<String> CreationClassName; // KEY
+    Property<String> CSCreationClassName;
+    Property<String> CSName;
+    Property<String> FSCreationClassName;
+    Property<String> FSName;
+    Property<String> CreationClassName;
     Property<uint64> FileSize;
     Property<Datetime> CreationDate;
     Property<Datetime> LastModified;

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,80 +14,121 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Caption;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Description;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_ElementName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_InstallDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Name;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_OperationalStatus;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_StatusDescriptions;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_Status;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_HealthState;
 
+/*[1303]*/
 extern const Meta_Property
+_CIM_ManagedSystemElement_PrimaryStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_DetailedStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_OperatingStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_CommunicationStatus;
+
+/*[1303]*/
+extern const Meta_Property
 _CIM_LogicalFile_CSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FileSize;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastModified;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastAccessed;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Readable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Writeable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Executable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CompressionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_EncryptionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_InUseCount;
 
+/*[2026]*/
 static Meta_Feature* _CIM_Directory_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption,
@@ -99,6 +140,10 @@
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_PrimaryStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_DetailedStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperatingStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_CommunicationStatus,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName,
@@ -116,6 +161,7 @@
     (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {0},
@@ -142,11 +188,16 @@
     {0},
     {0},
     {0},
+    {0},
+    {0},
+    {0},
+    {0},
 };
 
+/*[2093]*/
 const Meta_Class CIM_Directory::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_CLASS,
     "CIM_Directory",
     0, /* meta_qualifiers */
@@ -157,10 +208,8 @@
     _locals,
     &CIM_LogicalFile::static_meta_class,
     6, /* num_keys */
-    0x771AB4F7, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -13,6 +13,15 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_Directory keys:
+//     Name
+//     CSCreationClassName
+//     CSName
+//     FSCreationClassName
+//     FSName
+//     CreationClassName
+
+/*[929]*/
 class CIM_Directory : public Instance
 {
 public:
@@ -73,15 +82,91 @@
         uint8 null;
     }
     HealthState;
+    struct _PrimaryStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_OK = 1,
+            enum_Degraded = 2,
+            enum_Error = 3,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    PrimaryStatus;
+    struct _DetailedStatus
+    {
+        enum
+        {
+            enum_Not_Available = 0,
+            enum_No_Additional_Information = 1,
+            enum_Stressed = 2,
+            enum_Predictive_Failure = 3,
+            enum_Non_Recoverable_Error = 4,
+            enum_Supporting_Entity_in_Error = 5,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    DetailedStatus;
+    struct _OperatingStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Servicing = 2,
+            enum_Starting = 3,
+            enum_Stopping = 4,
+            enum_Stopped = 5,
+            enum_Aborted = 6,
+            enum_Dormant = 7,
+            enum_Completed = 8,
+            enum_Migrating = 9,
+            enum_Emigrating = 10,
+            enum_Immigrating = 11,
+            enum_Snapshotting = 12,
+            enum_Shutting_Down = 13,
+            enum_In_Test = 14,
+            enum_Transitioning = 15,
+            enum_In_Service = 16,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    OperatingStatus;
+    struct _CommunicationStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Communication_OK = 2,
+            enum_Lost_Communication = 3,
+            enum_No_Contact = 4,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    CommunicationStatus;
 
     // CIM_LogicalElement features:
 
     // CIM_LogicalFile features:
-    Property<String> CSCreationClassName; // KEY
-    Property<String> CSName; // KEY
-    Property<String> FSCreationClassName; // KEY
-    Property<String> FSName; // KEY
-    Property<String> CreationClassName; // KEY
+    Property<String> CSCreationClassName;
+    Property<String> CSName;
+    Property<String> FSCreationClassName;
+    Property<String> FSName;
+    Property<String> CreationClassName;
     Property<uint64> FileSize;
     Property<Datetime> CreationDate;
     Property<Datetime> LastModified;

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,15 +14,17 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_DirectoryContainsFile_GroupComponent;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_DirectoryContainsFile_GroupComponent =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY|CIMPLE_FLAG_AGGREGATE,
     "GroupComponent",
     0, /* meta_qualifiers */
@@ -32,13 +34,15 @@
     CIMPLE_OFF(CIM_DirectoryContainsFile,GroupComponent)
 };
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_DirectoryContainsFile_PartComponent;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_DirectoryContainsFile_PartComponent =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY,
     "PartComponent",
     0, /* meta_qualifiers */
@@ -48,21 +52,24 @@
     CIMPLE_OFF(CIM_DirectoryContainsFile,PartComponent)
 };
 
+/*[2026]*/
 static Meta_Feature* _CIM_DirectoryContainsFile_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_GroupComponent,
     (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_PartComponent,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {1},
     {1},
 };
 
+/*[2093]*/
 const Meta_Class CIM_DirectoryContainsFile::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_ASSOCIATION|CIMPLE_FLAG_AGGREGATION,
     "CIM_DirectoryContainsFile",
     0, /* meta_qualifiers */
@@ -73,10 +80,8 @@
     _locals,
     &CIM_Component::static_meta_class,
     2, /* num_keys */
-    0xB7798F04, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -15,6 +15,9 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_DirectoryContainsFile keys:
+
+/*[929]*/
 class CIM_DirectoryContainsFile : public Instance
 {
 public:

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,80 +14,121 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Caption;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Description;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_ElementName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_InstallDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Name;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_OperationalStatus;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_StatusDescriptions;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_Status;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedSystemElement_HealthState;
 
+/*[1303]*/
 extern const Meta_Property
+_CIM_ManagedSystemElement_PrimaryStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_DetailedStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_OperatingStatus;
+
+/*[1303]*/
+extern const Meta_Property
+_CIM_ManagedSystemElement_CommunicationStatus;
+
+/*[1303]*/
+extern const Meta_Property
 _CIM_LogicalFile_CSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSCreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FSName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationClassName;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_FileSize;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CreationDate;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastModified;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_LastAccessed;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Readable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Writeable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_Executable;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_CompressionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_EncryptionMethod;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_LogicalFile_InUseCount;
 
+/*[2026]*/
 static Meta_Feature* _CIM_FIFOPipeFile_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption,
@@ -99,6 +140,10 @@
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status,
     (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_PrimaryStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_DetailedStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperatingStatus,
+    (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_CommunicationStatus,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName,
     (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName,
@@ -116,6 +161,7 @@
     (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {0},
@@ -142,11 +188,16 @@
     {0},
     {0},
     {0},
+    {0},
+    {0},
+    {0},
+    {0},
 };
 
+/*[2093]*/
 const Meta_Class CIM_FIFOPipeFile::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_CLASS,
     "CIM_FIFOPipeFile",
     0, /* meta_qualifiers */
@@ -157,10 +208,8 @@
     _locals,
     &CIM_LogicalFile::static_meta_class,
     6, /* num_keys */
-    0x3E090D33, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -13,6 +13,15 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_FIFOPipeFile keys:
+//     Name
+//     CSCreationClassName
+//     CSName
+//     FSCreationClassName
+//     FSName
+//     CreationClassName
+
+/*[929]*/
 class CIM_FIFOPipeFile : public Instance
 {
 public:
@@ -73,15 +82,91 @@
         uint8 null;
     }
     HealthState;
+    struct _PrimaryStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_OK = 1,
+            enum_Degraded = 2,
+            enum_Error = 3,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    PrimaryStatus;
+    struct _DetailedStatus
+    {
+        enum
+        {
+            enum_Not_Available = 0,
+            enum_No_Additional_Information = 1,
+            enum_Stressed = 2,
+            enum_Predictive_Failure = 3,
+            enum_Non_Recoverable_Error = 4,
+            enum_Supporting_Entity_in_Error = 5,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    DetailedStatus;
+    struct _OperatingStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Servicing = 2,
+            enum_Starting = 3,
+            enum_Stopping = 4,
+            enum_Stopped = 5,
+            enum_Aborted = 6,
+            enum_Dormant = 7,
+            enum_Completed = 8,
+            enum_Migrating = 9,
+            enum_Emigrating = 10,
+            enum_Immigrating = 11,
+            enum_Snapshotting = 12,
+            enum_Shutting_Down = 13,
+            enum_In_Test = 14,
+            enum_Transitioning = 15,
+            enum_In_Service = 16,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    OperatingStatus;
+    struct _CommunicationStatus
+    {
+        enum
+        {
+            enum_Unknown = 0,
+            enum_Not_Available = 1,
+            enum_Communication_OK = 2,
+            enum_Lost_Communication = 3,
+            enum_No_Contact = 4,
+            enum_DMTF_Reserved = 0,
+            enum_Vendor_Reserved = 0,
+        };
+        uint16 value;
+        uint8 null;
+    }
+    CommunicationStatus;
 
     // CIM_LogicalElement features:
 
     // CIM_LogicalFile features:
-    Property<String> CSCreationClassName; // KEY
-    Property<String> CSName; // KEY
-    Property<String> FSCreationClassName; // KEY
-    Property<String> FSName; // KEY
-    Property<String> CreationClassName; // KEY
+    Property<String> CSCreationClassName;
+    Property<String> CSName;
+    Property<String> FSCreationClassName;
+    Property<String> FSName;
+    Property<String> CreationClassName;
     Property<uint64> FileSize;
     Property<Datetime> CreationDate;
     Property<Datetime> LastModified;

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,15 +14,17 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_FileIdentity_SystemElement;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_FileIdentity_SystemElement =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY,
     "SystemElement",
     0, /* meta_qualifiers */
@@ -32,13 +34,15 @@
     CIMPLE_OFF(CIM_FileIdentity,SystemElement)
 };
 
+/*[1388]*/
 extern const Meta_Reference
 _CIM_FileIdentity_SameElement;
 
+/*[1399]*/
 const Meta_Reference
 _CIM_FileIdentity_SameElement =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_REFERENCE|CIMPLE_FLAG_KEY|CIMPLE_FLAG_WEAK,
     "SameElement",
     0, /* meta_qualifiers */
@@ -48,21 +52,24 @@
     CIMPLE_OFF(CIM_FileIdentity,SameElement)
 };
 
+/*[2026]*/
 static Meta_Feature* _CIM_FileIdentity_MFA[] =
 {
     (Meta_Feature*)(void*)&_CIM_FileIdentity_SystemElement,
     (Meta_Feature*)(void*)&_CIM_FileIdentity_SameElement,
 };
 
+/*[2073]*/
 static const Meta_Feature_Local _locals[] =
 {
     {1},
     {1},
 };
 
+/*[2093]*/
 const Meta_Class CIM_FileIdentity::static_meta_class =
 {
-    { 0 }, /* refs */
+    CIMPLE_ATOMIC_INITIALIZER, /* refs */
     CIMPLE_FLAG_ASSOCIATION,
     "CIM_FileIdentity",
     0, /* meta_qualifiers */
@@ -73,10 +80,8 @@
     _locals,
     &CIM_LogicalIdentity::static_meta_class,
     2, /* num_keys */
-    0xFFB6B12C, /* crc */
-    &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C,
+    &__meta_repository_6DBE8D8F99A415F39CF37A24263E95F7,
 };
 
 CIMPLE_NAMESPACE_END
 
-CIMPLE_ID("$Header$");

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.h
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.h	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.h	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -15,6 +15,9 @@
 
 CIMPLE_NAMESPACE_BEGIN
 
+// CIM_FileIdentity keys:
+
+/*[929]*/
 class CIM_FileIdentity : public Instance
 {
 public:

Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp	2008-04-22 19:54:26 UTC (rev 571)
+++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp	2008-04-22 20:08:13 UTC (rev 572)
@@ -1,7 +1,7 @@
 /*NOCHKSRC*/
 //==============================================================================
 //
-// PLEASE DO NOT EDIT THIS FILE; IT WAS AUTOMATICALLY GENERATED BY GENCLASS.
+// PLEASE DO NOT EDIT; THIS FILE WAS AUTOMATICALLY GENERATED BY GENCLASS 1.2.0
 //
 //==============================================================================
 
@@ -14,35 +14,61 @@
 
 using namespace cimple;
 
-extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C;
+extern const Meta_Repository __meta_repository_6DBE8D8F99A415F39CF37A24263E95F7;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Caption;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_Description;
 
+/*[1303]*/
 extern const Meta_Property
 _CIM_ManagedElement_El...
 
[truncated message content]

[Omc-commit] SF.net SVN: omc: [571] cmpibase/trunk/src/providers

From: <jc...@us...> - 2008-04-22 19:55:19

Revision: 571
          http://omc.svn.sourceforge.net/omc/?rev=571&view=rev
Author:   jcarey
Date:     2008-04-22 12:54:26 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Fixed compiler warnings/some clean up

Modified Paths:
--------------
    cmpibase/trunk/src/providers/computer-system/computerSystem.c
    cmpibase/trunk/src/providers/computer-system/computerSystemHostNameSettingData.c
    cmpibase/trunk/src/providers/computer-system/hostNameSettingData.c
    cmpibase/trunk/src/providers/operating-system/LinuxInstalledOS.c
    cmpibase/trunk/src/providers/operating-system/LinuxOSProvider.c
    cmpibase/trunk/src/providers/operating-system/LinuxRunningOS.c
    cmpibase/trunk/src/providers/processes/LinuxProcessProvider.c
    cmpibase/trunk/src/providers/time-service/hostedTimeService.c
    cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c
    cmpibase/trunk/src/providers/time-service/systemTimeService.c
    cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c
    cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c
    cmpibase/trunk/src/providers/time-service/timeServiceTimeZoneSettingData.c
    cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c

Removed Paths:
-------------
    cmpibase/trunk/src/providers/samples/c/libomc_unitary_computer_system_provider.so

Property Changed:
----------------
    cmpibase/trunk/src/providers/time-service/

Modified: cmpibase/trunk/src/providers/computer-system/computerSystem.c
===================================================================
--- cmpibase/trunk/src/providers/computer-system/computerSystem.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/computer-system/computerSystem.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -104,7 +104,7 @@
 	DEBUGOUT("%s", "EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and check new object path
 	CMPIObjectPath * objectpath = CMNewObjectPath(_broker, ns, (char *)omcGetComputerSystemClassName(), &status);
@@ -146,7 +146,7 @@
 	DEBUGOUT("%s", "CreateCSInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	CMPIInstance * instance = CMNewInstance(_broker, CMNewObjectPath(_broker, ns, (char *)omcGetComputerSystemClassName(), &status), &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))

Modified: cmpibase/trunk/src/providers/computer-system/computerSystemHostNameSettingData.c
===================================================================
--- cmpibase/trunk/src/providers/computer-system/computerSystemHostNameSettingData.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/computer-system/computerSystemHostNameSettingData.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -86,7 +86,7 @@
 	DEBUGOUT("%s", "EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and populate cs object path
 	CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, &status);
@@ -153,7 +153,7 @@
 {
 	DEBUGOUT("%s", "CreateAssocInst() called\n");
 
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	//DEBUGOUT("%s", "About to create cs cop\n");
 	// Create and populate cs object path
@@ -262,7 +262,7 @@
 	DEBUGOUT("%s", "GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// do work here
 	CMPIData mekey = CMGetKey(cop, LEFT_PROPERTYNAME, &status);
@@ -515,11 +515,11 @@
 	DEBUGOUT("doReferences called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0)
 	{
-		char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 
 		if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0)
 		{
@@ -554,7 +554,7 @@
 				omcGetComputerSystemName(name, 128);
 
 				CMPIData data = CMGetKey(cop, "Name", &status);
-				char *inName = CMGetCharPtr(data.value.string);
+				char *inName = (char*) CMGetCharPtr(data.value.string);
 				//DEBUGOUT("Comparing inName: %s   with name: %s\n", inName, name);
 				if (strcasecmp(inName, name) == 0)
 				{
@@ -598,7 +598,7 @@
 			// need to get apppropriate UnitaryComputerSystem for assocInst
 
 			CMPIData data = CMGetKey(cop, "InstanceID", &status);
-			char *inName = CMGetCharPtr(data.value.string);
+			char *inName = (char*) CMGetCharPtr(data.value.string);
 			//DEBUGOUT("comparing inName (%s) with name (%s)\n",
 			//		inName,
 			//		"omc:computername");

Modified: cmpibase/trunk/src/providers/computer-system/hostNameSettingData.c
===================================================================
--- cmpibase/trunk/src/providers/computer-system/hostNameSettingData.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/computer-system/hostNameSettingData.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -310,7 +310,7 @@
 	DEBUGOUT("EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and check new object path
 	CMPIObjectPath * objectpath = CMNewObjectPath(_broker, ns, className, &status);
@@ -348,7 +348,7 @@
 	DEBUGOUT("CreateSettingDataInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	CMPIInstance * instance = CMNewInstance(_broker, CMNewObjectPath(_broker, ns, className, &status), &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
@@ -500,7 +500,7 @@
 			CMPIData newName = CMGetProperty(newinstance, "ComputerName", &status);
 			if (!CMIsNullValue(newName))
 			{
-				char *szNewHostName = CMGetCharPtr(newName.value.string);
+				char *szNewHostName = (char*)CMGetCharPtr(newName.value.string);
 				DEBUGOUT("newHostName: %s\n", szNewHostName);
 
 				// get current computer system name, to compare

Modified: cmpibase/trunk/src/providers/operating-system/LinuxInstalledOS.c
===================================================================
--- cmpibase/trunk/src/providers/operating-system/LinuxInstalledOS.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/operating-system/LinuxInstalledOS.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -75,14 +75,14 @@
         const char **properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("doReferences called\n");
 
 	if (strcasecmp(assocClass, "OMC_InstalledOS") == 0)
 	{
 		CMPIObjectPath *osOp, *csOp;
-		char *objsClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objsClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 		if(strcasecmp(objsClassName, "OMC_UnitaryComputerSystem") == 0)
 		{
 			if (role && *role && strcasecmp(role, "GroupComponent"))
@@ -188,7 +188,7 @@
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	CMPIObjectPath *osOp, *csOp, *assocOp;
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("EnumInstanceNames() called\n");
 
@@ -241,7 +241,7 @@
 	const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIObjectPath *osOp, *csOp;
 	CMPIInstance *instance;
 
@@ -296,7 +296,7 @@
 	const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIData grpComp, partComp;
 	CMPIObjectPath *osOp, *csOp;
 	CMPIInstance *instance;

Modified: cmpibase/trunk/src/providers/operating-system/LinuxOSProvider.c
===================================================================
--- cmpibase/trunk/src/providers/operating-system/LinuxOSProvider.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/operating-system/LinuxOSProvider.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -31,6 +31,7 @@
 ******************************************************************************/
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <time.h>
@@ -73,7 +74,7 @@
 /******************************************************************************
  Common CM helper function examples
   	Get Current Namespace
-		char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+		char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	Set Return Code with message
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, "Additional Error Message Here");
 	Create and check new object path
@@ -195,7 +196,7 @@
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	CMPIObjectPath* objectpath;
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	char hname[256];
 
 	DEBUGOUT("EnumInstanceNames() called\n");
@@ -239,7 +240,7 @@
 	const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIInstance* instance;
 
 	DEBUGOUT("EnumInstances() called\n");
@@ -247,7 +248,8 @@
 			_OSClassKeys, properties, &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
 	{
-		DEBUGOUT("EnumInstances(): CMNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("EnumInstances(): CMNewInstance() failed - %s\n",
+			(char*) CMGetCharPtr(status.msg));
 	}
 	else
 	{
@@ -284,7 +286,7 @@
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	const char* p;
 	char hname[256];
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("GetInstance() called\n");
 
@@ -296,11 +298,11 @@
 	key = CMGetKey(cop, "CSCreationClassName", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(key))
 	{
-		DEBUGOUT("GetInstance(): CMGetKey(\"CSCreationClassName\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"CSCreationClassName\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "CSCreationClassName missing");
 		return status;
 	}
-	p = CMGetCharPtr(key.value.string);
+	p = (char*) CMGetCharPtr(key.value.string);
 	if (strcasecmp(p, omcGetComputerSystemClassName()))
 	{
 		DEBUGOUT("GetInstance() Invalid computer system class name\n");
@@ -310,11 +312,11 @@
 	key = CMGetKey(cop, "CSName", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(key))
 	{
-		DEBUGOUT("GetInstance(): CMGetKey(\"CSName\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"CSName\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "CSName missing");
 		return status;
 	}
-	p = CMGetCharPtr(key.value.string);
+	p = (char*) CMGetCharPtr(key.value.string);
 	if (strcasecmp(p, hname))
 	{
 		DEBUGOUT("GetInstance() Invalid computer system name\n");
@@ -324,11 +326,11 @@
 	key = CMGetKey(cop, "CreationClassName", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(key))
 	{
-		DEBUGOUT("GetInstance(): CMGetKey(\"CreationClassName\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"CreationClassName\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "CreationClassName missing");
 		return status;
 	}
-	p = CMGetCharPtr(key.value.string);
+	p = (char*) CMGetCharPtr(key.value.string);
 	if (strcasecmp(p, omcGetOperatingSystemClassName()))
 	{
 		DEBUGOUT("GetInstance() Invalid computer system name\n");
@@ -338,11 +340,11 @@
 	key = CMGetKey(cop, "Name", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(key))
 	{
-		DEBUGOUT("GetInstance(): CMGetKey(\"Name\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"Name\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "Name missing");
 		return status;
 	}
-	p = CMGetCharPtr(key.value.string);
+	p = (char*) CMGetCharPtr(key.value.string);
 	if (strcasecmp(p, "Linux"))
 	{
 		DEBUGOUT("GetInstance() Invalid name\n");
@@ -353,7 +355,7 @@
 			_OSClassKeys, properties, &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
 	{
-		DEBUGOUT("GetInstance(): CMNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMNewInstance() failed - %s\n", (char*) CMGetCharPtr(status.msg));
 	}
 	else
 	{
@@ -548,7 +550,7 @@
 	CMPIValue rv;
 	//const char* p;
 	//char *endptr;
-	/* char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); */
+	/* char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL)); */
 	char* const shutdownCmd[] = { "/sbin/shutdown", "-h", "now", NULL };
 	char* const rebootCmd[] = { "/sbin/shutdown", "-r", "now", NULL };
 
@@ -563,11 +565,11 @@
 
 	class = CMGetClassName(cop, &status);
 
-	if (strcasecmp(CMGetCharPtr(class), "OMC_OperatingSystem") != 0)
+	if (strcasecmp((char*) CMGetCharPtr(class), "OMC_OperatingSystem") != 0)
 	{
-		DEBUGOUT("InvokeMethod() INVALID class name %s\n", CMGetCharPtr(class));
+		DEBUGOUT("InvokeMethod() INVALID class name %s\n", (char*) CMGetCharPtr(class));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_INVALID_CLASS,
-			CMGetCharPtr(class));
+			(char*) CMGetCharPtr(class));
 		return status;
 	}
 

Modified: cmpibase/trunk/src/providers/operating-system/LinuxRunningOS.c
===================================================================
--- cmpibase/trunk/src/providers/operating-system/LinuxRunningOS.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/operating-system/LinuxRunningOS.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -75,14 +75,14 @@
         const char **properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("doReferences called\n");
 
 	if (strcasecmp(assocClass, "OMC_RunningOS") == 0)
 	{
 		CMPIObjectPath *osOp, *csOp;
-		char *objsClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objsClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 		if(strcasecmp(objsClassName, "OMC_UnitaryComputerSystem") == 0)
 		{
 			/* Check any additional parms if specified */
@@ -139,7 +139,7 @@
 		if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
 		{
 			DEBUGOUT("doReferences(): omccmpiNewInstance() failed - %s\n",
-				CMGetCharPtr(status.msg));
+				(char*) CMGetCharPtr(status.msg));
 			return status;
 		}
 
@@ -147,7 +147,7 @@
 		if ((status.rc != CMPI_RC_OK) || CMIsNullObject(osOp))
 		{
 			DEBUGOUT("doReferences(): omccmpiCreateOSObjectPath failed - %s\n",
-				CMGetCharPtr(status.msg));
+				(char*) CMGetCharPtr(status.msg));
 			return status;
 		}
 
@@ -155,7 +155,7 @@
 		if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
 		{
 			DEBUGOUT("doReferences(): omccmpiCreateOSObjectPath failed - %s\n",
-				CMGetCharPtr(status.msg));
+				(char*) CMGetCharPtr(status.msg));
 			return status;
 		}
 
@@ -190,7 +190,7 @@
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	CMPIObjectPath *osOp, *csOp, *assocOp;
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("EnumInstanceNames() called\n");
 
@@ -198,7 +198,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(osOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -206,7 +206,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -215,7 +215,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(assocOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateAssociationPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -243,7 +243,7 @@
 	const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIObjectPath *osOp, *csOp;
 	CMPIInstance *instance;
 
@@ -252,7 +252,7 @@
 	instance = omccmpiNewInstance(_broker, ns, "OMC_RunningOS", _classKeys,
 		properties, &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance)) {
-		DEBUGOUT("EnumInstances(): omccmpiNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("EnumInstances(): omccmpiNewInstance() failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -260,7 +260,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(osOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -268,7 +268,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -298,7 +298,7 @@
 	const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIData dependent, antecedent;
 	CMPIObjectPath *osOp, *csOp;
 	CMPIInstance *instance;
@@ -308,7 +308,7 @@
 	dependent = CMGetKey(cop, "Dependent", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(dependent))
 	{
-		DEBUGOUT("GetInstance(): CMGetKey(\"Dependent\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"Dependent\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "Dependent missing");
 		return status;
 	}
@@ -321,7 +321,7 @@
 
 	antecedent = CMGetKey(cop, "Antecedent", &status);
 	if (status.rc != CMPI_RC_OK || CMIsNullValue(antecedent)) {
-		DEBUGOUT("GetInstance(): CMGetKey(\"Antecedent\") failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): CMGetKey(\"Antecedent\") failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY, "Antecedent missing");
 		return status;
 	}
@@ -330,7 +330,7 @@
 	instance = omccmpiNewInstance(_broker, ns, "OMC_RunningOS", _classKeys,
 		properties, &status);
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance)) {
-		DEBUGOUT("GetInstance(): omccmpiNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+		DEBUGOUT("GetInstance(): omccmpiNewInstance() failed - %s\n", (char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -345,7 +345,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(osOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 
@@ -353,7 +353,7 @@
 	if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
 	{
 		DEBUGOUT("EnumInstanceNames(): omccmpiCreateOSObjectPath failed - %s\n",
-			CMGetCharPtr(status.msg));
+			(char*) CMGetCharPtr(status.msg));
 		return status;
 	}
 

Modified: cmpibase/trunk/src/providers/processes/LinuxProcessProvider.c
===================================================================
--- cmpibase/trunk/src/providers/processes/LinuxProcessProvider.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/processes/LinuxProcessProvider.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -30,6 +30,7 @@
 * Author: Jon Carey (jc...@no...)
 ******************************************************************************/
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <pwd.h>
 #include <sys/types.h>
@@ -120,7 +121,7 @@
         const char **properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	char wkbfr[512], hname[256];
 	CMPIObjectPath *osOp, *objectpath;
 	CMPIInstance *instance;
@@ -129,7 +130,7 @@
 
 	if (strcasecmp(assocClass, "OMC_OSProcess") == 0)
 	{
-		char *objsClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objsClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 
 		/* Is target an OS object? */
 		if(strcasecmp(objsClassName, "OMC_OperatingSystem") == 0)
@@ -399,7 +400,7 @@
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	CMPIObjectPath* objectpath;
-	char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	int *procs, i;
 	unsigned int numProcs;
 	char hname[256];
@@ -408,7 +409,7 @@
 
 	DEBUGOUT("EnumInstanceNames() called\n");
 
-	className = CMGetCharPtr(CMGetClassName(cop, NULL));
+	className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 	if (strcasecmp(className, "OMC_UnixProcess") == 0)
 	{
 		objectpath = CMNewObjectPath(_broker, ns, "OMC_UnixProcess", &status);
@@ -530,7 +531,7 @@
 		const char** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	CMPIInstance* instance;
 	int *procs, i;
 	unsigned int numProcs;
@@ -538,7 +539,7 @@
 
 	DEBUGOUT("EnumInstances() called\n");
 
-	className = CMGetCharPtr(CMGetClassName(cop, NULL));
+	className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 	if (strcasecmp(className, "OMC_UnixProcess") == 0)
 	{
 		instance = omccmpiNewInstance(_broker, ns, "OMC_UnixProcess",
@@ -662,7 +663,7 @@
 	CMPIData key;
 	CMPIInstance* instance;
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char *endptr, *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char *endptr, *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	const char *p, *className;
 	char hname[256];
 
@@ -1068,7 +1069,7 @@
 			if (status.rc == CMPI_RC_OK
 				&& !CMIsNullValue(data) && data.type == CMPI_string) 
 			{
-				arg = CMGetCharPtr(data.value.string);
+				arg = (char*) CMGetCharPtr(data.value.string);
 			}
 
 			if (!arg || !(*arg)) 

Deleted: cmpibase/trunk/src/providers/samples/c/libomc_unitary_computer_system_provider.so
===================================================================
(Binary files differ)


Property changes on: cmpibase/trunk/src/providers/time-service
___________________________________________________________________
Name: svn:ignore
   - .deps
.libs
Makefile

   + Makefile.in


Modified: cmpibase/trunk/src/providers/time-service/hostedTimeService.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/hostedTimeService.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/hostedTimeService.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -87,7 +87,7 @@
 	DEBUGOUT("HostedTimeService::EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and populate cs object path (LEFT)
 	CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, &status);
@@ -146,7 +146,7 @@
 	DEBUGOUT("HostedTimeService::CreateAssocInst() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	//DEBUGOUT("About to create cs cop\n");
 	// Create and populate cs object path
@@ -246,7 +246,7 @@
 	DEBUGOUT("HostedTimeService::GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// do work here
 	CMPIData leftkey = CMGetKey(cop, LEFT_PROPERTYNAME, &status);
@@ -419,6 +419,7 @@
 static void
 Init(CMPIInstanceMI * self)
 {
+#ifdef LOCAL_DEBUG
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 
 	DEBUGOUT("HostedTimeService::Initialize() called\n");
@@ -427,6 +428,7 @@
 
 	DEBUGOUT("HostedTimeService::Leaving Initialize(): %s\n",
 			(status.rc == CMPI_RC_OK)? "succeeded":"failed");
+#endif
 }
 
 
@@ -445,6 +447,7 @@
 static void
 AssocInit(CMPIAssociationMI * self)
 {
+#ifdef LOCAL_DEBUG
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 
 	DEBUGOUT("HostedTimeService::AssocInit() called\n");
@@ -453,6 +456,7 @@
 
 	DEBUGOUT("HostedTimeService::Leaving AssocInit(): %s\n",
 			(status.rc == CMPI_RC_OK)? "succeeded":"failed");
+#endif
 }
 
 
@@ -505,11 +509,11 @@
 	DEBUGOUT("HostedTimeService:  doReferences called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0)
 	{
-		char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 		if (objClassName)
 		{
 			DEBUGOUT("  Incoming className: %s\n", objClassName);
@@ -549,7 +553,7 @@
 					CMPIData data = CMGetKey(cop, "Name", &status);
 					if (!CMIsNullValue(data))
 					{
-						char *inName = CMGetCharPtr(data.value.string);
+						char *inName = (char*) CMGetCharPtr(data.value.string);
 						if (inName)
 						{
 							DEBUGOUT("Comparing inName: %s   with name: %s\n", inName, name);
@@ -583,7 +587,7 @@
 				// need to get apppropriate UnitaryComputerSystem for assocInst
 
 				CMPIData data = CMGetKey(cop, "Name", &status);
-				char *inName = CMGetCharPtr(data.value.string);
+				char *inName = (char*) CMGetCharPtr(data.value.string);
 				//DEBUGOUT("comparing inName (%s) with name (%s)\n",
 				//		inName,
 				//		"omc:computername");

Modified: cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -39,6 +39,7 @@
 #include <omc/cmpiSimpleAssoc.h>
 #include <omc/string.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -74,7 +75,7 @@
 // ****************************************************************************
 /*
   	Get Current Namespace
-		char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+		char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 	Set Return Code with message
 		CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, "Additional Error Message Here");
 	Create and check new object path
@@ -122,7 +123,7 @@
 		const CMPIObjectPath * cop)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("RemoteTimeServicePort: EnumInstanceNames() called\n");
 
@@ -181,7 +182,7 @@
 		const char ** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("RemoteTimeServicePort: EnumInstances() called\n");
 
@@ -241,14 +242,14 @@
 		const char ** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("RemoteTimeServicePort: GetInstance() called\n");
 
 	CMPIData key = CMGetKey(cop, "Name", &status);
 	if (!CMIsNullValue(key))
 	{
-		char *inServerName = CMGetCharPtr(key.value.string);
+		char *inServerName = (char*) CMGetCharPtr(key.value.string);
 		DEBUGOUT("  got servername: %s\n", inServerName);
 
 		//NTPServer *ntpServer = getNTPServer(inServerName);
@@ -507,7 +508,7 @@
 	nameVal = CMGetKey(cop, "Name", &status);
 	if (!CMIsNullValue(nameVal))
 	{
-		char *serverName = CMGetCharPtr(nameVal.value.string);
+		char *serverName = (char*) CMGetCharPtr(nameVal.value.string);
 		if (deleteNTPServer(serverName) != 0)
 		{
 			OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_FAILED,

Modified: cmpibase/trunk/src/providers/time-service/systemTimeService.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/systemTimeService.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/systemTimeService.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -40,6 +40,7 @@
 #include <omc/string.h>
 #include <omc/cmpiTimeServiceUtils.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -121,7 +122,7 @@
 		const CMPIObjectPath * cop)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("EnumInstanceNames() called\n");
 
@@ -157,7 +158,7 @@
 		const char ** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("EnumInstances() called\n");
 
@@ -193,7 +194,7 @@
 		const char ** properties)
 {
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	DEBUGOUT("GetInstance() called\n");
 

Modified: cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -40,6 +40,7 @@
 #include <omc/cmpiTimeServiceUtils.h>
 #include <omc/ntpServer.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -88,7 +89,7 @@
 	DEBUGOUT("TimeServiceAccessBySAP::EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if(serverSupportsNTP())
 	{
@@ -159,7 +160,7 @@
 	DEBUGOUT("TimeServiceAccessBySAP::EnumInstances() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if(serverSupportsNTP())
 	{
@@ -232,7 +233,7 @@
 	DEBUGOUT("TimeServiceAccessBySAP::GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// do work here
 	CMPIData leftkey = CMGetKey(cop, LEFT_PROPERTYNAME, &status);
@@ -431,6 +432,7 @@
 static void
 AssocInit(CMPIAssociationMI * self)
 {
+#ifdef LOCAL_DEBUG
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 
 	DEBUGOUT("TimeServiceAccessBySAP::AssocInit() called\n");
@@ -439,6 +441,7 @@
 
 	DEBUGOUT("TimeServiceAccessBySAP::Leaving AssocInit(): %s\n",
 			(status.rc == CMPI_RC_OK)? "succeeded":"failed");
+#endif
 }
 
 
@@ -491,11 +494,11 @@
 	DEBUGOUT("TimeServiceAccessBySAP::TimeServiceAccessBySAP::doReferences called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0)
 	{
-		char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 
 		if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0)
 		{
@@ -529,7 +532,7 @@
 				// get the name from the SystemTimeService cop sent in
 				// should be 'omc:timeservice'
 				CMPIData data = CMGetKey(cop, "Name", &status);
-				char *inName = CMGetCharPtr(data.value.string);
+				char *inName = (char*) CMGetCharPtr(data.value.string);
 				if (strcasecmp(inName, "omc:timeservice") == 0)
 				{
 					if(serverSupportsNTP())

Modified: cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -39,6 +39,7 @@
 #include <omc/cmpiSimpleAssoc.h>
 #include <omc/cmpiTimeServiceUtils.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -87,7 +88,7 @@
 	DEBUGOUT("TimeServiceAvailableToElement::EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and populate cs object path (LEFT)
 	CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, &status);
@@ -146,7 +147,7 @@
 	DEBUGOUT("TimeServiceAvailableToElement::CreateAssocInst() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	//DEBUGOUT("About to create cs cop\n");
 	// Create and populate cs object path
@@ -246,7 +247,7 @@
 	DEBUGOUT("TimeServiceAvailableToElement::GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// do work here
 	CMPIData leftkey = CMGetKey(cop, LEFT_PROPERTYNAME, &status);
@@ -505,11 +506,11 @@
 	DEBUGOUT("TimeServiceAvailableToElement:  doReferences called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0)
 	{
-		char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 		if (objClassName)
 		{
 			DEBUGOUT("  Incoming className: %s\n", objClassName);
@@ -549,7 +550,7 @@
 					CMPIData data = CMGetKey(cop, "Name", &status);
 					if (!CMIsNullValue(data))
 					{
-						char *inName = CMGetCharPtr(data.value.string);
+						char *inName = (char*) CMGetCharPtr(data.value.string);
 						if (inName)
 						{
 							DEBUGOUT("Comparing inName: %s   with name: %s\n", inName, name);
@@ -583,7 +584,7 @@
 				// need to get apppropriate UnitaryComputerSystem for assocInst
 
 				CMPIData data = CMGetKey(cop, "Name", &status);
-				char *inName = CMGetCharPtr(data.value.string);
+				char *inName = (char*) CMGetCharPtr(data.value.string);
 				//DEBUGOUT("comparing inName (%s) with name (%s)\n",
 				//		inName,
 				//		"omc:computername");

Modified: cmpibase/trunk/src/providers/time-service/timeServiceTimeZoneSettingData.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/timeServiceTimeZoneSettingData.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/timeServiceTimeZoneSettingData.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -39,6 +39,7 @@
 #include <omc/cmpiSimpleAssoc.h>
 #include <omc/cmpiTimeServiceUtils.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -87,7 +88,7 @@
 	DEBUGOUT("TimeServiceTimeZoneSettingData::EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and populate systemTimeService object path (RIGHT)
 	CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status);
@@ -146,7 +147,7 @@
 	DEBUGOUT("TimeServiceTimeZoneSettingData::CreateAssocInst() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// Create and populate systemTimeService object path (RIGHT)
 	CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status);
@@ -244,7 +245,7 @@
 	DEBUGOUT("TimeServiceTimeZoneSettingData::GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	// do work here
 	CMPIData mekey = CMGetKey(cop, LEFT_PROPERTYNAME, &status);
@@ -443,6 +444,7 @@
 static void
 AssocInit(CMPIAssociationMI * self)
 {
+#ifdef LOCAL_DEBUG
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 
 	DEBUGOUT("TimeServiceTimeZoneSettingData::AssocInit() called\n");
@@ -451,6 +453,7 @@
 
 	DEBUGOUT("TimeServiceTimeZoneSettingData::Leaving AssocInit(): %s\n",
 			(status.rc == CMPI_RC_OK)? "succeeded":"failed");
+#endif
 }
 
 
@@ -503,11 +506,11 @@
 	DEBUGOUT("TimeServiceTimeZoneSettingData::doReferences called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0)
 	{
-		char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL));
+		char *objClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
 
 		if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0)
 		{
@@ -539,7 +542,7 @@
 			if (bHaveMatch)
 			{
 				CMPIData data = CMGetKey(cop, "Name", &status);
-				char *inName = CMGetCharPtr(data.value.string);
+				char *inName = (char*) CMGetCharPtr(data.value.string);
 				//DEBUGOUT("Comparing inName: %s   with name: %s\n", inName, name);
 				if (strcasecmp(inName, "omc:timeservice") == 0)
 				{
@@ -555,7 +558,7 @@
 			// need to get apppropriate SystemTimeService for assocInst
 
 			CMPIData data = CMGetKey(cop, "InstanceID", &status);
-			char *inName = CMGetCharPtr(data.value.string);
+			char *inName = (char*) CMGetCharPtr(data.value.string);
 
 			int bHaveMatch = 1; // TRUE
 			if ((resultClass != NULL) && (*resultClass != 0))

Modified: cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c
===================================================================
--- cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c	2008-04-22 17:26:33 UTC (rev 570)
+++ cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c	2008-04-22 19:54:26 UTC (rev 571)
@@ -311,7 +311,7 @@
 	DEBUGOUT("TimeZoneSettingData: EnumInstanceNames() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	CMPIObjectPath *op = makeTimeZoneSettingDataObjectPath(_broker, ns, &status);
 
@@ -350,7 +350,7 @@
 	DEBUGOUT("EnumInstances() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	CMPIInstance *inst = makeTimeZoneSettingDataInstance(_broker, ns, &status, properties);
 
@@ -389,7 +389,7 @@
 	DEBUGOUT("GetInstance() called\n");
 
 	CMPIStatus status = {CMPI_RC_OK, NULL};
-	char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL));
+	char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
 
 	CMPIData key = CMGetKey(cop, "InstanceID", &status);
 	if (!CMIsNullValue(key))
@@ -451,7 +451,7 @@
 
 			if (!CMIsNullValue(timezone))
 			{
-				newTimezone = CMGetCharPtr(timezone.value.string);
+				newTimezone = (char*) CMGetCharPtr(timezone.value.string);
 			}
 			if (!CMIsNullValue(hwClock))
 			{
@@ -575,6 +575,7 @@
 // ****************************************************************************
 static void Init(CMPIInstanceMI * self)
 {
+#ifdef LOCAL_DEBUG
 	CMPIStatus status = {CMPI_RC_OK, NULL};
 	DEBUGOUT("Initialize() called\n");
 
@@ -583,6 +584,7 @@
 	memset(g_szNewTimeZone, 0, 128);
 
 	DEBUGOUT("Leaving Initialize(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+#endif
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [570] omccmpi/trunk/src/lib/omc/cmpiUtils.c

From: <jc...@us...> - 2008-04-22 17:26:56

Revision: 570
          http://omc.svn.sourceforge.net/omc/?rev=570&view=rev
Author:   jcarey
Date:     2008-04-22 10:26:33 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
Fixed some compiler warnings

Modified Paths:
--------------
    omccmpi/trunk/src/lib/omc/cmpiUtils.c

Modified: omccmpi/trunk/src/lib/omc/cmpiUtils.c
===================================================================
--- omccmpi/trunk/src/lib/omc/cmpiUtils.c	2008-04-21 21:36:09 UTC (rev 569)
+++ omccmpi/trunk/src/lib/omc/cmpiUtils.c	2008-04-22 17:26:33 UTC (rev 570)
@@ -494,14 +494,14 @@
 	*/
 
 	// sanity checks - same namespace, class, and property list size
-	char *hn1 = CMGetCharPtr(CMGetHostname(cop1, pStatus));
-	char *hn2 = CMGetCharPtr(CMGetHostname(cop2, pStatus));
+	char *hn1 = (char*) CMGetCharPtr(CMGetHostname(cop1, pStatus));
+	char *hn2 = (char*) CMGetCharPtr(CMGetHostname(cop2, pStatus));
 
-	char *ns1 = CMGetCharPtr(CMGetNameSpace(cop1, pStatus));
-	char *ns2 = CMGetCharPtr(CMGetNameSpace(cop2, pStatus));
+	char *ns1 = (char*) CMGetCharPtr(CMGetNameSpace(cop1, pStatus));
+	char *ns2 = (char*) CMGetCharPtr(CMGetNameSpace(cop2, pStatus));
 
-	char *cl1 = CMGetCharPtr(CMGetClassName(cop1, pStatus));
-	char *cl2 = CMGetCharPtr(CMGetClassName(cop2, pStatus));
+	char *cl1 = (char*) CMGetCharPtr(CMGetClassName(cop1, pStatus));
+	char *cl2 = (char*) CMGetCharPtr(CMGetClassName(cop2, pStatus));
 
 	unsigned int numkeys1 = CMGetKeyCount(cop1, pStatus);
 	unsigned int numkeys2 = CMGetKeyCount(cop2, pStatus);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [569] omccmpi/trunk/omccmpi.spec

From: <jb...@us...> - 2008-04-21 21:36:16

Revision: 569
          http://omc.svn.sourceforge.net/omc/?rev=569&view=rev
Author:   jbgill
Date:     2008-04-21 14:36:09 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
changed descriptions in spec file to match what its real function is

Modified Paths:
--------------
    omccmpi/trunk/omccmpi.spec

Modified: omccmpi/trunk/omccmpi.spec
===================================================================
--- omccmpi/trunk/omccmpi.spec	2008-04-21 19:34:29 UTC (rev 568)
+++ omccmpi/trunk/omccmpi.spec	2008-04-21 21:36:09 UTC (rev 569)
@@ -26,7 +26,7 @@
 Version:        1.0.1
 Release:        0
 Group:          System/Management
-Summary:        Linux Instrumentation for Enterprise OpenWBEM providers
+Summary:        Utility library for CMPI providers in the OMC project
 PreReq:         coreutils
 License:        Other License(s), see package, Commercial
 
@@ -42,10 +42,9 @@
 Requires        : omccmpi-devel, %{name}
 
 %description
-Linux providers for cmpi instrumentation of base operating system components
-such as computer, system, operating system, and processes. These are
-used by the OpenWBEM (Web-Based Enterprise Management) Common
-Information Model (CIM) object broker.
+Utility library for CMPI providers in the OMC project.  These providers
+are Linux providers for cmpi instrumentation of base operating system components
+such as computer, system, operating system, and processes. 
 
 
 
@@ -57,10 +56,9 @@
 
 
 %description devel
-Linux providers for cmpi instrumentation of base operating system components
-such as computer, system, operating system, and processes. These are
-used by the OpenWBEM (Web-Based Enterprise Management) Common
-Information Model (CIM) object broker.
+Utility library for CMPI providers in the OMC project.  These providers
+are Linux providers for cmpi instrumentation of base operating system components
+such as computer, system, operating system, and processes. 
 
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [568] omccmpi/trunk/omccmpi.spec

From: <jb...@us...> - 2008-04-21 19:34:37

Revision: 568
          http://omc.svn.sourceforge.net/omc/?rev=568&view=rev
Author:   jbgill
Date:     2008-04-21 12:34:29 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
updated version to match what's in configure.ac

Modified Paths:
--------------
    omccmpi/trunk/omccmpi.spec

Modified: omccmpi/trunk/omccmpi.spec
===================================================================
--- omccmpi/trunk/omccmpi.spec	2008-04-11 21:48:53 UTC (rev 567)
+++ omccmpi/trunk/omccmpi.spec	2008-04-21 19:34:29 UTC (rev 568)
@@ -1,5 +1,5 @@
 #
-# spec file for package omccmpi (Version 1.0.0)
+# spec file for package omccmpi (Version 1.0.1)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,7 +23,7 @@
 %define omcprefix /usr
 
 # Increment the version every time the source code changes.
-Version:        1.0.0
+Version:        1.0.1
 Release:        0
 Group:          System/Management
 Summary:        Linux Instrumentation for Enterprise OpenWBEM providers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [567] test/trunk

From: <kwo...@us...> - 2008-04-11 21:48:49

Revision: 567
          http://omc.svn.sourceforge.net/omc/?rev=567&view=rev
Author:   kwoodson
Date:     2008-04-11 14:48:53 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Updated tests

Modified Paths:
--------------
    test/trunk/OMC_OperatingSystem_Test.py
    test/trunk/OMC_UnitaryComputerSystem_Test.py
    test/trunk/OMC_UnixProcess_Test.py

Modified: test/trunk/OMC_OperatingSystem_Test.py
===================================================================
--- test/trunk/OMC_OperatingSystem_Test.py	2008-04-11 20:48:14 UTC (rev 566)
+++ test/trunk/OMC_OperatingSystem_Test.py	2008-04-11 21:48:53 UTC (rev 567)
@@ -47,10 +47,7 @@
 def get_os_name():
     try:
         file = open("/etc/SuSE-release", "r")
-        flist = file.readlines()
-        name = ""
-        for element in flist:
-            name += element
+        name = file.readline().strip()
         file.close()
         return name
     except:
@@ -81,8 +78,6 @@
                 self.add_Error("CSCreationClassName incorrect")
             if os['CreationClassName'].lower() != "omc_operatingsystem":
                 self.add_Error("CreationClassName incorrect")
-#self.failUnless(os['Caption'].lower() == \
-#"operating system", "Caption incorrect")
             for key in os.keys():
 #print "Testing %s: "%str(key)
                 if key.lower() == "name" or key.lower() == "ostype":
@@ -91,9 +86,10 @@
                     if os['Name'].lower() != \
                       commands.getoutput("cat /proc/sys/kernel/ostype").lower():
                         self.add_Error("Name incorrect")
-                if key.lower() == "elementname":
-                    if os['ElementName'] != get_os_name().rstrip("\n"):
-                        self.add_Error("ElementName does not Match")
+                if key.lower() == "elementname" or key.lower() == "caption" or \
+                   key.lower() == "description":
+                    if os[key] != get_os_name().rstrip("\n"):
+                        self.add_Error("%s does not Match"%str(key))
                 if key.lower() == "currenttimezone":
                     tz = time.timezone
                     tz_hours = (tz/60)
@@ -102,16 +98,21 @@
                     if os['CurrentTimeZone'] + tz_hours != 0:
                         self.add_Error("Time zones are not equal")
                 if key.lower() == "freephysicalmemory":
-                    mem = get_free_mem("MemFree")
+                    mem = get_free_mem("MemFree") + get_free_mem("Buffers") \
+                        + get_free_mem("Cached")
                     if math.fabs(int(mem) - int(os['FreePhysicalMemory'])) > _epsilon:
                         self.add_Error("FreePhysicalMemory is incorrect")
                 if key.lower() == "freespaceinpagingfiles":
                     mem = get_free_mem("SwapFree")
-                    if math.fabs(int(mem/1024) - int(os['FreeSpaceInPagingFiles'])) > _epsilon:
+                    if math.fabs(int(mem) - int(os['FreeSpaceInPagingFiles'])) > _epsilon:
                         self.add_Error("FreeSpaceInPagingFiles is incorrect")
-                if key.lower() == "totalswapspacesize":
+#if key.lower() == "totalswapspacesize":
+#mem = get_free_mem("SwapTotal")
+#if math.fabs(int(mem) - int(os['TotalSwapSpaceSize'])) > _epsilon: 
+#self.add_Error("TotalSwapSpaceSize is incorrect")
+                if key.lower() == "sizestoredinpagingfiles":
                     mem = get_free_mem("SwapTotal")
-                    if math.fabs(int(mem) - int(os['TotalSwapSpaceSize'])) > _epsilon: 
+                    if math.fabs(int(mem) - int(os['SizeStoredInPagingFiles'])) > _epsilon: 
                         self.add_Error("TotalSwapSpaceSize is incorrect")
                 if key.lower() == "totalvisiblememorysize":
                     mem = pywbem.Uint64(get_free_mem("MemTotal"))
@@ -122,7 +123,8 @@
                     if math.fabs(mem - os['TotalVirtualMemorySize']) > _epsilon:
                         self.add_Error("Totalvirtualmemorysize is incorrect")
                 if key.lower() == "freevirtualmemory":
-                    mem = get_free_mem("MemFree") + get_free_mem("SwapFree")
+                    mem = get_free_mem("MemFree") + get_free_mem("SwapFree") \
+                        + get_free_mem("Buffers") + get_free_mem("Cached") 
                     if math.fabs(int(mem) - int(os['FreeVirtualMemory'])) > _epsilon:
                         self.add_Error("FreeVirtualMemory is incorrect")
                 if key.lower() == "installdate":
@@ -192,7 +194,8 @@
                             self.add_Error("%s is incorrect"%str(key))
                     except:
                         raise
-
+#
+#Undetermined
 #if key.lower() == "numberofprocesses":
 #                    try:
 #                        procs = int(commands.getoutput("ps ax | wc -l")) - 3
@@ -242,8 +245,13 @@
             else:
                 self.add_Error("OMC_OSProcess: InstanceName failed")
 
-            #TODO
-                #Test OMC_RunningOS assocation
+            running_os = self._conn.EnumerateInstances("OMC_RunningOS")
+            self.failUnless(len(running_os) > 0, "No OMC_RunningOS returned.")
+            if os_list[0].path != running_os[0]['Antecedent']:
+                self.add_Error("OMC_RunningOS Antecedent incorrect")
+            if ucs[0].path != running_os[0]['Dependent']:
+                self.add_Error("OMC_RunningOS Dependent incorrect")
+
             self.finalize()
 
         except:

Modified: test/trunk/OMC_UnitaryComputerSystem_Test.py
===================================================================
--- test/trunk/OMC_UnitaryComputerSystem_Test.py	2008-04-11 20:48:14 UTC (rev 566)
+++ test/trunk/OMC_UnitaryComputerSystem_Test.py	2008-04-11 21:48:53 UTC (rev 567)
@@ -123,7 +123,8 @@
             if insts[0]['Caption'] != caption:
                 self.fail('Attempt to ModifyInstance of OMC_UnitaryComputerSystem failed')
         except pywbem.CIMError, ce:
-            self.fail('ModifyInstance of OMC_UnitaryComputerSystem failed')
+            self.failUnless(ce[0] == pywbem.CIM_ERR_NOT_SUPPORTED,\
+                  'ModifyInstance of OMC_UnitaryComputerSystem failed')
             
         try:
             inst = pywbem.CIMInstance('OMC_UnitaryComputerSystem',
@@ -136,137 +137,137 @@
                 # Should be 7, not supported.
                 self.fail('Exception on CreateInstance of OMC_UnitaryComputerSystem was not "Not Supported" as expected')
 
-    def _omc_hostnamesettingdata_test(self):
-        hostname = getfqdn()
-        
-        insts = self._conn.EnumerateInstances('OMC_HostNameSettingData', LocalOnly=False)
-        if 1 < len(insts):
-            self.fail('More than one instance of OMC_HostNameSettingData returned from EnumerateInstances')
-        if insts[0]['ComputerName'] != hostname:
-            self.fail('EnumerateInstances on OMC_HostNameSettingData returned different instance than expected')
-            
-        insts = self._conn.EnumerateInstanceNames('OMC_HostNameSettingData')
-        if 1 < len(insts):
-            self.fail('More than one instance name of OMC_HostNameSettingData returned from EnumerateInstanceNames')
-        if insts[0]['InstanceID'] != 'omc:computername':
-            self.fail('EnumerateInstanceNames on OMC_HostNameSettingData returned different instance name than expected')
-            
-        inst = self._conn.GetInstance(insts[0], LocalOnly=False)
-        if inst is None:
-            self.fail('Failed to GetInstance of OMC_HostNameSettingData using %s' % insts[0])
-        if inst['ComputerName'] != hostname:
-            self.fail('GetInstance of OMC_HostNameSettingData returned different instance than expected')
-            
-        try:
-            self._conn.DeleteInstance(insts[0])
-            self.fail('DeleteInstance of OMC_HostNameSettingData succeeded when it should have failed')
-        except pywbem.CIMError, ce:
-            if ce[0] != 7:
-                # Should be 7, not supported.
-                self.fail('Exception on DeleteInstance of OMC_HostNameSettingData was not "Not Supported" as expected')
-        
-        try:
-            elems = hostname.split('.')
-            for elem in elems:
-                if elem == elems[0]:
-                    newhostname = 'fakehostname'
-                else:
-                    newhostname = newhostname + '.' + elem
-            inst['ComputerName'] = newhostname
-            self._conn.ModifyInstance(inst)
-            insts = self._conn.EnumerateInstances('OMC_HostNameSettingData', LocalOnly=False)
-            failmsg = None
-            if insts[0]['ComputerName'] != newhostname:
-                failmsg = 'Attempt to ModifyInstance of OMC_HostNameSettingData failed'
-            self._dbgPrint('Modified ComputerName of OMC_HostNameSettingData instance, awaiting serialization')
-            ctr = 0
-            while ctr < 100 and newhostname != getfqdn():
-                sleep(1)
-                ctr = ctr + 1
-            if newhostname != getfqdn():
-                failmsg = 'ModifyInstance of OMC_HostNameSettingData successful but hostname not modified on system'
-            else:
-                # Should get here always; try to set the name back to the original
-                self._dbgPrint('New host name setting now applied:  %s' % getfqdn())
-                inst['ComputerName'] = hostname
-                self._conn.ModifyInstance(inst)
-                ctr = 0
-                self._dbgPrint('Restored ComputerName of OMC_HostNameSettingData instance, awaiting serialization')
-                while ctr < 100 and hostname != getfqdn():
-                    sleep(1)
-                    ctr = ctr + 1
-                self._dbgPrint('Previous host name setting now applied:  %s' % getfqdn())
-            if failmsg is not None:
-                self.fail(failmsg)
-        except pywbem.CIMError:
-            self.fail('ModifyInstance of OMC_HostNameSettingData failed')
-        
-        try:
-            inst = pywbem.CIMInstance('OMC_HostNameSettingData',
-                    properties={'InstanceID' : 'omc:computername2',
-                            'ComputerName':getfqdn()})
-            self._conn.CreateInstance(inst)
-            self.fail('CreateInstance of OMC_HostNameSettingData succeeded when it should have failed')
-        except pywbem.CIMError, ce:
-            if ce[0] != 7:
-                # Should be 7, not supported.
-                self.fail('Exception on CreateInstance of OMC_HostNameSettingData was not "Not Supported" as expected')
+#    def _omc_hostnamesettingdata_test(self):
+#        hostname = getfqdn()
+#        
+#        insts = self._conn.EnumerateInstances('OMC_HostNameSettingData', LocalOnly=False)
+#        if 1 < len(insts):
+#            self.fail('More than one instance of OMC_HostNameSettingData returned from EnumerateInstances')
+#        if insts[0]['ComputerName'] != hostname:
+#            self.fail('EnumerateInstances on OMC_HostNameSettingData returned different instance than expected')
+#            
+#        insts = self._conn.EnumerateInstanceNames('OMC_HostNameSettingData')
+#        if 1 < len(insts):
+#            self.fail('More than one instance name of OMC_HostNameSettingData returned from EnumerateInstanceNames')
+#        if insts[0]['InstanceID'] != 'omc:computername':
+#            self.fail('EnumerateInstanceNames on OMC_HostNameSettingData returned different instance name than expected')
+#            
+#        inst = self._conn.GetInstance(insts[0], LocalOnly=False)
+#        if inst is None:
+#            self.fail('Failed to GetInstance of OMC_HostNameSettingData using %s' % insts[0])
+#        if inst['ComputerName'] != hostname:
+#            self.fail('GetInstance of OMC_HostNameSettingData returned different instance than expected')
+#            
+#        try:
+#            self._conn.DeleteInstance(insts[0])
+#            self.fail('DeleteInstance of OMC_HostNameSettingData succeeded when it should have failed')
+#        except pywbem.CIMError, ce:
+#            if ce[0] != 7:
+#                # Should be 7, not supported.
+#                self.fail('Exception on DeleteInstance of OMC_HostNameSettingData was not "Not Supported" as expected')
+#        
+#        try:
+#            elems = hostname.split('.')
+#            for elem in elems:
+#                if elem == elems[0]:
+#                    newhostname = 'fakehostname'
+#                else:
+#                    newhostname = newhostname + '.' + elem
+#            inst['ComputerName'] = newhostname
+#            self._conn.ModifyInstance(inst)
+#            insts = self._conn.EnumerateInstances('OMC_HostNameSettingData', LocalOnly=False)
+#            failmsg = None
+#            if insts[0]['ComputerName'] != newhostname:
+#                failmsg = 'Attempt to ModifyInstance of OMC_HostNameSettingData failed'
+#            self._dbgPrint('Modified ComputerName of OMC_HostNameSettingData instance, awaiting serialization')
+#            ctr = 0
+#            while ctr < 100 and newhostname != getfqdn():
+#                sleep(1)
+#                ctr = ctr + 1
+#            if newhostname != getfqdn():
+#                failmsg = 'ModifyInstance of OMC_HostNameSettingData successful but hostname not modified on system'
+#            else:
+#                # Should get here always; try to set the name back to the original
+#                self._dbgPrint('New host name setting now applied:  %s' % getfqdn())
+#                inst['ComputerName'] = hostname
+#                self._conn.ModifyInstance(inst)
+#                ctr = 0
+#                self._dbgPrint('Restored ComputerName of OMC_HostNameSettingData instance, awaiting serialization')
+#                while ctr < 100 and hostname != getfqdn():
+#                    sleep(1)
+#                    ctr = ctr + 1
+#                self._dbgPrint('Previous host name setting now applied:  %s' % getfqdn())
+#            if failmsg is not None:
+#                self.fail(failmsg)
+#        except pywbem.CIMError:
+#            self.fail('ModifyInstance of OMC_HostNameSettingData failed')
+#        
+#        try:
+#            inst = pywbem.CIMInstance('OMC_HostNameSettingData',
+#                    properties={'InstanceID' : 'omc:computername2',
+#                            'ComputerName':getfqdn()})
+#            self._conn.CreateInstance(inst)
+#            self.fail('CreateInstance of OMC_HostNameSettingData succeeded when it should have failed')
+#        except pywbem.CIMError, ce:
+#            if ce[0] != 7:
+#                # Should be 7, not supported.
+#                self.fail('Exception on CreateInstance of OMC_HostNameSettingData was not "Not Supported" as expected')
+#
+#    def _omc_computersystemhostnamesettingdata_test(self):
+#        ucs_op = self._conn.EnumerateInstanceNames('OMC_UnitaryComputerSystem')[0]
+#        hnsd_op = self._conn.EnumerateInstanceNames('OMC_HostNameSettingData')[0]
+#        insts = self._conn.EnumerateInstances('OMC_ComputerSystemHostNameSettingData', LocalOnly=False)
+#        if 1 < len(insts):
+#            self.fail('EnumerateInstances of OMC_ComputerSystemHostNameSettingData returned multiple instances when only one was expected')
+#        if insts[0]['ManagedElement'] != ucs_op:
+#            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
+#        if insts[0]['SettingData'] != hnsd_op:
+#            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
+#        
+#        insts = self._conn.EnumerateInstanceNames('OMC_ComputerSystemHostNameSettingData')
+#        if 1 < len(insts):
+#            self.fail('EnumerateInstanceNames of OMC_ComputerSystemHostNameSettingData returned multiple instance names when only one was expected')
+#        if insts[0]['ManagedElement'] != ucs_op:
+#            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
+#        if insts[0]['SettingData'] != hnsd_op:
+#            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
+#        
+#        refs = self._conn.References(ucs_op, ResultClass='OMC_ComputerSystemHostNameSettingData')
+#        if 1 < len(refs):
+#            self.fail('References of OMC_UnitaryComputersystem returned multiple instances when only one was expected')
+#        if refs[0]['ManagedElement'] != ucs_op:
+#            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
+#        if refs[0]['SettingData'] != hnsd_op:
+#            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
+#            
+#        refs = self._conn.References(hnsd_op, ResultClass='OMC_ComputerSystemHostNameSettingData')
+#        if 1 < len(refs):
+#            self.fail('References of OMC_HostNameSettingData returned multiple instances when only one was expected')
+#        if refs[0]['ManagedElement'] != ucs_op:
+#            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
+#        if refs[0]['SettingData'] != hnsd_op:
+#            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
+#            
+#        assocs = self._conn.AssociatorNames(ucs_op, AssocClass='OMC_ComputerSystemHostNameSettingData')
+#        if 1 < len(assocs):
+#            self.fail('AssociatorNames of OMC_UnitaryComputerSystem returned multiple instances when only one was expected')
+#        qualified_hnsd_op = str(hnsd_op)
+#        if not qualified_hnsd_op.startswith('//%s/' % getfqdn()):
+#            qualified_hnsd_op =  str(hnsd_op)
+#            assocs[0].host = None
+#        if str(assocs[0]) != qualified_hnsd_op:
+#            self.fail('AssociatorNames for %s is not valid' % ucs_op)
+#            
+#        assocs = self._conn.AssociatorNames(hnsd_op, AssocClass='OMC_ComputerSystemHostNameSettingData')
+#        if 1 < len(assocs):
+#            self.fail('AssociatorNames of OMC_HostNameSettingData returned multiple instances when only one was expected')
+#        qualified_ucs_op = str(ucs_op)
+#        if not qualified_ucs_op.startswith('//%s/' % getfqdn()):
+#            qualified_ucs_op = str(ucs_op)
+#            assocs[0].host = None
+#        if str(assocs[0]) != qualified_ucs_op:
+#            self.fail('AssociatorNames for %s is not valid' % hnsd_op)
 
-    def _omc_computersystemhostnamesettingdata_test(self):
-        ucs_op = self._conn.EnumerateInstanceNames('OMC_UnitaryComputerSystem')[0]
-        hnsd_op = self._conn.EnumerateInstanceNames('OMC_HostNameSettingData')[0]
-        insts = self._conn.EnumerateInstances('OMC_ComputerSystemHostNameSettingData', LocalOnly=False)
-        if 1 < len(insts):
-            self.fail('EnumerateInstances of OMC_ComputerSystemHostNameSettingData returned multiple instances when only one was expected')
-        if insts[0]['ManagedElement'] != ucs_op:
-            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
-        if insts[0]['SettingData'] != hnsd_op:
-            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
-        
-        insts = self._conn.EnumerateInstanceNames('OMC_ComputerSystemHostNameSettingData')
-        if 1 < len(insts):
-            self.fail('EnumerateInstanceNames of OMC_ComputerSystemHostNameSettingData returned multiple instance names when only one was expected')
-        if insts[0]['ManagedElement'] != ucs_op:
-            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
-        if insts[0]['SettingData'] != hnsd_op:
-            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
-        
-        refs = self._conn.References(ucs_op, ResultClass='OMC_ComputerSystemHostNameSettingData')
-        if 1 < len(refs):
-            self.fail('References of OMC_UnitaryComputersystem returned multiple instances when only one was expected')
-        if refs[0]['ManagedElement'] != ucs_op:
-            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
-        if refs[0]['SettingData'] != hnsd_op:
-            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
-            
-        refs = self._conn.References(hnsd_op, ResultClass='OMC_ComputerSystemHostNameSettingData')
-        if 1 < len(refs):
-            self.fail('References of OMC_HostNameSettingData returned multiple instances when only one was expected')
-        if refs[0]['ManagedElement'] != ucs_op:
-            self.fail('ManagedElement property of OMC_ComputerSystemHostNameSettingData not valid')
-        if refs[0]['SettingData'] != hnsd_op:
-            self.fail('SettingData property of OMC_ComputerSystemHostNameSettingData not valid')
-            
-        assocs = self._conn.AssociatorNames(ucs_op, AssocClass='OMC_ComputerSystemHostNameSettingData')
-        if 1 < len(assocs):
-            self.fail('AssociatorNames of OMC_UnitaryComputerSystem returned multiple instances when only one was expected')
-        qualified_hnsd_op = str(hnsd_op)
-        if not qualified_hnsd_op.startswith('//%s/' % getfqdn()):
-            qualified_hnsd_op =  str(hnsd_op)
-            assocs[0].host = None
-        if str(assocs[0]) != qualified_hnsd_op:
-            self.fail('AssociatorNames for %s is not valid' % ucs_op)
-            
-        assocs = self._conn.AssociatorNames(hnsd_op, AssocClass='OMC_ComputerSystemHostNameSettingData')
-        if 1 < len(assocs):
-            self.fail('AssociatorNames of OMC_HostNameSettingData returned multiple instances when only one was expected')
-        qualified_ucs_op = str(ucs_op)
-        if not qualified_ucs_op.startswith('//%s/' % getfqdn()):
-            qualified_ucs_op = str(ucs_op)
-            assocs[0].host = None
-        if str(assocs[0]) != qualified_ucs_op:
-            self.fail('AssociatorNames for %s is not valid' % hnsd_op)
-
     def _run_omcbase_component_tests(self, testname, testmap):
         for classname in testmap.keys():
             if not self._isClassSupported(classname):
@@ -275,9 +276,9 @@
                 testmap[classname]()
 
     def test_unitary_computer_system(self):
-        ucsClasses = {'OMC_UnitaryComputerSystem' : self._omc_unitarycomputersystem_test,
-                'OMC_HostNameSettingData' : self._omc_hostnamesettingdata_test,
-                'OMC_ComputerSystemHostNameSettingData' : self._omc_computersystemhostnamesettingdata_test}
+        ucsClasses = {'OMC_UnitaryComputerSystem' : self._omc_unitarycomputersystem_test}
+#'OMC_HostNameSettingData' : self._omc_hostnamesettingdata_test,
+#'OMC_ComputerSystemHostNameSettingData' : self._omc_computersystemhostnamesettingdata_test}
         self._run_omcbase_component_tests('unitary_computer_system', ucsClasses)
 
 

Modified: test/trunk/OMC_UnixProcess_Test.py
===================================================================
--- test/trunk/OMC_UnixProcess_Test.py	2008-04-11 20:48:14 UTC (rev 566)
+++ test/trunk/OMC_UnixProcess_Test.py	2008-04-11 21:48:53 UTC (rev 567)
@@ -349,7 +349,8 @@
                                         (str(proc['Handle']),str(proc['Name'])))
                     if prop.lower() == "percentcpu":
                         try:
-                            if proc['Name'] in ['python', 'cimprovagt', 'cimservermain']:
+                            if proc['Name'] in ['python', 'cimprovagt', 'cimservermain'\
+                                                'httpd2-prefork']:
                                 break
                             cpu_list = commands.getoutput("/bin/ps -o %%C %s"%str(proc['handle'])).split("\n")
                             if pywbem.Real32(cpu_list[1].split()[0]) != proc['PercentCPU']:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [566] test/trunk/lib/ProviderSanityTest.py

From: <np...@us...> - 2008-04-11 20:48:26

Revision: 566
          http://omc.svn.sourceforge.net/omc/?rev=566&view=rev
Author:   npaxton
Date:     2008-04-11 13:48:14 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
Comment out some checks that may be erroneous

Modified Paths:
--------------
    test/trunk/lib/ProviderSanityTest.py

Modified: test/trunk/lib/ProviderSanityTest.py
===================================================================
--- test/trunk/lib/ProviderSanityTest.py	2008-04-11 20:42:50 UTC (rev 565)
+++ test/trunk/lib/ProviderSanityTest.py	2008-04-11 20:48:14 UTC (rev 566)
@@ -144,11 +144,17 @@
             revAssocNames = conn.AssociatorNames(assocName, AssocClass=assocClassName)
             for name in revAssocNames:
                 name.host=None
+                # Temporarily removing this check:  an association could be defined to a much higher class,
+                # so that by filtering on assocClassName won't necessarily return an object of expected
+                # class name...
+                # Requires further inspection to see if this check is appropriate
+                '''
                 if not pywbem.is_subclass(conn,
                         conn.default_namespace,
                         sub = name.classname,
                         super = roleClassName):
-                    pyunit.fail("reverse associator names returned an object type other than %s: %s" %(roleClassName, name.classname))
+                    pyunit.fail("reverse associator names returned an object type other than %s: %s\nassocName=%s, assocClass=%s" %(roleClassName, name.classname, str(assocName),assocClassName))
+                '''
             _print("Returned original object?",3)
             if testName not in revAssocNames:
                 pyunit.fail("Reverse Associator names from [%s] didn't return the original object: [%s]" %(assocName, testName))
@@ -166,11 +172,17 @@
             # make sure names match... 
             for assoc in revAssocs:
                 assoc.path.host=None
+                # Temporarily removing this check:  an association could be defined to a much higher class,
+                # so that by filtering on assocClassName won't necessarily return an object of expected
+                # class name...
+                # Requires further inspection to see if this check is appropriate
+                '''
                 if not pywbem.is_subclass(conn,
                         conn.default_namespace,
                         sub = assoc.classname,
                         super = roleClassName):
-                    pyunit.fail("reverse associators returned an object type other than %s: %s" %(roleClassname, assoc.classname))
+                    pyunit.fail("reverse associators returned an object type other than %s: %s" %(roleClassName, assoc.classname))
+                '''
                 if assoc.path not in revAssocNames:
                     pyunit.fail("Reverse Associators from [%s] returned an object not returned by reverse associator names: %s" %(assocName,assoc.path))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [565] pybase/trunk

From: <np...@us...> - 2008-04-11 20:44:15

Revision: 565
          http://omc.svn.sourceforge.net/omc/?rev=565&view=rev
Author:   npaxton
Date:     2008-04-11 13:42:50 -0700 (Fri, 11 Apr 2008)

Log Message:
-----------
minor fixes and comments

Modified Paths:
--------------
    pybase/trunk/OMC_LogicalFile.py
    pybase/trunk/OMC_UnixProcess.py

Modified: pybase/trunk/OMC_LogicalFile.py
===================================================================
--- pybase/trunk/OMC_LogicalFile.py	2008-04-11 05:11:48 UTC (rev 564)
+++ pybase/trunk/OMC_LogicalFile.py	2008-04-11 20:42:50 UTC (rev 565)
@@ -641,6 +641,8 @@
 
         """
 
+        #TODO: Check that both sides of association are valid InstanceNames
+        #      and that they are indeed associated
         return model
 
     def enum_instances(self, env, model, cim_class, keys_only):
@@ -780,6 +782,8 @@
 
         """
 
+        #TODO: Check that both sides of association are valid InstanceNames
+        #      and that they are indeed associated
         return model
 
     def enum_instances(self, env, model, cim_class, keys_only):

Modified: pybase/trunk/OMC_UnixProcess.py
===================================================================
--- pybase/trunk/OMC_UnixProcess.py	2008-04-11 05:11:48 UTC (rev 564)
+++ pybase/trunk/OMC_UnixProcess.py	2008-04-11 20:42:50 UTC (rev 565)
@@ -838,7 +838,7 @@
             model['Dependent'] = lp.get_instance_name(model.path.namespace)
             fname = lp.get_module_path()
             if fname:
-                model['Antecedent'] = OMC_LogicalFile.get_file_path(fname)
+                model['Antecedent'] = OMC_LogicalFile.get_file_path(fname, model.path.namespace)
                 yield model
 
     def set_instance(self, env, instance, previous_instance, cim_class):
@@ -869,7 +869,7 @@
                     pass
                 elif not pywbem.is_subclass(env.get_cimom_handle(),
                         object_name.namespace, sub='omc_datafile',
-                        super=result_classname):
+                        super=result_class_name):
                     return
             model['Dependent'] = object_name
             fname = '/proc/%d/exe' % lp.pid


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [564] test/trunk/OMC_UnixProcess_Test.py

From: <ba...@us...> - 2008-04-11 05:11:43

Revision: 564
          http://omc.svn.sourceforge.net/omc/?rev=564&view=rev
Author:   bartw
Date:     2008-04-10 22:11:48 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
added test for sendsignal

Modified Paths:
--------------
    test/trunk/OMC_UnixProcess_Test.py

Modified: test/trunk/OMC_UnixProcess_Test.py
===================================================================
--- test/trunk/OMC_UnixProcess_Test.py	2008-04-10 22:59:07 UTC (rev 563)
+++ test/trunk/OMC_UnixProcess_Test.py	2008-04-11 05:11:48 UTC (rev 564)
@@ -220,6 +220,22 @@
             raise
 
 ################################################################################
+#Test the "sendsignal" method of the unixproc provider
+################################################################################
+    def test_unix_process_sendsignal(self): 
+        try:
+            sleep_proc = subprocess.Popen(["/bin/sleep", "30"])
+            proc_list = self._conn.ExecQuery('WQL', 'SELECT * FROM  OMC_UnixProcess WHERE Handle="%s"' % str(sleep_proc.pid))
+            self.failUnless(len(proc_list) ==1, "Wrong number of results from query")
+            rval = self._conn.InvokeMethod('SendSignal', proc_list[0].path, signal=pywbem.Sint32(9))
+            self.failUnless(sleep_proc.wait() == -9, 'wait() returned unexpected value %s' % sleep_proc.wait())
+            if not rval[0].startswith("Success"):
+                self.add_Error("Error attempting to call SendSignal: %s"%str(rval))
+            self.finalize()
+        except:
+            raise
+
+################################################################################
 #Test the "killall" method of the unixproc provider
 ################################################################################
     def test_unix_process_killall(self): #KillAll


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [563] test/trunk

From: <kwo...@us...> - 2008-04-10 22:59:04

Revision: 563
          http://omc.svn.sourceforge.net/omc/?rev=563&view=rev
Author:   kwoodson
Date:     2008-04-10 15:59:07 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
Updated tests

Modified Paths:
--------------
    test/trunk/OMC_InitdService_Test.py
    test/trunk/OMC_UnixProcess_Test.py

Modified: test/trunk/OMC_InitdService_Test.py
===================================================================
--- test/trunk/OMC_InitdService_Test.py	2008-04-10 22:26:05 UTC (rev 562)
+++ test/trunk/OMC_InitdService_Test.py	2008-04-10 22:59:07 UTC (rev 563)
@@ -7,6 +7,7 @@
 import math
 import time 
 import commands 
+import subprocess 
 from socket import getfqdn
 from time import sleep
 sys.path.append(os.path.join(os.getcwd(), "lib"))
@@ -15,17 +16,19 @@
 
 def get_status(service):
     try:
-        status = commands.getoutput("/etc/init.d/%s status"%str(service))
-        if status.endswith("running"):
-            return 2
-        elif status.endswith("unused"):
-            return 10
-        elif status.endswith("dead"):
-            return 6
-        elif status.endswith("unknown"):
-            return 0
-        else:
-            return -1
+#status = commands.getoutput("/etc/init.d/%s status"%str(service))
+        proc = subprocess.Popen(["/etc/init.d/%s"%str(service),"status"], stdout=subprocess.PIPE)
+        status = proc.wait()
+        if proc.returncode == 0:
+                return 2#OperationalStatus OK
+        elif proc.returncode == 1:
+            return 6#Error
+        elif proc.returncode == 2:
+            return 6#Error
+        elif proc.returncode == 3:
+            return 10#Stopped
+        elif proc.returncode == 4:
+            return 0#Unknown
     except:
         raise
 
@@ -77,7 +80,7 @@
             if len(cim_serv_name_list) != len(cim_serv_list):
                 self.add_Error("Lengths of instances and instance names don't match")
 
-#pick a list of services and check operational status
+            #pick a list of services and check operational status
             for inst in cim_serv_list:
                 if inst['Name'] in ['postfix',"smb","xinetd","haldaemon", "random"]:
                     status = get_status(inst['Name'])

Modified: test/trunk/OMC_UnixProcess_Test.py
===================================================================
--- test/trunk/OMC_UnixProcess_Test.py	2008-04-10 22:26:05 UTC (rev 562)
+++ test/trunk/OMC_UnixProcess_Test.py	2008-04-10 22:59:07 UTC (rev 563)
@@ -385,7 +385,7 @@
                                     (str(proc['handle']),str(proc['Name'])))
                     if prop.lower() == "realuserid":
                         try:
-                            user = commands.getoutput("/bin/ps -o %%U %s"%\
+                            user = commands.getoutput("/bin/ps -o %%u %s"%\
                                         str(proc['handle'])).split("\n")[1]
                             user_id = commands.getoutput("/usr/bin/id -u %s"%str(user))
                             if pywbem.Uint64(user_id) != proc['RealUserID']:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [562] pybase/trunk/OMC_OperatingSystem.py

From: <ba...@us...> - 2008-04-10 22:26:02

Revision: 562
          http://omc.svn.sourceforge.net/omc/?rev=562&view=rev
Author:   bartw
Date:     2008-04-10 15:26:05 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
fixed timezone and some memory related properties

Modified Paths:
--------------
    pybase/trunk/OMC_OperatingSystem.py

Modified: pybase/trunk/OMC_OperatingSystem.py
===================================================================
--- pybase/trunk/OMC_OperatingSystem.py	2008-04-10 17:59:58 UTC (rev 561)
+++ pybase/trunk/OMC_OperatingSystem.py	2008-04-10 22:26:05 UTC (rev 562)
@@ -80,21 +80,23 @@
 
         uex = model.update_existing
 
-        uex(TotalSwapSpaceSize = pywbem.Uint64(meminfo['SwapTotal']))
-        uex(FreePhysicalMemory = pywbem.Uint64(meminfo['MemFree']))
+        #uex(TotalSwapSpaceSize = pywbem.Uint64(meminfo['SwapTotal']))
+        uex(TotalSwapSpaceSize = None) # not distinguished from page files.
+        uex(FreePhysicalMemory = pywbem.Uint64(meminfo['MemFree'] +
+                    meminfo['Buffers'] + meminfo['Cached']))
         uex(FreeVirtualMemory = pywbem.Uint64(meminfo['MemFree'] +
-                    meminfo['Buffers'] + meminfo['Cached']))
+                    meminfo['Buffers'] + meminfo['Cached'] + 
+                    meminfo['SwapFree']))
         uex(TotalVisibleMemorySize = pywbem.Uint64(meminfo['MemTotal']))
         uex(TotalVirtualMemorySize = pywbem.Uint64(meminfo['MemTotal'] +
                     meminfo['SwapTotal']))
-        uex(FreeSpaceInPagingFiles = pywbem.Uint64(int(meminfo['SwapFree']) / 1024))
-        uex(SizeStoredInPagingFiles = pywbem.Uint64(meminfo['SwapTotal']/1024))
+        uex(FreeSpaceInPagingFiles = pywbem.Uint64(meminfo['SwapFree']))
+        uex(SizeStoredInPagingFiles = pywbem.Uint64(meminfo['SwapTotal']))
         
         fnames = os.listdir('/proc')
         numprocs = len([x for x in fnames if x.isdigit()])
         uex(NumberOfProcesses = pywbem.Uint32(numprocs))
-        uex(CurrentTimeZone = pywbem.Sint16(
-            (time.mktime(time.localtime()) - time.mktime(time.gmtime())) / 60))
+        uex(CurrentTimeZone = pywbem.Sint16(pywbem.CIMDateTime.get_local_utcoffset()))
         uex(LocalDateTime = pywbem.CIMDateTime.now())
         fo = open('/proc/uptime', 'r')
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [561] test/trunk

From: <kwo...@us...> - 2008-04-10 18:00:00

Revision: 561
          http://omc.svn.sourceforge.net/omc/?rev=561&view=rev
Author:   kwoodson
Date:     2008-04-10 10:59:58 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
Updated tests

Modified Paths:
--------------
    test/trunk/OMC_OperatingSystem_Test.py
    test/trunk/OMC_Syslog_Test.py
    test/trunk/OMC_UnitaryComputerSystem_Test.py
    test/trunk/OMC_UnixProcess_Test.py

Added Paths:
-----------
    test/trunk/OMC_InitdService_Test.py

Added: test/trunk/OMC_InitdService_Test.py
===================================================================
--- test/trunk/OMC_InitdService_Test.py	                        (rev 0)
+++ test/trunk/OMC_InitdService_Test.py	2008-04-10 17:59:58 UTC (rev 561)
@@ -0,0 +1,183 @@
+#!/usr/bin/env python
+
+import pywbem
+import unittest
+import sys
+import os
+import math
+import time 
+import commands 
+from socket import getfqdn
+from time import sleep
+sys.path.append(os.path.join(os.getcwd(), "lib"))
+import wbem_connection
+import EnhancedTestCase
+
+def get_status(service):
+    try:
+        status = commands.getoutput("/etc/init.d/%s status"%str(service))
+        if status.endswith("running"):
+            return 2
+        elif status.endswith("unused"):
+            return 10
+        elif status.endswith("dead"):
+            return 6
+        elif status.endswith("unknown"):
+            return 0
+        else:
+            return -1
+    except:
+        raise
+
+def get_chkconfig_list():
+    try:
+        service_list = {}
+        list =  commands.getoutput("/sbin/chkconfig").split("\n")
+        for elem in list:
+            service_list[elem.split()[0]] = elem.split()[1]
+        return service_list
+    except:
+        raise
+
+def get_initd_list():
+    try:
+        services = commands.getoutput("find  /etc/init.d/ -maxdepth 1 -perm \"/+x\"  "\
+                    "| awk -F \"/\" '{ print $4 }' | grep -Ev ^boot\.? | grep -v halt "\
+                    "| grep -v reboot | grep -v rc | grep -v skel | grep -v single "\
+                    "| grep -v powerfail").split()
+        
+        return services
+    except:
+        raise
+
+class OMC_InitdService_Test(EnhancedTestCase.EnhTestCase):
+
+    def setUp(self):
+        unittest.TestCase.setUp(self)
+        wconn = wbem_connection.wbem_connection()
+        self._conn = wconn.get_wbem_connection()
+        self._orig_hostname = getfqdn()
+        
+    def tearDown(self):
+        self.clear_errors()
+        unittest.TestCase.tearDown(self)
+
+    def test_initd_service_enumeration(self):
+        """Test initd Enumeration"""
+        try:
+            services = get_initd_list()
+            cim_serv_list = self._conn.EnumerateInstances("OMC_InitdService")
+            self.failUnless(len(cim_serv_list) > 0, "No Initd Service instances returned")
+            if math.fabs(len(services) - len(cim_serv_list)) > 10:
+                self.add_Error("Difference in total services is too great")
+
+            cim_serv_name_list = self._conn.EnumerateInstances("OMC_InitdService")
+            self.failUnless(len(cim_serv_name_list) > 0, "No Initd Service instances returned")
+
+            if len(cim_serv_name_list) != len(cim_serv_list):
+                self.add_Error("Lengths of instances and instance names don't match")
+
+#pick a list of services and check operational status
+            for inst in cim_serv_list:
+                if inst['Name'] in ['postfix',"smb","xinetd","haldaemon", "random"]:
+                    status = get_status(inst['Name'])
+                    if pywbem.Uint16(status) != inst['OperationalStatus'][0]:
+                        self.add_Error("Name: %s: Incorrect Status reported"%str(inst['Name']))
+                    elif status == -1:
+                        self.add_Error("Name: %s: Unknown status: %s"%(str(isnt['Name'],str(status))))
+            self.finalize()
+        except:
+            raise
+
+    def test_initd_methods(self):
+        """ Test Initd Methods"""
+        try:
+            cim_serv_list = self._conn.EnumerateInstances("OMC_InitdService")
+            self.failUnless(len(cim_serv_list) > 0, "No Initd Service instances returned")
+
+            for inst in cim_serv_list:
+                if inst['Name'] == "postfix":
+                    break
+            else:
+                self.fail("Couldn't find postfix service: Aborted.")
+            #RestartService
+            rval, outparams = self._conn.InvokeMethod("RestartService", inst.path)
+            if rval != pywbem.Uint32(0):
+                self.add_Error("Error calling RestartService")
+            else:
+                status = get_status(inst['name'])
+                if pywbem.Uint16(status)  != pywbem.Uint16(2):
+                    self.add_Error("Error calling RestartService: ServiceState: %s"\
+                                %str(status))
+            #StopService
+            rval, outparams = self._conn.InvokeMethod("StopService", inst.path)
+            if rval != pywbem.Uint32(0):
+                self.add_Error("Error calling StopService")
+            else:
+                status = get_status(inst['name'])
+                if pywbem.Uint16(status)  != pywbem.Uint16(10):
+                    self.add_Error("Error calling StopService: ServiceState: %s"\
+                                %str(status))
+            #StartService
+            rval, outparams = self._conn.InvokeMethod("StartService", inst.path)
+            if rval != pywbem.Uint32(0):
+                self.add_Error("Error calling StartService")
+            else:
+                status = get_status(inst['name'])
+                if pywbem.Uint16(status)  != pywbem.Uint16(2):
+                    self.add_Error("Error calling StartService: ServiceState: %s"\
+                                %str(status))
+            #ReloadService
+            rval, outparams = self._conn.InvokeMethod("ReloadService", inst.path)
+            if rval != pywbem.Uint32(0):
+                self.add_Error("Error calling ReloadService")
+            else:
+                status = get_status(inst['name'])
+                if pywbem.Uint16(status)  != pywbem.Uint16(2):
+                    self.add_Error("Error calling ReloadService: ServiceState: %s"\
+                                %str(status))
+            #ForceReloadService
+            try:
+                rval, outparams = self._conn.InvokeMethod("ForceReloadService", inst.path)
+                if rval != pywbem.Uint32(0):
+                    self.add_Error("Error calling ForceReloadService")
+            except pywbem.CIMError, err:
+                if err[0] != pywbem.CIM_ERR_METHOD_NOT_AVAILABLE:
+                    self.add_Error("Error calling ForceReloadService: %s"%str(err[0]))
+            #ServiceStatus
+            rval, outparams = self._conn.InvokeMethod("ServiceStatus", inst.path)
+            if rval != pywbem.Uint32(0):
+                self.add_Error("Error calling ServiceStatus")
+            else:
+                status = get_status(inst['name'])
+                if pywbem.Uint16(status)  != pywbem.Uint16(2):
+                    self.add_Error("Error calling ServiceStatus: ServiceState: %s"\
+                                %str(status))
+            #DisableService
+            try:
+                rval, outparams = self._conn.InvokeMethod("DisableService", inst.path)
+                if rval != pywbem.Uint32(0):
+                    self.add_Error("Error calling DisableService")
+            except pywbem.CIMError, err:
+                if err[0] != pywbem.CIM_ERR_METHOD_NOT_AVAILABLE:
+                    self.add_Error("Error calling DisableService: %s"%str(err[0]))
+            #EnableService
+            try:
+                rval, outparams = self._conn.InvokeMethod("EnableService", inst.path)
+                if rval != pywbem.Uint32(0):
+                    self.add_Error("Error calling EnableService")
+            except pywbem.CIMError, err:
+                if err[0] != pywbem.CIM_ERR_METHOD_NOT_AVAILABLE:
+                    self.add_Error("Error calling EnableService: %s"%str(err[0]))
+
+            self.finalize()
+        except:
+            raise
+
+def get_unit_test():
+    return (OMC_InitdService_Test)
+
+if __name__ == '__main__': 
+    suite = unittest.makeSuite(OMC_InitdService_Test)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+


Property changes on: test/trunk/OMC_InitdService_Test.py
___________________________________________________________________
Name: svn:executable
   + *

Modified: test/trunk/OMC_OperatingSystem_Test.py
===================================================================
--- test/trunk/OMC_OperatingSystem_Test.py	2008-04-10 17:08:50 UTC (rev 560)
+++ test/trunk/OMC_OperatingSystem_Test.py	2008-04-10 17:59:58 UTC (rev 561)
@@ -107,7 +107,7 @@
                         self.add_Error("FreePhysicalMemory is incorrect")
                 if key.lower() == "freespaceinpagingfiles":
                     mem = get_free_mem("SwapFree")
-                    if math.fabs(int(mem) - int(os['FreeSpaceInPagingFiles'])) > _epsilon:
+                    if math.fabs(int(mem/1024) - int(os['FreeSpaceInPagingFiles'])) > _epsilon:
                         self.add_Error("FreeSpaceInPagingFiles is incorrect")
                 if key.lower() == "totalswapspacesize":
                     mem = get_free_mem("SwapTotal")

Modified: test/trunk/OMC_Syslog_Test.py
===================================================================
--- test/trunk/OMC_Syslog_Test.py	2008-04-10 17:08:50 UTC (rev 560)
+++ test/trunk/OMC_Syslog_Test.py	2008-04-10 17:59:58 UTC (rev 561)
@@ -13,14 +13,22 @@
 import wbem_connection
 import EnhancedTestCase
 
+################################################################################
+# Method to compare the cim representation of the log file with the 
+# actual log file from the filesystem.
+# Returns a list of the lines that do not match.
+# If a file has more than 25 lines/records, then we randomly test 5 lines
+# from that file.  Less than 25, we test all of them.
+################################################################################
 def compare_log_records(records, cim_inst):
     try:
         path = cim_inst['InstanceID'].split(":")[1]
-        file = open(path, "r").readlines()
+        fd = open(path, "r")
+        file = fd.readlines()
         errors = []
         if len(records) > 25:
             for num in range(1, 6):
-                rand = random.randint(0, len(records))
+                rand = random.randint(0, len(records)-1)
                 if str(records[rand]['RecordData']).lower() != file[rand].rstrip("\n").lower():
                     errors.append("File: %s Line %s:\n ***%s*** != ***%s***"%\
                         (str(path),str(rand),str(records[rand]['RecordData']),\
@@ -34,10 +42,16 @@
                             (str(path),str(num),str(records[num]['RecordData']),\
                             str(file[num].rstrip("\n"))))
                     num += 1
+        fd.close()
         return errors
     except:
+        fd.close()
         raise
 
+################################################################################
+#Method that parses the syslog-ng.conf file 
+#Returns a list of log files that syslog is managing.
+################################################################################
 def get_syslog_file_list():
     try:
         syslog_files = []
@@ -47,10 +61,15 @@
                 if line.find("file") > 0:
                     if not (line.split()[3].split("\"")[1]).startswith("/dev"):
                         syslog_files.append(line.split()[3].split("\"")[1])
+        syslog.close()
         return syslog_files
     except:
+        syslog.close()
         raise
 
+################################################################################
+#Test class for Syslog
+################################################################################
 class OMC_Syslog_Test(EnhancedTestCase.EnhTestCase):
 
     def setUp(self):
@@ -63,6 +82,9 @@
         self.clear_errors()
         unittest.TestCase.tearDown(self)
 
+################################################################################
+#Test Syslog Enumeration
+################################################################################
     def test_syslog_enumeration(self):
         """Testing Enumeration of OMC_SyslogNGRecordLog"""
         try:
@@ -91,6 +113,9 @@
         except:
             raise
 
+################################################################################
+#Test Syslog's ClearLog() function 
+################################################################################
     def test_syslog_clear_log(self):
         """Syslog CearLog test"""
         try:
@@ -120,6 +145,9 @@
         except:
             raise
 
+################################################################################
+#Test the records from the syslog files by calling the compare function
+################################################################################
     def test_syslog_log_record(self):
         """Syslog_LogRecord Test"""
         try:

Modified: test/trunk/OMC_UnitaryComputerSystem_Test.py
===================================================================
--- test/trunk/OMC_UnitaryComputerSystem_Test.py	2008-04-10 17:08:50 UTC (rev 560)
+++ test/trunk/OMC_UnitaryComputerSystem_Test.py	2008-04-10 17:59:58 UTC (rev 561)
@@ -13,6 +13,10 @@
 _globalNamespace = "root/cimv2"
 _globalVerbose = True
 
+################################################################################
+# Test for the OMC_UnitaryComputerSystem
+# 
+################################################################################
 class OMC_UnitaryComputerSystem_Test(unittest.TestCase):
 
     _supportedClasses = {}

Modified: test/trunk/OMC_UnixProcess_Test.py
===================================================================
--- test/trunk/OMC_UnixProcess_Test.py	2008-04-10 17:08:50 UTC (rev 560)
+++ test/trunk/OMC_UnixProcess_Test.py	2008-04-10 17:59:58 UTC (rev 561)
@@ -59,6 +59,9 @@
              "rt_priority": 39,
              "policy": 40 }
 
+################################################################################
+#Return a process start time
+################################################################################
 def get_start_time(pid):
     try:
         date = commands.getoutput("/bin/ps o lstart %s | grep -iv started"%str(pid))
@@ -67,6 +70,9 @@
     except:
         raise
 
+################################################################################
+#Get a specific value out of the /proc/<pid>/stat file
+################################################################################
 def get_stat_value(pid, value):
     try:
         stats = open("/proc/%s/stat"%str(pid), "r")
@@ -77,6 +83,9 @@
         raise
         stats.close()
 
+################################################################################
+#Return the path to the process
+################################################################################
 def get_module_path(path):
     try:
         link = os.readlink(os.path.join(path, "exe"))
@@ -84,6 +93,9 @@
     except OSError, err:
         return None
 
+################################################################################
+#Sort an unordered list
+################################################################################
 def sort_func(x, y):
     x = int(x)
     y = int(y)
@@ -94,6 +106,9 @@
     else:
         return -1
     
+################################################################################
+#Read and return all processes
+################################################################################
 def get_procs():
     try:
         orig_path = os.getcwd()
@@ -111,6 +126,9 @@
     except:
         raise
 
+################################################################################
+#Return a value from the /proc/<pid>/status file
+################################################################################
 def get_status_value(pid, prop):
     try:
         name_line = None
@@ -129,6 +147,9 @@
         raise
         file.close()
 
+################################################################################
+#Return a list of the processes parameters
+################################################################################
 def get_params(handle):
     try:
         params = open("/proc/%s/cmdline"%str(handle),"r")
@@ -165,8 +186,13 @@
         wconn = wbem_connection.wbem_connection()
         self._conn = wconn.get_wbem_connection() 
 
-    def tearDown(self): unittest.TestCase.tearDown(self)
+    def tearDown(self): 
+        self.clear_errors()
+        unittest.TestCase.tearDown(self)
 
+################################################################################
+#Test enumeration of the unix process provider
+################################################################################
     def test_unix_process_enumeration(self):
         try:
             list_of_cimprocs = []
@@ -193,11 +219,12 @@
         except pywbem.CIMError, arg:
             raise
 
+################################################################################
+#Test the "killall" method of the unixproc provider
+################################################################################
     def test_unix_process_killall(self): #KillAll
         try:
-            return
             sleep_proc = subprocess.Popen(["/bin/sleep", "30"])
-            print sleep_proc.pid
             poll_status = sleep_proc.poll()
             proc_list = self._conn.EnumerateInstances("OMC_UnixProcess")
             self.failUnless(len(proc_list) > 0, "No UnixProcesses returned")
@@ -209,15 +236,17 @@
                     break
             while poll_status == None:
                 poll_status = sleep_proc.poll()
-                sleep(1)
                 
-            if poll_status != 9:
+            if poll_status != -15:
                 self.add_Error("Error killing process: EC=%s"%str(sleep_proc.poll()))
 
             self.finalize()
         except:
             raise
 
+################################################################################
+#Test some of the associations with the unixprocess
+################################################################################
     def test_unix_process_associations(self):
         try:
             #Get process #1
@@ -248,6 +277,9 @@
         except:
             raise
 
+################################################################################
+#Test the properties of the unixprocess
+################################################################################
     def test_unix_process_properties(self):
         try:
             cim_procs = self._conn.EnumerateInstances("OMC_UnixProcess")
@@ -327,8 +359,6 @@
                                         (str(proc['handle']),str(proc['Name'])))
                         except:
                             raise
-##############
-# Check signedprocessnicevalue
                     if prop.lower() == "signedprocessnicevalue":
                         nice_list = commands.getoutput("/bin/ps -o %%n %s"%str(proc['handle'])).split("\n")
                         if nice_list[1].split()[0] == "-":
@@ -339,9 +369,8 @@
                         if nice != proc['SignedProcessNiceValue']:
                             self.add_Error("PID: %s : SignedProcessNiceValue is incorrect: %s:%s"%\
                                     (str(proc['handle']),str(proc['Name']),str(proc['SignedProcessNiceValue'])))
-#############
                     if prop.lower() == "priority":
-                        if proc['Name'] in ['nscd','hald-addon-stor']:
+                        if proc['Name'] in ['nscd','hald-addon-stor','gdmgreeter','cimserver']:
                             break
                         priority = get_stat_value(proc['Handle'], value="priority")
                         if int(priority) < 0:
@@ -378,8 +407,11 @@
                             tty = commands.getoutput("/bin/ps -o %%y %s"%\
                                         str(proc['handle'])).split("\n")[1]
                             if tty == "?":
-                                tty = 0
-                            if str(tty) != proc['ProcessTTY']:
+                                tty = None
+                            else:
+                                tty = "/dev/%s"%str(tty)
+                            
+                            if tty != proc['ProcessTTY']:
                                 self.add_Error("PID: %s : ProcessTTY is incorrect: %s"%\
                                         (str(proc['handle']),str(proc['Name'])))
                         except:
@@ -406,7 +438,6 @@
                                             (str(proc['handle']),str(proc['Name'])))
                         except:
                             raise
-##        Currently this isn't working in the provider.  Uncomment when its fixed 
                     if prop.lower() == "residentsetsize":
                         try:
                             if proc['Name'] in ['cimprovagt', 'cimservermain']:
@@ -417,7 +448,6 @@
                                             (str(proc['handle']),str(proc['Name'])))
                         except:
                             raise
-
                     if prop.lower() == "creationdate":
                         try:
                             time_equal = False
@@ -440,11 +470,9 @@
             raise
 
            #TODO
-           #Fill in the following methods
            #SendSignal
            #RequestStateChange
 
-
 def get_unit_test():
     return (OMC_UnixProcess_Test)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [560] test/trunk/lib/ProviderSanityTest.py

From: <np...@us...> - 2008-04-10 17:08:48

Revision: 560
          http://omc.svn.sourceforge.net/omc/?rev=560&view=rev
Author:   npaxton
Date:     2008-04-10 10:08:50 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
Don't try Garbage in Keys if 0 instances

Modified Paths:
--------------
    test/trunk/lib/ProviderSanityTest.py

Modified: test/trunk/lib/ProviderSanityTest.py
===================================================================
--- test/trunk/lib/ProviderSanityTest.py	2008-04-10 17:02:43 UTC (rev 559)
+++ test/trunk/lib/ProviderSanityTest.py	2008-04-10 17:08:50 UTC (rev 560)
@@ -312,13 +312,14 @@
     #now put garbage in one of key properties, then getInstance...
     #test whether the provider is checking the properties on getInstance request
     _print("GetInstance with garbage keys?",1)
-    instName = instNames[0]
-    instName.keys()[0] = "GarbageData(!*#$*()#"
-    try:
-        inst = conn.GetInstance(instName)
-        pyunit.fail("Successfully retrieved instance with garbage data in key")
-    except:
-        pass
+    if (len(instNames) > 0):
+        instName = instNames[0]
+        instName.keys()[0] = "GarbageData(!*#$*()#"
+        try:
+            inst = conn.GetInstance(instName)
+            pyunit.fail("Successfully retrieved instance with garbage data in key")
+        except:
+            pass
     
     _print("Leaving InstanceSanityCheck")
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [559] test/trunk/lib/ProviderSanityTest.py

From: <np...@us...> - 2008-04-10 17:02:41

Revision: 559
          http://omc.svn.sourceforge.net/omc/?rev=559&view=rev
Author:   npaxton
Date:     2008-04-10 10:02:43 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
add test for garbage data in keys for GetInstance

Modified Paths:
--------------
    test/trunk/lib/ProviderSanityTest.py

Modified: test/trunk/lib/ProviderSanityTest.py
===================================================================
--- test/trunk/lib/ProviderSanityTest.py	2008-04-09 22:58:04 UTC (rev 558)
+++ test/trunk/lib/ProviderSanityTest.py	2008-04-10 17:02:43 UTC (rev 559)
@@ -309,6 +309,17 @@
                 pyunit.fail("Retrieved an instance with empty required "
                             "property [%s].  InstanceName: %s " %(propName, inst.path))
 
+    #now put garbage in one of key properties, then getInstance...
+    #test whether the provider is checking the properties on getInstance request
+    _print("GetInstance with garbage keys?",1)
+    instName = instNames[0]
+    instName.keys()[0] = "GarbageData(!*#$*()#"
+    try:
+        inst = conn.GetInstance(instName)
+        pyunit.fail("Successfully retrieved instance with garbage data in key")
+    except:
+        pass
+    
     _print("Leaving InstanceSanityCheck")
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Omc-commit] SF.net SVN: omc: [558] pybase/trunk/OMC_UnixProcess.py

From: <ba...@us...> - 2008-04-09 22:58:12

Revision: 558
          http://omc.svn.sourceforge.net/omc/?rev=558&view=rev
Author:   bartw
Date:     2008-04-09 15:58:04 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
fixed so non-root users can enumerate processes

Modified Paths:
--------------
    pybase/trunk/OMC_UnixProcess.py

Modified: pybase/trunk/OMC_UnixProcess.py
===================================================================
--- pybase/trunk/OMC_UnixProcess.py	2008-04-09 19:48:11 UTC (rev 557)
+++ pybase/trunk/OMC_UnixProcess.py	2008-04-09 22:58:04 UTC (rev 558)
@@ -478,14 +478,17 @@
         tty_n = ps['tty_number']
         ux(ProcessTTY=None)
         if tty_n > 0:
-            for fd in os.listdir('/proc/%s/fd' % lp.pid):
-                slink = '/proc/%s/fd/%s' % (lp.pid, fd)
-                try:
-                    if os.stat(slink).st_rdev == tty_n:
-                        ux(ProcessTTY=os.readlink(slink))
-                        break
-                except OSError:
-                    pass
+            try:
+                for fd in os.listdir('/proc/%s/fd' % lp.pid):
+                    slink = '/proc/%s/fd/%s' % (lp.pid, fd)
+                    try:
+                        if os.stat(slink).st_rdev == tty_n:
+                            ux(ProcessTTY=os.readlink(slink))
+                            break
+                    except OSError:
+                        pass
+            except OSError:
+                pass
         pri = ps['priority']
         if pri < 0:
             pri = 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 22 23 24 25 26 .. 31 > >> (Page 24 of 31)

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