Menu
▾
▴
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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
|
2
(1) |
3
(2) |
4
(5) |
5
|
|
6
|
7
(7) |
8
(2) |
9
(3) |
10
(5) |
11
(4) |
12
|
|
13
|
14
|
15
|
16
|
17
|
18
|
19
|
|
20
|
21
(2) |
22
(8) |
23
(11) |
24
(3) |
25
(1) |
26
|
|
27
|
28
|
29
(2) |
30
(1) |
|
|
|
|
From: <jc...@us...> - 2008-04-30 17:10:59
|
Revision: 595
http://omc.svn.sourceforge.net/omc/?rev=595&view=rev
Author: jcarey
Date: 2008-04-30 10:11:01 -0700 (Wed, 30 Apr 2008)
Log Message:
-----------
Clean up
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c 2008-04-29 22:55:15 UTC (rev 594)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c 2008-04-30 17:11:01 UTC (rev 595)
@@ -111,8 +111,7 @@
_db_busy_handler(void* cbdata, int call_count)
{
// Logging?
- if (call_count > 10)
- {
+ if (call_count > 10) {
// Been waiting for the lock condition for to long.
// return failure, so the sqlite call will fail.
return 0;
@@ -129,10 +128,8 @@
static int
_str_is_empty(const char* str)
{
- if (str)
- {
- while (*str)
- {
+ if (str) {
+ while (*str) {
if (!isspace(*str))
return 0;
str++;
@@ -149,8 +146,7 @@
{
struct stat st;
if (stat(path, &st) == 0
- && S_ISDIR(st.st_mode))
- {
+ && S_ISDIR(st.st_mode)) {
return 1;
}
return 0;
@@ -170,20 +166,16 @@
cur_path[0] = '\0';
toks = omcStrTokenize(path, "/", &number_of_toks);
- if (!toks)
- {
+ if (!toks) {
// Invalid path?
return -1;
}
- for(i = 0; toks[i]; i++)
- {
+ for(i = 0; toks[i]; i++) {
omcStrAppend(cur_path, "/", sizeof(cur_path));
omcStrAppend(cur_path, toks[i], sizeof(cur_path));
- if (!_is_dir(cur_path))
- {
- if (mkdir(cur_path, 0755) != 0)
- {
+ if (!_is_dir(cur_path)) {
+ if (mkdir(cur_path, 0755) != 0) {
return -1;
}
}
@@ -204,22 +196,19 @@
{
char *zErr = 0;
- if (!_is_dir(VMB_DB_DIR))
- {
- if (_make_dirs(VMB_DB_DIR) != 0)
- {
+ if (!_is_dir(VMB_DB_DIR)) {
+ if (_make_dirs(VMB_DB_DIR) != 0) {
omcStrNCpy(err_msg, "Failed to create directory "VMB_DB_DIR,
err_msg_len);
return -1;
}
}
// If database doesn't exist
- if (access(VMB_DB_NAME, F_OK) != 0)
- { // Database does NOT exist
+ if (access(VMB_DB_NAME, F_OK) != 0) {
+ // Database does NOT exist
// Create Database
- if (sqlite3_open(VMB_DB_NAME, db))
- {
+ if (sqlite3_open(VMB_DB_NAME, db)) {
snprintf(err_msg, err_msg_len,
"Failed to open database "VMB_DB_NAME": %s",
sqlite3_errmsg(*db));
@@ -227,26 +216,21 @@
return -1;
}
// Extend schema
- if (sqlite3_exec(*db, _create_sql, NULL, NULL, &zErr) != SQLITE_OK)
- {
- if (zErr != NULL)
- {
+ if (sqlite3_exec(*db, _create_sql, NULL, NULL, &zErr) != SQLITE_OK) {
+ if (zErr != NULL) {
snprintf(err_msg, err_msg_len,
"Failed executing sql statement: %s", zErr);
sqlite3_free(zErr);
}
- else
- {
+ else {
omcStrNCpy(err_msg, "Failed executing sql statement", err_msg_len);
}
sqlite3_close(*db);
return -1;
}
}
- else
- { // Database does exist - Just open
- if (sqlite3_open(VMB_DB_NAME, db))
- {
+ else { // Database does exist - Just open
+ if (sqlite3_open(VMB_DB_NAME, db)) {
snprintf(err_msg, err_msg_len,
"Failed to open database "VMB_DB_NAME": %s",
sqlite3_errmsg(*db));
@@ -266,28 +250,24 @@
size_t err_msg_len)
{
VMBDBCtx_t *pctx;
- if (_str_is_empty(query))
- {
+ if (_str_is_empty(query)) {
omcStrNCpy(err_msg, "Invalid parameter: query arg is required",
err_msg_len);
return -1;
}
pctx = (VMBDBCtx_t*) calloc(1, sizeof(VMBDBCtx_t));
- if (!pctx)
- {
+ if (!pctx) {
omcStrNCpy(err_msg, "Memory Allocation Error", err_msg_len);
return -1;
}
- if (_get_db_connection(&pctx->db, err_msg, err_msg_len) != 0)
- {
+ if (_get_db_connection(&pctx->db, err_msg, err_msg_len) != 0) {
free(pctx);
return -1;
}
if (sqlite3_prepare(pctx->db, query, strlen(query), &pctx->stmt,
- &pctx->tail) != SQLITE_OK)
- {
+ &pctx->tail) != SQLITE_OK) {
snprintf(err_msg, err_msg_len, "Failed preparing DB Query: %s",
sqlite3_errmsg(pctx->db));
sqlite3_finalize(pctx->stmt);
@@ -309,10 +289,8 @@
db_destroy_connection(VMBDBCtx ctx)
{
VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
- if (pctx)
- {
- if (pctx->stmt)
- {
+ if (pctx) {
+ if (pctx->stmt) {
sqlite3_finalize(pctx->stmt);
}
sqlite3_close(pctx->db);
@@ -338,13 +316,9 @@
int db_goto_next_row(VMBDBCtx ctx)
{
VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
- if (pctx)
- {
- if (pctx->lastcc == SQLITE_ROW)
- {
- pctx->lastcc = sqlite3_step(pctx->stmt);
- return 0;
- }
+ if (pctx && pctx->lastcc == SQLITE_ROW) {
+ pctx->lastcc = sqlite3_step(pctx->stmt);
+ return 0;
}
return -1;
}
@@ -368,8 +342,9 @@
db_get_column_data(VMBDBCtx ctx, size_t column_index)
{
VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
- if (pctx && pctx->col_count && column_index < pctx->col_count)
+ if (pctx && pctx->col_count && column_index < pctx->col_count) {
return sqlite3_column_text(pctx->stmt, (int)column_index);
+ }
return NULL;
}
@@ -406,27 +381,22 @@
char* zErr = NULL;
long long insert_row_id = -1LL;
- if (_get_db_connection(&db, err_msg, err_msg_len) != 0)
- {
+ if (_get_db_connection(&db, err_msg, err_msg_len) != 0) {
return -1LL;
}
cc = sqlite3_exec(db, sql, NULL, NULL, &zErr);
- if (cc != SQLITE_OK)
- {
- if (zErr)
- {
+ if (cc != SQLITE_OK) {
+ if (zErr) {
snprintf(err_msg, err_msg_len,
"Failed executing sql statement: %s", zErr);
sqlite3_free(zErr);
}
- else
- {
+ else {
omcStrNCpy(err_msg, "Failed executing sql statement", err_msg_len);
}
}
- else
- {
+ else {
insert_row_id = sqlite3_last_insert_rowid(db);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-29 22:55:25
|
Revision: 594
http://omc.svn.sourceforge.net/omc/?rev=594&view=rev
Author: jcarey
Date: 2008-04-29 15:55:15 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
Changed format to not be tied to a db context
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c 2008-04-29 22:32:28 UTC (rev 593)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c 2008-04-29 22:55:15 UTC (rev 594)
@@ -100,7 +100,6 @@
int col_count;
char** row_data;
int lastcc;
- char* format_buf;
} VMBDBCtx_t;
/*
@@ -318,10 +317,6 @@
}
sqlite3_close(pctx->db);
free(pctx);
- if (pctx->format_buf)
- {
- sqlite3_free(pctx->format_buf);
- }
}
}
@@ -379,25 +374,22 @@
}
char*
-db_format_sql(VMBDBCtx ctx, const char* format, ...)
+db_create_formatted_sql(const char* format, ...)
{
va_list marker;
- VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
- if (!pctx)
- {
- return NULL;
- }
- if (pctx->format_buf)
- {
- sqlite3_free(pctx->format_buf);
- pctx->format_buf = NULL;
- }
+ char* formatted_sql;
va_start(marker, format);
- pctx->format_buf = sqlite3_vmprintf(format, marker);
+ formatted_sql = sqlite3_vmprintf(format, marker);
va_end(marker);
- return pctx->format_buf;
+ return formatted_sql;
}
+void
+db_destroy_formatted_sql(char* formatted_sql)
+{
+ sqlite3_free(formatted_sql);
+}
+
/*
* Execute the specified sql against the database.
* If the operation fails -1LL will be returned with
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h 2008-04-29 22:32:28 UTC (rev 593)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h 2008-04-29 22:55:15 UTC (rev 594)
@@ -15,7 +15,8 @@
int db_goto_next_row(VMBDBCtx ctx);
int db_get_column_count(VMBDBCtx ctx);
const unsigned char* db_get_column_data(VMBDBCtx ctx, size_t column_index);
-char* db_format_sql(VMBDBCtx ctx, const char* format, ...);
long long db_exec(const char* sql, char* err_msg, size_t err_msg_len);
+char* db_create_formatted_sql(const char* format, ...);
+void db_destroy_formatted_sql(char* formatted_sql);
#endif // VMBGUILDER_DB_H_GUARD_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-29 22:32:27
|
Revision: 593
http://omc.svn.sourceforge.net/omc/?rev=593&view=rev
Author: jcarey
Date: 2008-04-29 15:32:28 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
Builder database routines
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
Added Paths:
-----------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-25 23:47:48 UTC (rev 592)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-29 22:32:28 UTC (rev 593)
@@ -4,6 +4,9 @@
libomc_xenvmbuilder.la \
libomc_xenvmbuilderjob.la
+lib_LTLIBRARIES = \
+ libomc_xenvmbuilder_common.la
+
INCLUDES = -I$(top_builddir)
libomc_xenvmbuilder_la_SOURCES = \
@@ -14,6 +17,9 @@
-lomc_cmpi \
-version-info 1
+libomc_xenvmbuilder_la_LIBADD = \
+ $(top_builddir)/src/providers/vm-builder/libomc_xenvmbuilder_common.la
+
libomc_xenvmbuilderjob_la_SOURCES = \
builder-job.c
@@ -22,4 +28,19 @@
-lomc_cmpi \
-version-info 1
+libomc_xenvmbuilderjob_la_LIBADD = \
+ $(top_builddir)/src/providers/vm-builder/libomc_xenvmbuilder_common.la
+libomc_xenvmbuilder_common_la_SOURCES = \
+ vmbuild-db.c \
+ vmbuilder-db.h
+
+libomc_xenvmbuilder_common_la_LDFLAGS = \
+ -lpthread \
+ -lomc_cmpi \
+ -lsqlite3 \
+ -version-info 1
+
+
+
+
Added: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c (rev 0)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuild-db.c 2008-04-29 22:32:28 UTC (rev 593)
@@ -0,0 +1,449 @@
+#include "vmbuilder-db.h"
+#include <sqlite3.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <omc/string.h>
+#include <errno.h>
+#include <ctype.h>
+
+/*
+ * _create_sql is the schema of the database.
+ * When the database is opened for the very first
+ * time, this sql will be used to set up the schema.
+ */
+const char* _create_sql =
+"CREATE TABLE CreationData("
+ "InstanceID TEXT NOT NULL COLLATE NOCASE,"
+ //-- 2: None
+ //-- 3: Restart
+ //-- 4: Revert to snapshot
+ "AutoMaticRecoveryAction INTEGER,"
+ //-- 2: Turn off
+ //-- 3: Save state
+ //-- 4: Shutdown
+ "AutoMaticShutdownAction INTEGER,"
+ //-- 2: None
+ //-- 3: Restart if previously active
+ //-- 4: Always start up
+ "AutoMaticStartupAction INTEGER,"
+ "AutoMaticStartupActionDelay INTEGER,"
+ "AutoMaticStartupActionSequenceNumber INTEGER,"
+ "CPUArchitecture TEXT,"
+ "Caption TEXT,"
+ //-- 0: Not changable (persistent)
+ //-- 1: Changable (transient)
+ //-- 2: Changable (persistent)
+ //-- 3: Not changable (transient)
+ "ChangableType INTEGER,"
+ "ConfigurationDataRoot TEXT,"
+ "ConfigurationFile TEXT,"
+ "ConfigurationID TEXT,"
+ "ConfigurationName TEXT,"
+ "CreationTime INTEGER,"
+ "Description TEXT,"
+ //-- String Array
+ "Disks TEXT,"
+ "ElementName TEXT,"
+ //-- String Array
+ "ExtraConfigInfo TEXT,"
+ "ExtraInstallArgs TEXT,"
+ //-- 0: Unknown
+ //-- 1: Cirrus
+ //-- 2: None
+ //-- 3: Para
+ //-- 4: Vesa
+ "GraphicsType INTEGER,"
+ //-- 0: Unknown
+ //-- 1: SDL
+ //-- 2: VNC
+ "GraphicsViewerType INTEGER,"
+ "LogDataRoot TEXT,"
+ "MaxMemory INTEGER,"
+ "Memory INTEGER,"
+ //-- String Array
+ "Nics TEXT,"
+ //-- String Array
+ "Notes TEXT,"
+ "NumVCPUs INTEGER,"
+ //-- See MOF
+ "OSType INTEGER,"
+ "RecoveryFile TEXT,"
+ "ResponseFile TEXT,"
+ "SnapshotDataRoot TEXT,"
+ "SourceURL TEXT,"
+ "SuspendDataRoot TEXT,"
+ "SwapFileDataRoot TEXT,"
+ "UUID TEXT,"
+ "VNCPort INTEGER,"
+ //-- 0: Unknown
+ //-- 1: Para
+ //-- 2: Full
+ "VirtType INTEGER,"
+ "VirtualSystemIdentifier TEXT,"
+ "VirtualSystemType TEXT,"
+ "PRIMARY KEY(InstanceID COLLATE NOCASE));"
+"CREATE TABLE Job("
+ "JobName TEXT NOT NULL,"
+ "CreationDataInstanceID TEXT NOT NULL COLLATE NOCASE,"
+ "PRIMARY KEY(JobName, CreationDataInstanceID COLLATE NOCASE));";
+
+typedef struct
+{
+ sqlite3 *db;
+ sqlite3_stmt *stmt;
+ const char* tail;
+ int col_count;
+ char** row_data;
+ int lastcc;
+ char* format_buf;
+} VMBDBCtx_t;
+
+/*
+ * _db_busy_handler is registered with sqlite when
+ * the database is open. It is called when sqlite
+ * encounters a locked condition on the database.
+ */
+static int
+_db_busy_handler(void* cbdata, int call_count)
+{
+ // Logging?
+ if (call_count > 10)
+ {
+ // Been waiting for the lock condition for to long.
+ // return failure, so the sqlite call will fail.
+ return 0;
+ }
+ // Sleep 1 second and return 1 so sqlite will try the
+ // operation again.
+ sleep(1); // unistd sleep(seconds)
+ return 1;
+}
+
+/*
+ * @return 1 if string is nothing but space
+ */
+static int
+_str_is_empty(const char* str)
+{
+ if (str)
+ {
+ while (*str)
+ {
+ if (!isspace(*str))
+ return 0;
+ str++;
+ }
+ }
+ return 1;
+}
+
+/*
+ * @return 1 if the given path is a directory, otherwise 0
+ */
+static int
+_is_dir(const char* path)
+{
+ struct stat st;
+ if (stat(path, &st) == 0
+ && S_ISDIR(st.st_mode))
+ {
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Create a directory. If necessary this method will create any non-existent
+ * parent directories until the full path is created.
+ * Assumption: path argument is an absolute path
+ */
+static int
+_make_dirs(const char* path)
+{
+ char cur_path[PATH_MAX+1];
+ char** toks;
+ size_t number_of_toks, i;
+
+ cur_path[0] = '\0';
+ toks = omcStrTokenize(path, "/", &number_of_toks);
+ if (!toks)
+ {
+ // Invalid path?
+ return -1;
+ }
+
+ for(i = 0; toks[i]; i++)
+ {
+ omcStrAppend(cur_path, "/", sizeof(cur_path));
+ omcStrAppend(cur_path, toks[i], sizeof(cur_path));
+ if (!_is_dir(cur_path))
+ {
+ if (mkdir(cur_path, 0755) != 0)
+ {
+ return -1;
+ }
+ }
+ }
+ return 0;
+}
+
+/*
+ * _get_db_connection will do the following:
+ * - Check for the existence of the database. If it does not exist, it will
+ * create it with the appropriate schema.
+ * - Return a connection (sqlite3*) to the database in the db arg.
+ * - If an error occurs, the err_msg arg will contain an error message
+ * describing the reason for the error.
+ */
+static int
+_get_db_connection(sqlite3** db, char* err_msg, size_t err_msg_len)
+{
+ char *zErr = 0;
+
+ if (!_is_dir(VMB_DB_DIR))
+ {
+ if (_make_dirs(VMB_DB_DIR) != 0)
+ {
+ omcStrNCpy(err_msg, "Failed to create directory "VMB_DB_DIR,
+ err_msg_len);
+ return -1;
+ }
+ }
+ // If database doesn't exist
+ if (access(VMB_DB_NAME, F_OK) != 0)
+ { // Database does NOT exist
+
+ // Create Database
+ if (sqlite3_open(VMB_DB_NAME, db))
+ {
+ snprintf(err_msg, err_msg_len,
+ "Failed to open database "VMB_DB_NAME": %s",
+ sqlite3_errmsg(*db));
+ sqlite3_close(*db);
+ return -1;
+ }
+ // Extend schema
+ if (sqlite3_exec(*db, _create_sql, NULL, NULL, &zErr) != SQLITE_OK)
+ {
+ if (zErr != NULL)
+ {
+ snprintf(err_msg, err_msg_len,
+ "Failed executing sql statement: %s", zErr);
+ sqlite3_free(zErr);
+ }
+ else
+ {
+ omcStrNCpy(err_msg, "Failed executing sql statement", err_msg_len);
+ }
+ sqlite3_close(*db);
+ return -1;
+ }
+ }
+ else
+ { // Database does exist - Just open
+ if (sqlite3_open(VMB_DB_NAME, db))
+ {
+ snprintf(err_msg, err_msg_len,
+ "Failed to open database "VMB_DB_NAME": %s",
+ sqlite3_errmsg(*db));
+ sqlite3_close(*db);
+ return -1;
+ }
+ }
+ sqlite3_busy_handler(*db, _db_busy_handler, NULL);
+ return 0;
+}
+
+/*
+ * Create a connection context to the database
+ */
+int
+db_create_connection(VMBDBCtx* ctx, const char* query, char* err_msg,
+ size_t err_msg_len)
+{
+ VMBDBCtx_t *pctx;
+ if (_str_is_empty(query))
+ {
+ omcStrNCpy(err_msg, "Invalid parameter: query arg is required",
+ err_msg_len);
+ return -1;
+ }
+
+ pctx = (VMBDBCtx_t*) calloc(1, sizeof(VMBDBCtx_t));
+ if (!pctx)
+ {
+ omcStrNCpy(err_msg, "Memory Allocation Error", err_msg_len);
+ return -1;
+ }
+ if (_get_db_connection(&pctx->db, err_msg, err_msg_len) != 0)
+ {
+ free(pctx);
+ return -1;
+ }
+
+ if (sqlite3_prepare(pctx->db, query, strlen(query), &pctx->stmt,
+ &pctx->tail) != SQLITE_OK)
+ {
+ snprintf(err_msg, err_msg_len, "Failed preparing DB Query: %s",
+ sqlite3_errmsg(pctx->db));
+ sqlite3_finalize(pctx->stmt);
+ sqlite3_close(pctx->db);
+ free(pctx);
+ return -1;
+ }
+
+ pctx->col_count = sqlite3_column_count(pctx->stmt);
+ pctx->lastcc = sqlite3_step(pctx->stmt);
+ *ctx = (void*)pctx;
+ return 0;
+}
+
+/*
+ * Destroy a connection context to the database
+ */
+void
+db_destroy_connection(VMBDBCtx ctx)
+{
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ if (pctx)
+ {
+ if (pctx->stmt)
+ {
+ sqlite3_finalize(pctx->stmt);
+ }
+ sqlite3_close(pctx->db);
+ free(pctx);
+ if (pctx->format_buf)
+ {
+ sqlite3_free(pctx->format_buf);
+ }
+ }
+}
+
+/*
+ * @return 1 if the current result set has more rows. Otherwise 0.
+ */
+int
+db_has_more_rows(VMBDBCtx ctx)
+{
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ return (pctx && pctx->lastcc == SQLITE_ROW) ? 1 : 0;
+}
+
+/*
+ * Position the cursor to the next row in the result set
+ * if there are more rows.
+ * @return 0 for success otherwise -1
+ */
+int db_goto_next_row(VMBDBCtx ctx)
+{
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ if (pctx)
+ {
+ if (pctx->lastcc == SQLITE_ROW)
+ {
+ pctx->lastcc = sqlite3_step(pctx->stmt);
+ return 0;
+ }
+ }
+ return -1;
+}
+
+/*
+ * @return The number of columns per row for the result set,
+ * or -1 on error.
+ */
+int
+db_get_column_count(VMBDBCtx ctx)
+{
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ return pctx ? pctx->col_count : -1;
+}
+
+/*
+ * @return The data for a given column for the current result set,
+ * or NULL on error.
+ */
+const unsigned char*
+db_get_column_data(VMBDBCtx ctx, size_t column_index)
+{
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ if (pctx && pctx->col_count && column_index < pctx->col_count)
+ return sqlite3_column_text(pctx->stmt, (int)column_index);
+ return NULL;
+}
+
+char*
+db_format_sql(VMBDBCtx ctx, const char* format, ...)
+{
+ va_list marker;
+ VMBDBCtx_t *pctx = (VMBDBCtx_t*) ctx;
+ if (!pctx)
+ {
+ return NULL;
+ }
+ if (pctx->format_buf)
+ {
+ sqlite3_free(pctx->format_buf);
+ pctx->format_buf = NULL;
+ }
+ va_start(marker, format);
+ pctx->format_buf = sqlite3_vmprintf(format, marker);
+ va_end(marker);
+ return pctx->format_buf;
+}
+
+/*
+ * Execute the specified sql against the database.
+ * If the operation fails -1LL will be returned with
+ * the err_msg param containing and error message describing the failue.
+ * If the operation succeeds, the last insert row id is returned if the
+ * operation caused an insert. If it did not cause an insert 0LL will
+ * be returned.
+ */
+long long
+db_exec(const char* sql, char* err_msg, size_t err_msg_len)
+{
+ int cc;
+ sqlite3 *db;
+ char* zErr = NULL;
+ long long insert_row_id = -1LL;
+
+ if (_get_db_connection(&db, err_msg, err_msg_len) != 0)
+ {
+ return -1LL;
+ }
+
+ cc = sqlite3_exec(db, sql, NULL, NULL, &zErr);
+ if (cc != SQLITE_OK)
+ {
+ if (zErr)
+ {
+ snprintf(err_msg, err_msg_len,
+ "Failed executing sql statement: %s", zErr);
+ sqlite3_free(zErr);
+ }
+ else
+ {
+ omcStrNCpy(err_msg, "Failed executing sql statement", err_msg_len);
+ }
+ }
+ else
+ {
+ insert_row_id = sqlite3_last_insert_rowid(db);
+ }
+
+ sqlite3_close(db);
+ return insert_row_id;
+}
+
+
+
+
+
+
Added: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h (rev 0)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.h 2008-04-29 22:32:28 UTC (rev 593)
@@ -0,0 +1,21 @@
+#ifndef VMBGUILDER_DB_H_GUARD_
+#define VMBGUILDER_DB_H_GUARD_
+
+#include <stdlib.h>
+
+#define VMB_DB_DIR "/var/opt/xen-vm-builder/db"
+#define VMB_DB_FILE_NAME "vmbuilder.db"
+#define VMB_DB_NAME VMB_DB_DIR"/"VMB_DB_FILE_NAME
+
+typedef void* VMBDBCtx;
+
+int db_create_connection(VMBDBCtx* ctx, const char* query, char* err_msg, size_t err_msg_len);
+void db_destroy_connection(VMBDBCtx ctx);
+int db_has_more_rows(VMBDBCtx ctx);
+int db_goto_next_row(VMBDBCtx ctx);
+int db_get_column_count(VMBDBCtx ctx);
+const unsigned char* db_get_column_data(VMBDBCtx ctx, size_t column_index);
+char* db_format_sql(VMBDBCtx ctx, const char* format, ...);
+long long db_exec(const char* sql, char* err_msg, size_t err_msg_len);
+
+#endif // VMBGUILDER_DB_H_GUARD_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-25 23:47:45
|
Revision: 592
http://omc.svn.sourceforge.net/omc/?rev=592&view=rev
Author: jcarey
Date: 2008-04-25 16:47:48 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
Initial version of builder-job
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c
Added: contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/builder-job-peg.reg 2008-04-25 23:47:48 UTC (rev 592)
@@ -0,0 +1,29 @@
+instance of PG_ProviderModule
+{
+ Name = "OMC_XENVMBuilderJob_Module";
+ Location = "omc_xenvmbuilderjob";
+ Vendor = "OMC";
+ Version = "1.0.0";
+ InterfaceType = "CMPI";
+ InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+ ProviderModuleName = "OMC_XENVMBuilderJob_Module";
+ Name = "omc_xenvmbuilderjob";
+};
+
+instance of PG_ProviderCapabilities
+{
+ ProviderModuleName = "OMC_XENVMBuilderJob_Module";
+ ProviderName = "omc_xenvmbuilderjob";
+ CapabilityID = "1";
+ ClassName = "XEN_VMBuilderJob";
+ Namespaces = {"root/cimv2"};
+ ProviderType = { 2, 5 }; // Instance, Method
+ SupportedProperties = NULL; // All properties
+ SupportedMethods = NULL; // All methods
+};
+
+
Modified: contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-04-24 20:24:45 UTC (rev 591)
+++ contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-04-25 23:47:48 UTC (rev 592)
@@ -33,7 +33,7 @@
CapabilityID = "2";
ClassName = "XEN_VMBuilderHostedService";
Namespaces = {"root/cimv2"};
- ProviderType = { 2, 3 }; // Instance, Method
+ ProviderType = { 2, 3 }; // Instance, Associator
SupportedProperties = NULL; // All properties
SupportedMethods = NULL; // All methods
};
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-24 20:24:45 UTC (rev 591)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-25 23:47:48 UTC (rev 592)
@@ -1,6 +1,8 @@
include $(top_srcdir)/Makefile.incl.am
-provider_LTLIBRARIES = libomc_xenvmbuilder.la
+provider_LTLIBRARIES = \
+ libomc_xenvmbuilder.la \
+ libomc_xenvmbuilderjob.la
INCLUDES = -I$(top_builddir)
@@ -12,5 +14,12 @@
-lomc_cmpi \
-version-info 1
+libomc_xenvmbuilderjob_la_SOURCES = \
+ builder-job.c
+libomc_xenvmbuilderjob_la_LDFLAGS = \
+ -lpthread \
+ -lomc_cmpi \
+ -version-info 1
+
Added: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c (rev 0)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-job.c 2008-04-25 23:47:48 UTC (rev 592)
@@ -0,0 +1,600 @@
+/*******************************************************************************
+* Copyright (C) 2005,2006,2007,2008 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.
+*
+* Author: Jon Carey (jc...@no...)
+******************************************************************************/
+#include "config.h"
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <time.h>
+#include <limits.h>
+#include <errno.h>
+#include <signal.h>
+#include <cmpidt.h>
+#include <cmpift.h>
+#include <cmpimacs.h>
+#include <omc/linuxProcUtils.h>
+#include <omc/string.h>
+#include <omc/exec.h>
+#include <omc/base.h>
+#include <omc/cmpiUtils.h>
+#include <omc/cmpiSimpleAssoc.h>
+
+
+/* NULL terminated list of key property names for this class */
+static const char* job_class_keys[] =
+{
+ "Name",
+ NULL
+};
+
+static const char* job_states[] =
+{
+ "SETTINGS",
+ "PREP_INSTALL",
+ "INSTALL",
+ "POST_INSTALL",
+ "RUNTIME_CONF",
+ "RUNTIME",
+ "FINISHED",
+ "FAILED",
+ "CANCELED"
+};
+
+typedef struct {
+ char vnc[8];
+ char uuid[40];
+ char name[64];
+ int exit_code;
+ char id[32];
+ char log[256];
+ int state;
+ char inotify[256];
+} VMInstallInfo;
+
+/* If built for debug, enable tracing */
+#ifdef XEN_VMBUILDER_DEBUG
+#define DEBUGOUT(fmt, args...) printf(fmt,## args)
+#else
+#define DEBUGOUT(fmt, args...)
+#endif
+
+/*
+ * Global handle to the CIM broker
+ * This is initialized by the CIMOM when the provider is loaded
+ */
+static const CMPIBroker* _broker;
+
+/******************************************************************************
+ CMPI INSTANCE PROVIDER FUNCTIONS
+******************************************************************************/
+
+static int
+get_job_info(const char* id, VMInstallInfo* pinfo)
+{
+ int status, cc = -1;
+ char *output = NULL;
+ char **lines;
+ unsigned int output_size;
+ const char* cmd[] = {
+ "/usr/bin/vm-install-jobs",
+ "-s",
+ id,
+ NULL
+ };
+
+ DEBUGOUT("get_job_info called with %s\n", id);
+
+ memset(pinfo, 0, sizeof(*pinfo));
+ if (omcExecuteProcessAndGatherOutputAndError((char* const*)cmd, NULL, &output,
+ &output_size, -1, NULL, NULL, -1, NULL, &status, -1) == 0) {
+ //DEBUGOUT("vm-install-jobs -s returned %d - %s\n", status, output);
+ unsigned int num_elements;
+ lines = omcStrTokenize(output, "\r\n", &num_elements);
+ if (lines) {
+ int i;
+ for (i = 0; lines[i]; i++) {
+ if (omcStrStartsWith(lines[i], "vnc ")) {
+ omcStrNCpy(pinfo->vnc, lines[i]+4, sizeof(pinfo->vnc));
+ omcStrTrim(pinfo->vnc);
+ }
+ else if (omcStrStartsWith(lines[i], "uuid ")) {
+ omcStrNCpy(pinfo->uuid, lines[i]+5, sizeof(pinfo->uuid));
+ omcStrTrim(pinfo->uuid);
+ }
+ else if (omcStrStartsWith(lines[i], "name ")) {
+ omcStrNCpy(pinfo->name, lines[i]+5, sizeof(pinfo->name));
+ omcStrTrim(pinfo->name);
+ }
+ else if (omcStrStartsWith(lines[i], "exit ")) {
+ pinfo->exit_code = atoi(lines[i]+5);
+ }
+ else if (omcStrStartsWith(lines[i], "id ")) {
+ omcStrNCpy(pinfo->id, lines[i]+3, sizeof(pinfo->id));
+ omcStrTrim(pinfo->id);
+ }
+ else if (omcStrStartsWith(lines[i], "log ")) {
+ omcStrNCpy(pinfo->log, lines[i]+4, sizeof(pinfo->log));
+ omcStrTrim(pinfo->log);
+ }
+ else if (omcStrStartsWith(lines[i], "state ")) {
+ pinfo->state = atoi(lines[i]+6);
+ }
+ else if (omcStrStartsWith(lines[i], "inotify ")) {
+ omcStrNCpy(pinfo->inotify, lines[i]+8, sizeof(pinfo->inotify));
+ omcStrTrim(pinfo->inotify);
+ }
+ }
+ free(lines);
+ cc = 0;
+ }
+ }
+ else {
+ DEBUGOUT("exec & gather errno: %d-%s\n", errno, strerror(errno));
+ }
+ if (output) {
+ free(output);
+ }
+ DEBUGOUT("get_job_info returning %d\n", cc);
+ return cc;
+}
+
+static char**
+get_job_names()
+{
+ int status;
+ char *output = NULL;
+ char** names = NULL;
+ unsigned int output_size;
+ char* const cmd[] = {
+ "/usr/bin/vm-install-jobs",
+ "-l",
+ NULL
+ };
+
+ if (omcExecuteProcessAndGatherOutputAndError(cmd, NULL, &output,
+ &output_size, -1, NULL, NULL, -1, NULL, &status, -1) == 0) {
+ //DEBUGOUT("vm-install-jobs returned %d - %s\n", status, output);
+ if(omcStrTrim(output)) {
+ unsigned int num_elements;
+ names = omcStrTokenize(output, "\r\n", &num_elements);
+ }
+ }
+ else {
+ DEBUGOUT("exec & gather errno: %d-%s\n", errno, strerror(errno));
+ }
+ if (output) {
+ free(output);
+ }
+ return names;
+}
+
+/******************************************************************************
+EnumInstanceNames()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+EnumInstanceNames(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ char *className;
+
+ className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
+
+ DEBUGOUT("EnumInstanceNames() called class:%s\n", className);
+ if (strcasecmp(className, "XEN_VMBuilderJob") == 0) {
+ CMPIObjectPath* ref = CMNewObjectPath(_broker, ns,
+ "XEN_VMBUilderJob", &status);
+ if (status.rc != CMPI_RC_OK || CMIsNullObject(ref)) {
+ DEBUGOUT("EnumbInstanceNames(): CMNewObjectPath() "
+ "failed - %s\n", CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating object path");
+ return status;
+ }
+ char** names = get_job_names();
+ if (names) {
+ int i;
+ for(i = 0; names[i]; i++) {
+ CMAddKey(ref, "Name", (CMPIValue*)names[i], CMPI_chars);
+ CMReturnObjectPath(results, ref);
+ }
+ free(names);
+ }
+ CMReturnDone(results);
+ }
+ DEBUGOUT("Leaving EnumInstanceNames(): %s\n",
+ (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/******************************************************************************
+EnumInstances()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+EnumInstances(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ CMPIInstance* instance;
+ char *className;
+
+ DEBUGOUT("EnumInstances() called\n");
+
+ className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
+ if (strcasecmp(className, "XEN_VMBuilderJob") == 0) {
+ char** names = NULL;
+ names = get_job_names();
+ if (names) {
+ const char* p;
+ VMInstallInfo info;
+ int i;
+ for(i = 0; names[i]; i++) {
+ if(get_job_info(names[i], &info) == 0) {
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderJob",
+ job_class_keys, properties, &status);
+ if (status.rc != CMPI_RC_OK || CMIsNullObject(instance)) {
+ DEBUGOUT("EnumInstances(): CMNewInstance() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ CMSetProperty(instance, "Name", (CMPIValue*)names[i],
+ CMPI_chars);
+ CMSetProperty(instance, "VMName", (CMPIValue*)info.name,
+ CMPI_chars);
+ CMSetProperty(instance, "VncURL", (CMPIValue*)info.vnc,
+ CMPI_chars);
+ CMSetProperty(instance, "VM_UUID", (CMPIValue*)info.uuid,
+ CMPI_chars);
+ CMSetProperty(instance, "ExitCode",
+ (CMPIValue*)&info.exit_code, CMPI_uint32);
+ CMSetProperty(instance, "InstallLogFileLocation",
+ (CMPIValue*)info.log, CMPI_chars);
+ p = (info.state > 8) ? "UNKNOWN" : job_states[info.state];
+ CMSetProperty(instance, "JobStatus", (CMPIValue*)p,
+ CMPI_chars);
+ CMSetProperty(instance, "StatusFileName", (CMPIValue*)info.inotify,
+ CMPI_chars);
+ CMReturnInstance(results, instance);
+ }
+ }
+ free(names);
+ }
+ CMReturnDone(results);
+ }
+
+ DEBUGOUT("Leaving EnumInstances(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+
+/******************************************************************************
+GetInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+GetInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char** properties)
+{
+ //CMPIInstance* instance;
+ //CMPIObjectPath *objectpath;
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ //char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ const char *className;
+
+ DEBUGOUT("GetInstance() called\n");
+
+ className = CMGetCharPtr(CMGetClassName(cop, NULL));
+ if (strcasecmp(className, "XEN_VMBuilderJob") == 0)
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND,
+ "Instance does not exists");
+ }
+ DEBUGOUT("Leaving GetInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/******************************************************************************
+ModifyInstance() - modify instance
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and objectpath
+ CMPIInstance* newInst: [in] new (modified) instance data
+******************************************************************************/
+static CMPIStatus
+ModifyInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const CMPIInstance* newinstance,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+
+/******************************************************************************
+CreateInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and objectpath
+ CMPIInstance* newInst: [in] new instance data
+******************************************************************************/
+static CMPIStatus
+CreateInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const CMPIInstance* newinstance)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+
+/******************************************************************************
+DeleteInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname
+******************************************************************************/
+static CMPIStatus
+DeleteInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+/******************************************************************************
+ExecQuery() - like getInstance, but that match query
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname
+ char *language: [in] query language, ie "WQL"
+ char *query: [in] text of query, in <query language>
+******************************************************************************/
+static CMPIStatus
+ExecQuery(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char* language,
+ const char* query)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+/******************************************************************************
+ Init()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+******************************************************************************/
+static void
+Init(
+ CMPIInstanceMI* self)
+{
+ DEBUGOUT("Initialize() called\n");
+
+ DEBUGOUT("Leaving Initialize()\n");
+}
+
+/******************************************************************************
+Cleanup() - pre unload
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIBoolean terminating
+******************************************************************************/
+static CMPIStatus
+Cleanup(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ CMPIBoolean terminating)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("Cleanup() called\n");
+
+ DEBUGOUT("Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+// ****************************************************************************
+// MethodInit() - init
+// params: CMPIMethodMI* self: [in] Handle to this provider
+// ****************************************************************************
+static void
+MethodInit(
+ CMPIMethodMI * self)
+{
+ DEBUGOUT("MethodInitialize() called\n");
+
+ // do work here if necessary
+
+ DEBUGOUT("Leaving MethodInitialize()\n");
+}
+
+/******************************************************************************
+MethodCleanup() - pre unload
+ params: CMPIMethodMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIBoolean terminating
+******************************************************************************/
+static CMPIStatus
+MethodCleanup(
+ CMPIMethodMI* self,
+ const CMPIContext* context,
+ CMPIBoolean terminating)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("MethodCleanup() called\n");
+
+ DEBUGOUT("Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+// ****************************************************************************
+// InvokeMethod()
+// params: CMPIMethodMI* self: [in] Handle to this provider
+// CMPIContext* context: [in] any additional context info
+// CMPIResult* results: [out] Results
+// CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+// char *methodName
+// CMPIArgs *in
+// CMPIArgs *out
+// ****************************************************************************
+static CMPIStatus
+InvokeMethod(
+ CMPIMethodMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char *methodName,
+ const CMPIArgs* in,
+ CMPIArgs* out)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ CMPIString *class = NULL;
+ CMPIValue rv;
+ /* char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); */
+
+ DEBUGOUT("InvokeMethod() called. methodName: %s\n", methodName);
+
+ class = CMGetClassName(cop, &status);
+ if (strcasecmp(CMGetCharPtr(class), "XEN_VMBuilderJob") != 0)
+ {
+ DEBUGOUT("InvokeMethod() INVALID class name %s\n", CMGetCharPtr(class));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_INVALID_CLASS,
+ CMGetCharPtr(class));
+ return status;
+ }
+
+ if (strcasecmp("Cancel", methodName) == 0)
+ {
+ OMC_SETSTATUS(_broker, &status,
+ CMPI_RC_ERR_NOT_SUPPORTED,
+ "Not implemented yet");
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp("Detach", methodName) == 0)
+ {
+ CMLogMessage(_broker, 1, "VMBuilderService provider",
+ "RequestStateChange called, but not supported", NULL);
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp("KillJob", methodName) == 0)
+ {
+ CMLogMessage(_broker, 1, "VMBuilderService provider",
+ "StartService called, but not supported", NULL);
+ rv.uint32 = 1; // Not supported
+ OMC_SETSTATUS(_broker, &status,
+ CMPI_RC_ERR_NOT_SUPPORTED,
+ "Cannot start VMBuilder Service. Always running");
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND, methodName);
+ }
+ DEBUGOUT("Leaving InvokeMethod(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/*****************************************************************************
+ SETUP CMPI INSTANCE PROVIDER FUNCTION TABLE
+******************************************************************************/
+
+/* Macros to create entry points, function tables, etc.
+ Params:
+ 1: _optional_ prefix for function names.
+ 2: the name of the provider (within the cimom - must be unique among all
+ providers. Recommended: <OMC_FooClass>_Provider
+ This is the same name that must be used to register the provider
+ with the cimom
+ 3: local static variable for CMPIBroker (cimom handle)
+ Initialized by cimom when the provider is loaded.
+ 4: provider's additional init function, called right after provider load.
+ If no additional init is required, specify "CMNoHook"
+*/
+CMInstanceMIStub( , omc_xenvmbuilderjob, _broker, Init(&mi));
+CMMethodMIStub( , omc_xenvmbuilderjob, _broker, MethodInit(&mi));
+
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-24 20:24:44
|
Revision: 591
http://omc.svn.sourceforge.net/omc/?rev=591&view=rev
Author: jcarey
Date: 2008-04-24 13:24:45 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Renamed file
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/Makefile.am
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof
Removed Paths:
-------------
contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
Modified: contrib/xen-vm-builder/trunk/mof/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-24 20:24:45 UTC (rev 591)
@@ -1,9 +1,9 @@
EXTRA_DIST = \
- XEN_HostedVMBuilderService.mof \
XEN_SettingsDefineBuild.mof \
XEN_VMBuilder.mof \
XEN_VMBuilderJob.mof \
XEN_VMBuilderOwningJobElement.mof \
XEN_VMBuilderProcessOfJob.mof \
XEN_VMBuilderService.mof \
+ XEN_VMBuilderHostedService.mof \
XEN_VMBuilderVirtualSystemCreationData.mof
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -1,20 +0,0 @@
-// ==================================================================
-// 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 Builder Service hosted on the System.")]
- XEN_VMBuilderService REF Dependent;
-};
-
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-24 20:13:38 UTC (rev 590)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -6,7 +6,7 @@
// Associations
#pragma include ("XEN_VMBuilderOwningJobElement.mof")
#pragma include ("XEN_VMBuilderProcessOfJob.mof")
-#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_VMBuilderHostedService.mof")
#pragma include ("XEN_SettingsDefineBuild.mof")
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderHostedService.mof 2008-04-24 20:24:45 UTC (rev 591)
@@ -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 Builder Service hosted on the System.")]
+ XEN_VMBuilderService REF Dependent;
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-24 20:14:20
|
Revision: 590
http://omc.svn.sourceforge.net/omc/?rev=590&view=rev
Author: jcarey
Date: 2008-04-24 13:13:38 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Implemented the XEN_VMBuilderHostedService association
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
Modified: contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-04-24 16:45:56 UTC (rev 589)
+++ contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-04-24 20:13:38 UTC (rev 590)
@@ -26,3 +26,15 @@
SupportedMethods = NULL; // All methods
};
+instance of PG_ProviderCapabilities
+{
+ ProviderModuleName = "OMC_XENVMBuilder_Module";
+ ProviderName = "omc_xenvmbuilder";
+ CapabilityID = "2";
+ ClassName = "XEN_VMBuilderHostedService";
+ Namespaces = {"root/cimv2"};
+ ProviderType = { 2, 3 }; // Instance, Method
+ SupportedProperties = NULL; // All properties
+ SupportedMethods = NULL; // All methods
+};
+
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-04-24 16:45:56 UTC (rev 589)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-04-24 20:13:38 UTC (rev 590)
@@ -61,6 +61,13 @@
NULL
};
+static const char* hosted_service_class_keys[] =
+{
+ "Dependent",
+ "Antecedent",
+ NULL
+};
+
#define SERVICE_NAME "xen-vmbuilder"
#define RPM_NAME "omc-xenvm-builder"
@@ -79,15 +86,49 @@
static const CMPIBroker* _broker;
/*****************************************************************************/
+static CMPIObjectPath*
+get_service_ref(
+ const char* ns,
+ CMPIStatus* pstatus)
+{
+ CMPIObjectPath* objectpath;
+ char hname[256];
+
+ objectpath = CMNewObjectPath(_broker, ns, "XEN_VMBuilderService", pstatus);
+ if ((pstatus->rc != CMPI_RC_OK) || CMIsNullObject(objectpath))
+ {
+ return NULL;
+ }
+
+ if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ {
+ omcStrNCpy(hname, "localhost", sizeof(hname));
+ }
+ CMAddKey(objectpath, "CreationClassName",
+ (CMPIValue*)"XEN_VMBuilderService", CMPI_chars);
+ CMAddKey(objectpath, "Name",
+ (CMPIValue*)SERVICE_NAME, CMPI_chars);
+ CMAddKey(objectpath, "SystemCreationClassName",
+ (CMPIValue*)omcGetComputerSystemClassName(), CMPI_chars);
+ CMAddKey(objectpath, "SystemName", (CMPIValue*)hname, CMPI_chars);
+ return objectpath;
+}
+
+/*****************************************************************************/
static int
fillServiceInstance(
- CMPIInstance* instance,
- const char* hostName)
+ CMPIInstance* instance)
{
unsigned short wku16;
CMPIDateTime* datetime;
CMPIArray *pra;
+ char hostName[256];
+ if (!omcGetComputerSystemName(hostName, sizeof(hostName)))
+ {
+ omcStrNCpy(hostName, "localhost", sizeof(hostName));
+ }
+
CMSetProperty(instance, "CreationClassName", (CMPIValue*)"XEN_VMBuilderService", CMPI_chars);
CMSetProperty(instance, "Name", (CMPIValue*)SERVICE_NAME, CMPI_chars);
CMSetProperty(instance, "SystemCreationClassName", (CMPIValue*)omcGetComputerSystemClassName(), CMPI_chars);
@@ -142,7 +183,6 @@
CMPIStatus status = {CMPI_RC_OK, NULL};
CMPIObjectPath* objectpath;
char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
- char hname[256];
char *className;
DEBUGOUT("EnumInstanceNames() called\n");
@@ -150,27 +190,53 @@
className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
if (strcasecmp(className, "XEN_VMBuilderService") == 0)
{
- objectpath = CMNewObjectPath(_broker, ns, "XEN_VMBuilderService", &status);
- if ((status.rc != CMPI_RC_OK) || CMIsNullObject(objectpath))
+ objectpath = get_service_ref(ns, &status);
+ if ((status.rc != CMPI_RC_OK) || objectpath == NULL)
{
- DEBUGOUT("EnumInstanceNames(): CMNewObjectPath() failed - %s\n", CMGetCharPtr(status.msg));
- OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM, "Failed creating new object path");
+ DEBUGOUT("EnumInstanceNames(): get_service_ref() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
return status;
}
-
- if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ CMReturnObjectPath(results, objectpath);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp(className, "XEN_VMBuilderHostedService") == 0)
+ {
+ CMPIObjectPath *antref, *depref;
+ objectpath = CMNewObjectPath(_broker, ns, "XEN_VMBuilderHostedService", &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(objectpath))
{
- omcStrNCpy(hname, "localhost", sizeof(hname));
+ DEBUGOUT("EnumInstanceNames(): CMNewObjectPath() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
+ return status;
}
-
- CMAddKey(objectpath, "CreationClassName", (CMPIValue*)"XEN_VMBuilderService", CMPI_chars);
- CMAddKey(objectpath, "Name", (CMPIValue*)SERVICE_NAME, CMPI_chars);
- CMAddKey(objectpath, "SystemCreationClassName", (CMPIValue*)omcGetComputerSystemClassName(), CMPI_chars);
- CMAddKey(objectpath, "SystemName", (CMPIValue*)hname, CMPI_chars);
+ depref = get_service_ref(ns, &status);
+ if ((status.rc != CMPI_RC_OK) || depref == NULL)
+ {
+ DEBUGOUT("EnumInstanceNames(): get_service_ref() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
+ return status;
+ }
+ CMAddKey(objectpath, "Dependent", (CMPIValue*)&depref, CMPI_ref);
+ antref = omccmpiCreateCSObjectPath(_broker, ns, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(antref))
+ {
+ DEBUGOUT("EnumInstanceNames(): omccmpiCreateCSObjectPath failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ CMAddKey(objectpath, "Antecedent", (CMPIValue*)&antref, CMPI_ref);
CMReturnObjectPath(results, objectpath);
CMReturnDone(results);
}
- DEBUGOUT("Leaving EnumInstanceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ DEBUGOUT("Leaving EnumInstanceNames(): %s\n",
+ (status.rc == CMPI_RC_OK)? "succeeded":"failed");
return status;
}
@@ -193,7 +259,7 @@
CMPIStatus status = {CMPI_RC_OK, NULL};
char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
CMPIInstance* instance;
- char hname[256], *className;
+ char *className;
DEBUGOUT("EnumInstances() called\n");
@@ -208,11 +274,41 @@
return status;
}
- if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ fillServiceInstance(instance);
+ CMReturnInstance(results, instance);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp(className, "XEN_VMBuilderHostedService") == 0)
+ {
+ CMPIObjectPath *antref, *depref;
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderHostedService",
+ hosted_service_class_keys, properties, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
{
- omcStrNCpy(hname, "localhost", sizeof(hname));
+ DEBUGOUT("EnumInstances(): failed to create new instance: %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed to create new instance");
+ return status;
}
- fillServiceInstance(instance, hname);
+ depref = get_service_ref(ns, &status);
+ if ((status.rc != CMPI_RC_OK) || depref == NULL)
+ {
+ DEBUGOUT("EnumInstances(): get_service_ref() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
+ return status;
+ }
+ CMSetProperty(instance, "Dependent", (CMPIValue*)&depref, CMPI_ref);
+ antref = omccmpiCreateCSObjectPath(_broker, ns, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(antref))
+ {
+ DEBUGOUT("EnumInstances(): omccmpiCreateCSObjectPath failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ CMSetProperty(instance, "Antecedent", (CMPIValue*)&antref, CMPI_ref);
CMReturnInstance(results, instance);
CMReturnDone(results);
}
@@ -238,16 +334,29 @@
const char** properties)
{
CMPIInstance* instance;
+ CMPIObjectPath *objectpath;
CMPIStatus status = {CMPI_RC_OK, NULL};
char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
const char *className;
- char hname[256];
DEBUGOUT("GetInstance() called\n");
className = CMGetCharPtr(CMGetClassName(cop, NULL));
if (strcasecmp(className, "XEN_VMBuilderService") == 0)
{
+ objectpath = get_service_ref(ns, &status);
+ if (status.rc != CMPI_RC_OK || objectpath == NULL)
+ {
+ DEBUGOUT("GetInstance(): get_service_ref failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ if (!omccmpiAreObjectPathsSame(cop, objectpath, &status))
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND,
+ "Instance does not exists");
+ return status;
+ }
instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderService",
service_class_keys, properties, &status);
if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
@@ -256,19 +365,84 @@
}
else
{
- if (!omcGetComputerSystemName(hname, sizeof(hname)))
- {
- omcStrNCpy(hname, "localhost", sizeof(hname));
- }
- fillServiceInstance(instance, hname);
+ fillServiceInstance(instance);
CMReturnInstance(results, instance);
}
}
+ if (strcasecmp(className, "XEN_VMBuilderHostedService") == 0)
+ {
+ CMPIData antecedent, dependent;
+ antecedent = CMGetKey(cop, "Antecedent", &status);
+ if (status.rc != CMPI_RC_OK || CMIsNullValue(antecedent))
+ {
+ DEBUGOUT("GetInstance(): CMGetKey(\"Antecedent\") failed - %s\n",
+ CMGetCharPtr(status.msg));
+ CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY,
+ "Antecedent missing");
+ return status;
+ }
+ if (antecedent.type != CMPI_ref)
+ {
+ DEBUGOUT("GetInstance(): Invalid 'Antecedent' key property type\n");
+ CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_INVALID_PARAMETER,
+ "Antecedent key invalid");
+ return status;
+ }
+ objectpath = omccmpiCreateCSObjectPath(_broker, ns, &status);
+ if (status.rc != CMPI_RC_OK || CMIsNullObject(objectpath))
+ {
+ DEBUGOUT("GetInstance(): omccmpiCreateCSObjectPath failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ if (!omccmpiAreObjectPathsSame(antecedent.value.ref, objectpath, &status))
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND,
+ "Instance does not exists");
+ return status;
+ }
+ instance = omccmpiNewInstance(_broker, ns,
+ "XEN_VMBuilderHostedService",
+ hosted_service_class_keys, properties, &status);
+ CMSetProperty(instance, "Antecedent", (CMPIValue*)&objectpath, CMPI_ref);
+
+ dependent = CMGetKey(cop, "Dependent", &status);
+ if (status.rc != CMPI_RC_OK || CMIsNullValue(dependent))
+ {
+ DEBUGOUT("GetInstance(): CMGetKey(\"Dependent\") failed - %s\n",
+ CMGetCharPtr(status.msg));
+ CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_NO_SUCH_PROPERTY,
+ "Dependent missing");
+ return status;
+ }
+ if (dependent.type != CMPI_ref)
+ {
+ DEBUGOUT("GetInstance(): Invalid 'Dependent' key property type\n");
+ CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_INVALID_PARAMETER,
+ "Dependent key invalid");
+ return status;
+ }
+
+ objectpath = get_service_ref(ns, &status);
+ if (status.rc != CMPI_RC_OK || objectpath == NULL)
+ {
+ DEBUGOUT("GetInstance(): get_service_ref failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+ if (!omccmpiAreObjectPathsSame(dependent.value.ref, objectpath, &status))
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND,
+ "Instance does not exists");
+ return status;
+ }
+ CMSetProperty(instance, "Dependent", (CMPIValue*)&objectpath, CMPI_ref);
+ CMReturnInstance(results, instance);
+ }
DEBUGOUT("Leaving GetInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
return status;
}
-
/******************************************************************************
ModifyInstance() - modify instance
params: CMPIInstanceMI* self: [in] Handle to this provider
@@ -504,6 +678,312 @@
return status;
}
+/******************************************************************************
+CMPI ASSOCIATION PROVIDER FUNCTIONS
+******************************************************************************/
+
+/******************************************************************************
+AssocInit() - init
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+******************************************************************************/
+static void
+AssocInit(
+ CMPIAssociationMI* self)
+{
+ DEBUGOUT("AssocInit() called");
+
+ DEBUGOUT("Leaving AssocInit()\n");
+}
+
+/******************************************************************************
+AssociationCleanup() - pre unload
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIBoolean terminating
+******************************************************************************/
+static CMPIStatus
+AssociationCleanup(
+ CMPIAssociationMI* self,
+ const CMPIContext* context,
+ CMPIBoolean terminating)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("AssociationCleanup() called");
+
+ DEBUGOUT("Leaving AssociationCleanup(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/*****************************************************************************/
+static CMPIStatus
+doReferences(
+ omccmpiSimpleAssocCtx ctx,
+ CMPIAssociationMI *self,
+ const CMPIBroker *broker,
+ const CMPIContext *context,
+ const CMPIResult *results,
+ const CMPIObjectPath *cop,
+ const char *assocClass,
+ const char *resultClass,
+ const char *role,
+ const char *resultRole,
+ const char **properties)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ CMPIObjectPath *csOp, *objectpath;
+ CMPIInstance *instance;
+
+ DEBUGOUT("doReferences called\n");
+
+ if (strcasecmp(assocClass, "XEN_VMBuilderHostedService") == 0)
+ {
+ char *objsClassName = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
+
+ /* Is target an OS object? */
+ if(strcasecmp(objsClassName, "OMC_UnitaryComputerSystem") == 0)
+ {
+ if (role && *role && strcasecmp(role, "Antecedent") != 0)
+ {
+ /* Unknown role */
+ return status;
+ }
+ if (resultRole && *resultRole && strcasecmp(resultRole, "Dependent") != 0)
+ {
+ /* Unknown resultRole */
+ return status;
+ }
+ if (resultClass && *resultClass)
+ {
+ if (!omccmpiClassIsDerivedFrom("XEN_VMBuilderService",
+ resultClass, _broker, ns, &status))
+ {
+ return status;
+ }
+ }
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderHostedService",
+ hosted_service_class_keys, properties, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
+ {
+ DEBUGOUT("doReferences(): omccmpiNewInstance() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+
+ csOp = omccmpiCreateCSObjectPath(_broker, ns, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
+ {
+ DEBUGOUT("doReferences(): omccmpiCreateCSObjectPath failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+
+ CMSetProperty(instance, "Antecedent", (CMPIValue*)&csOp, CMPI_ref);
+
+ objectpath = get_service_ref(ns, &status);
+ if ((status.rc != CMPI_RC_OK) || objectpath == NULL)
+ {
+ DEBUGOUT("doReferences(): get_service_ref() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
+ return status;
+ }
+ CMSetProperty(instance, "Dependent", (CMPIValue*)&objectpath, CMPI_ref);
+ omccmpiSimpleAssocResults(ctx, instance, &status);
+ }
+ else if(strcasecmp(objsClassName, "XEN_VMBuilderService") == 0)
+ {
+ if (role && *role && strcasecmp(role, "Dependent") != 0)
+ {
+ /* Unknown role */
+ return status;
+ }
+ if (resultRole && *resultRole && strcasecmp(resultRole, "Antecedent") != 0)
+ {
+ /* Unknown resultRole */
+ return status;
+ }
+ if (resultClass && *resultClass)
+ {
+ if (!omccmpiClassIsDerivedFrom("OMC_UnitaryComputerSystem",
+ resultClass, _broker, ns, &status))
+ {
+ return status;
+ }
+ }
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderHostedService",
+ hosted_service_class_keys, properties, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
+ {
+ DEBUGOUT("doReferences(): omccmpiNewInstance() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+
+ csOp = omccmpiCreateCSObjectPath(_broker, ns, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(csOp))
+ {
+ DEBUGOUT("doReferences(): omccmpiCreateCSObjectPath failed - %s\n",
+ CMGetCharPtr(status.msg));
+ return status;
+ }
+
+ CMSetProperty(instance, "Antecedent", (CMPIValue*)&csOp, CMPI_ref);
+ objectpath = get_service_ref(ns, &status);
+ if ((status.rc != CMPI_RC_OK) || objectpath == NULL)
+ {
+ DEBUGOUT("doReferences(): get_service_ref() failed - %s\n",
+ CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM,
+ "Failed creating new object path");
+ return status;
+ }
+ CMSetProperty(instance, "Dependent", (CMPIValue*)&objectpath, CMPI_ref);
+ omccmpiSimpleAssocResults(ctx, instance, &status);
+ }
+ else
+ {
+ DEBUGOUT("!!! Object type unknown: %s\n", objsClassName);
+ return status;
+ }
+ }
+ DEBUGOUT("Leaving doReferences\n");
+ return status;
+}
+
+/******************************************************************************
+Associators()
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char *assocClass
+ char *resultClass
+ char *role
+ char *resultRole
+ char **properties
+******************************************************************************/
+static CMPIStatus
+Associators(
+ CMPIAssociationMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char *assocClass,
+ const char *resultClass,
+ const char *role,
+ const char *resultRole,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("Associators() called");
+
+ status = omccmpiSimpleAssociators(doReferences, self,
+ _broker, context, results, cop, assocClass,
+ resultClass, role, resultRole, properties);
+
+ DEBUGOUT("Leaving Associatiors(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+
+/******************************************************************************
+AssociatorNames()
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char *assocClass
+ char *resultClass
+ char *role
+ char *resultRole
+******************************************************************************/
+static CMPIStatus
+AssociatorNames(
+ CMPIAssociationMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char *assocClass,
+ const char *resultClass,
+ const char *role,
+ const char *resultRole)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("AssociatorNames() called");
+
+ status = omccmpiSimpleAssociatorNames(doReferences, self, _broker,
+ context, results, cop, assocClass, resultClass, role,
+ resultRole);
+
+ DEBUGOUT("Leaving AssociatiorNames(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/******************************************************************************
+References()
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char *resultClass
+ char *role
+ char **properties
+******************************************************************************/
+static CMPIStatus References(
+ CMPIAssociationMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char* resultClass,
+ const char* role,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("References() called");
+
+ status = omccmpiSimpleReferences( doReferences, self, _broker, context,
+ results, cop, resultClass, role, properties);
+
+ DEBUGOUT("Leaving References(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+
+/******************************************************************************
+ReferenceNames()
+ params: CMPIAssociationMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char *resultClass
+ char *role
+******************************************************************************/
+static CMPIStatus
+ReferenceNames(
+ CMPIAssociationMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char* resultClass,
+ const char* role)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("ReferenceNames() called");
+
+ status = omccmpiSimpleReferenceNames( doReferences, self, _broker,
+ context, results, cop, resultClass, role);
+
+ DEBUGOUT("Leaving ReferenceNames(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
/*****************************************************************************
SETUP CMPI INSTANCE PROVIDER FUNCTION TABLE
******************************************************************************/
@@ -520,12 +1000,9 @@
4: provider's additional init function, called right after provider load.
If no additional init is required, specify "CMNoHook"
*/
-/*
-CMInstanceMIStub( , XEN_VMBuilderService, _broker, Init(&mi));
-CMMethodMIStub( , XEN_VMBuilderService, _broker, MethodInit(&mi));
-*/
CMInstanceMIStub( , omc_xenvmbuilder, _broker, Init(&mi));
CMMethodMIStub( , omc_xenvmbuilder, _broker, MethodInit(&mi));
+CMAssociationMIStub( , omc_xenvmbuilder, _broker, AssocInit(&mi));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-24 16:46:01
|
Revision: 589
http://omc.svn.sourceforge.net/omc/?rev=589&view=rev
Author: jcarey
Date: 2008-04-24 09:45:56 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Changed of MIStubs to work correctly
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/configure.ac
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
Property Changed:
----------------
/
Property changes on:
___________________________________________________________________
Name: svn:ignore
+ .*.swp
Modified: contrib/xen-vm-builder/trunk/configure.ac
===================================================================
--- contrib/xen-vm-builder/trunk/configure.ac 2008-04-23 23:23:28 UTC (rev 588)
+++ contrib/xen-vm-builder/trunk/configure.ac 2008-04-24 16:45:56 UTC (rev 589)
@@ -96,13 +96,13 @@
case $debuglevel in
1)
- AC_DEFINE(SMASH_DEBUG, 1, "Debugging flag.")
+ AC_DEFINE(XEN_VMBUILDER_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.")
+ AC_DEFINE(XEN_VMBUILDER_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"
Added: contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/builder-service-peg.reg 2008-04-24 16:45:56 UTC (rev 589)
@@ -0,0 +1,28 @@
+instance of PG_ProviderModule
+{
+ Name = "OMC_XENVMBuilder_Module";
+ Location = "omc_xenvmbuilder";
+ Vendor = "OMC";
+ Version = "1.0.0";
+ InterfaceType = "CMPI";
+ InterfaceVersion = "2.0.0";
+};
+
+instance of PG_Provider
+{
+ ProviderModuleName = "OMC_XENVMBuilder_Module";
+ Name = "omc_xenvmbuilder";
+};
+
+instance of PG_ProviderCapabilities
+{
+ ProviderModuleName = "OMC_XENVMBuilder_Module";
+ ProviderName = "omc_xenvmbuilder";
+ CapabilityID = "1";
+ ClassName = "XEN_VMBuilderService";
+ Namespaces = {"root/cimv2"};
+ ProviderType = { 2, 5 }; // Instance, Method
+ SupportedProperties = NULL; // All properties
+ SupportedMethods = NULL; // All methods
+};
+
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-04-23 23:23:28 UTC (rev 588)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-04-24 16:45:56 UTC (rev 589)
@@ -65,12 +65,8 @@
#define RPM_NAME "omc-xenvm-builder"
-/* Enable this for tracing */
-#ifdef OMC_DEBUG
-#undef OMC_DEBUG
-#endif
-
-#ifdef OMC_DEBUG
+/* If built for debug, enable tracing */
+#ifdef XEN_VMBUILDER_DEBUG
#define DEBUGOUT(fmt, args...) printf(fmt,## args)
#else
#define DEBUGOUT(fmt, args...)
@@ -524,6 +520,13 @@
4: provider's additional init function, called right after provider load.
If no additional init is required, specify "CMNoHook"
*/
-
+/*
CMInstanceMIStub( , XEN_VMBuilderService, _broker, Init(&mi));
CMMethodMIStub( , XEN_VMBuilderService, _broker, MethodInit(&mi));
+*/
+CMInstanceMIStub( , omc_xenvmbuilder, _broker, Init(&mi));
+CMMethodMIStub( , omc_xenvmbuilder, _broker, MethodInit(&mi));
+
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 23:23:25
|
Revision: 588
http://omc.svn.sourceforge.net/omc/?rev=588&view=rev
Author: jcarey
Date: 2008-04-23 16:23:28 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Initial impl of the vmbuilderservice provider
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
Added Paths:
-----------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-23 22:12:30 UTC (rev 587)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/Makefile.am 2008-04-23 23:23:28 UTC (rev 588)
@@ -1,16 +1,16 @@
-#include $(top_srcdir)/Makefile.incl.am
+include $(top_srcdir)/Makefile.incl.am
-#provider_LTLIBRARIES = libomc_xenvmbuilder.la
+provider_LTLIBRARIES = libomc_xenvmbuilder.la
-#INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_builddir)
-#libomc_xenvmbuilder_la_SOURCES = \
-# mysource.c
+libomc_xenvmbuilder_la_SOURCES = \
+ builder-service.c
-#libomc_xenvmbuilder_la_LDFLAGS = \
-# -lpthread \
-# -lomc_cmpi \
-# -version-info 1
+libomc_xenvmbuilder_la_LDFLAGS = \
+ -lpthread \
+ -lomc_cmpi \
+ -version-info 1
Added: contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c (rev 0)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/builder-service.c 2008-04-23 23:23:28 UTC (rev 588)
@@ -0,0 +1,529 @@
+/*******************************************************************************
+* Copyright (C) 2005,2006,2007,2008 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.
+*
+* Author: Jon Carey (jc...@no...)
+******************************************************************************/
+#include "config.h"
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <time.h>
+#include <limits.h>
+#include <errno.h>
+#include <signal.h>
+#include <cmpidt.h>
+#include <cmpift.h>
+#include <cmpimacs.h>
+#include <omc/linuxProcUtils.h>
+#include <omc/string.h>
+#include <omc/exec.h>
+#include <omc/base.h>
+#include <omc/cmpiUtils.h>
+#include <omc/cmpiSimpleAssoc.h>
+
+
+/* NULL terminated list of key property names for this class */
+static const char* service_class_keys[] =
+{
+ "CreationClassName",
+ "Name",
+ "SystemCreationClassName",
+ "SystemName",
+ NULL
+};
+
+#define SERVICE_NAME "xen-vmbuilder"
+#define RPM_NAME "omc-xenvm-builder"
+
+
+/* Enable this for tracing */
+#ifdef OMC_DEBUG
+#undef OMC_DEBUG
+#endif
+
+#ifdef OMC_DEBUG
+#define DEBUGOUT(fmt, args...) printf(fmt,## args)
+#else
+#define DEBUGOUT(fmt, args...)
+#endif
+
+/*
+ * Global handle to the CIM broker
+ * This is initialized by the CIMOM when the provider is loaded
+ */
+static const CMPIBroker* _broker;
+
+/*****************************************************************************/
+static int
+fillServiceInstance(
+ CMPIInstance* instance,
+ const char* hostName)
+{
+ unsigned short wku16;
+ CMPIDateTime* datetime;
+ CMPIArray *pra;
+
+ CMSetProperty(instance, "CreationClassName", (CMPIValue*)"XEN_VMBuilderService", CMPI_chars);
+ CMSetProperty(instance, "Name", (CMPIValue*)SERVICE_NAME, CMPI_chars);
+ CMSetProperty(instance, "SystemCreationClassName", (CMPIValue*)omcGetComputerSystemClassName(), CMPI_chars);
+ CMSetProperty(instance, "SystemName", (CMPIValue*)hostName, CMPI_chars);
+ pra = CMNewArray(_broker, 1, CMPI_uint16, NULL);
+ wku16 = 2;
+ CMSetArrayElementAt(pra, 0, (CMPIValue*)&wku16, CMPI_uint16);
+ CMSetProperty(instance, "AvailableRequestedStates", (CMPIValue*)&pra, CMPI_uint16A);
+ CMSetProperty(instance, "BuilderVersion", (CMPIValue*)PACKAGE_VERSION, CMPI_chars);
+ CMSetProperty(instance, "Caption", (CMPIValue*)"VM Builder Service", CMPI_chars);
+ CMSetProperty(instance, "Description", (CMPIValue*)"Service that facilitates "
+ "the building of new virutal machine images/configuration", CMPI_chars);
+ CMSetProperty(instance, "ElementName", (CMPIValue*)SERVICE_NAME, CMPI_chars);
+ wku16 = 2;
+ CMSetProperty(instance, "EnabledDefault", (CMPIValue*)&wku16, CMPI_uint16);
+ CMSetProperty(instance, "EnabledState", (CMPIValue*)&wku16, CMPI_uint16);
+ wku16 = 5;
+ CMSetProperty(instance, "HealthState", (CMPIValue*)&wku16, CMPI_uint16);
+ datetime = CMNewDateTimeFromBinary(_broker, omcGetRPMInstallDate(RPM_NAME), 0, NULL);
+ CMSetProperty(instance, "InstallDate", (CMPIValue*)&datetime, CMPI_dateTime);
+ pra = CMNewArray(_broker, 1, CMPI_uint16, NULL);
+ wku16 = 2;
+ CMSetArrayElementAt(pra, 0, (CMPIValue*)&wku16, CMPI_uint16);
+ CMSetProperty(instance, "OperationalStatus", (CMPIValue*)&pra, CMPI_uint16A);
+ wku16 = 12;
+ CMSetProperty(instance, "RequestedState", (CMPIValue*)&wku16, CMPI_uint16);
+ CMSetProperty(instance, "StartMode", (CMPIValue*)"Automatic", CMPI_chars);
+ return 0;
+}
+
+/******************************************************************************
+ CMPI INSTANCE PROVIDER FUNCTIONS
+******************************************************************************/
+
+
+
+/******************************************************************************
+EnumInstanceNames()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+EnumInstanceNames(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ CMPIObjectPath* objectpath;
+ char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ char hname[256];
+ char *className;
+
+ DEBUGOUT("EnumInstanceNames() called\n");
+
+ className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
+ if (strcasecmp(className, "XEN_VMBuilderService") == 0)
+ {
+ objectpath = CMNewObjectPath(_broker, ns, "XEN_VMBuilderService", &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(objectpath))
+ {
+ DEBUGOUT("EnumInstanceNames(): CMNewObjectPath() failed - %s\n", CMGetCharPtr(status.msg));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERROR_SYSTEM, "Failed creating new object path");
+ return status;
+ }
+
+ if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ {
+ omcStrNCpy(hname, "localhost", sizeof(hname));
+ }
+
+ CMAddKey(objectpath, "CreationClassName", (CMPIValue*)"XEN_VMBuilderService", CMPI_chars);
+ CMAddKey(objectpath, "Name", (CMPIValue*)SERVICE_NAME, CMPI_chars);
+ CMAddKey(objectpath, "SystemCreationClassName", (CMPIValue*)omcGetComputerSystemClassName(), CMPI_chars);
+ CMAddKey(objectpath, "SystemName", (CMPIValue*)hname, CMPI_chars);
+ CMReturnObjectPath(results, objectpath);
+ CMReturnDone(results);
+ }
+ DEBUGOUT("Leaving EnumInstanceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/******************************************************************************
+EnumInstances()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+EnumInstances(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ char * ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ CMPIInstance* instance;
+ char hname[256], *className;
+
+ DEBUGOUT("EnumInstances() called\n");
+
+ className = (char*) CMGetCharPtr(CMGetClassName(cop, NULL));
+ if (strcasecmp(className, "XEN_VMBuilderService") == 0)
+ {
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderService",
+ service_class_keys, properties, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
+ {
+ DEBUGOUT("EnumInstances(): CMNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+ return status;
+ }
+
+ if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ {
+ omcStrNCpy(hname, "localhost", sizeof(hname));
+ }
+ fillServiceInstance(instance, hname);
+ CMReturnInstance(results, instance);
+ CMReturnDone(results);
+ }
+ DEBUGOUT("Leaving EnumInstances(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+
+/******************************************************************************
+GetInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+ char **properties: [in] propertylist filter, null=all
+******************************************************************************/
+static CMPIStatus
+GetInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char** properties)
+{
+ CMPIInstance* instance;
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ char *ns = (char*) CMGetCharPtr(CMGetNameSpace(cop, NULL));
+ const char *className;
+ char hname[256];
+
+ DEBUGOUT("GetInstance() called\n");
+
+ className = CMGetCharPtr(CMGetClassName(cop, NULL));
+ if (strcasecmp(className, "XEN_VMBuilderService") == 0)
+ {
+ instance = omccmpiNewInstance(_broker, ns, "XEN_VMBuilderService",
+ service_class_keys, properties, &status);
+ if ((status.rc != CMPI_RC_OK) || CMIsNullObject(instance))
+ {
+ DEBUGOUT("EnumInstances(): CMNewInstance() failed - %s\n", CMGetCharPtr(status.msg));
+ }
+ else
+ {
+ if (!omcGetComputerSystemName(hname, sizeof(hname)))
+ {
+ omcStrNCpy(hname, "localhost", sizeof(hname));
+ }
+ fillServiceInstance(instance, hname);
+ CMReturnInstance(results, instance);
+ }
+ }
+ DEBUGOUT("Leaving GetInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+
+/******************************************************************************
+ModifyInstance() - modify instance
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and objectpath
+ CMPIInstance* newInst: [in] new (modified) instance data
+******************************************************************************/
+static CMPIStatus
+ModifyInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const CMPIInstance* newinstance,
+ const char** properties)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+
+/******************************************************************************
+CreateInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname, and objectpath
+ CMPIInstance* newInst: [in] new instance data
+******************************************************************************/
+static CMPIStatus
+CreateInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const CMPIInstance* newinstance)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+
+/******************************************************************************
+DeleteInstance()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname
+******************************************************************************/
+static CMPIStatus
+DeleteInstance(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+/******************************************************************************
+ExecQuery() - like getInstance, but that match query
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIResult* results: [out] Results
+ CMPIObjectPath* cop: [in] target namespace and classname
+ char *language: [in] query language, ie "WQL"
+ char *query: [in] text of query, in <query language>
+******************************************************************************/
+static CMPIStatus
+ExecQuery(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char* language,
+ const char* query)
+{
+ CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL};
+ return status;
+}
+
+/******************************************************************************
+ Init()
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+******************************************************************************/
+static void
+Init(
+ CMPIInstanceMI* self)
+{
+ DEBUGOUT("Initialize() called\n");
+
+ DEBUGOUT("Leaving Initialize()\n");
+}
+
+/******************************************************************************
+Cleanup() - pre unload
+ params: CMPIInstanceMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIBoolean terminating
+******************************************************************************/
+static CMPIStatus
+Cleanup(
+ CMPIInstanceMI* self,
+ const CMPIContext* context,
+ CMPIBoolean terminating)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("Cleanup() called\n");
+
+ DEBUGOUT("Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+// ****************************************************************************
+// MethodInit() - init
+// params: CMPIMethodMI* self: [in] Handle to this provider
+// ****************************************************************************
+static void
+MethodInit(
+ CMPIMethodMI * self)
+{
+ DEBUGOUT("MethodInitialize() called\n");
+
+ // do work here if necessary
+
+ DEBUGOUT("Leaving MethodInitialize()\n");
+}
+
+/******************************************************************************
+MethodCleanup() - pre unload
+ params: CMPIMethodMI* self: [in] Handle to this provider
+ CMPIContext* context: [in] any additional context info
+ CMPIBoolean terminating
+******************************************************************************/
+static CMPIStatus
+MethodCleanup(
+ CMPIMethodMI* self,
+ const CMPIContext* context,
+ CMPIBoolean terminating)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+
+ DEBUGOUT("MethodCleanup() called\n");
+
+ DEBUGOUT("Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+// ****************************************************************************
+// InvokeMethod()
+// params: CMPIMethodMI* self: [in] Handle to this provider
+// CMPIContext* context: [in] any additional context info
+// CMPIResult* results: [out] Results
+// CMPIObjectPath* cop: [in] target namespace and classname, and desired objectpath
+// char *methodName
+// CMPIArgs *in
+// CMPIArgs *out
+// ****************************************************************************
+static CMPIStatus
+InvokeMethod(
+ CMPIMethodMI* self,
+ const CMPIContext* context,
+ const CMPIResult* results,
+ const CMPIObjectPath* cop,
+ const char *methodName,
+ const CMPIArgs* in,
+ CMPIArgs* out)
+{
+ CMPIStatus status = {CMPI_RC_OK, NULL};
+ CMPIString *class = NULL;
+ CMPIValue rv;
+ /* char *ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); */
+
+ DEBUGOUT("InvokeMethod() called. methodName: %s\n", methodName);
+
+ class = CMGetClassName(cop, &status);
+ if (strcasecmp(CMGetCharPtr(class), "XEN_VMBuilderService") != 0)
+ {
+ DEBUGOUT("InvokeMethod() INVALID class name %s\n", CMGetCharPtr(class));
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_INVALID_CLASS,
+ CMGetCharPtr(class));
+ return status;
+ }
+
+ if (strcasecmp("CreateVM", methodName) == 0)
+ {
+ OMC_SETSTATUS(_broker, &status,
+ CMPI_RC_ERR_NOT_SUPPORTED,
+ "Not implemented yet");
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp("RequestStateChange", methodName) == 0)
+ {
+ CMLogMessage(_broker, 1, "VMBuilderService provider",
+ "RequestStateChange called, but not supported", NULL);
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp("StartService", methodName) == 0)
+ {
+ CMLogMessage(_broker, 1, "VMBuilderService provider",
+ "StartService called, but not supported", NULL);
+ rv.uint32 = 1; // Not supported
+ OMC_SETSTATUS(_broker, &status,
+ CMPI_RC_ERR_NOT_SUPPORTED,
+ "Cannot start VMBuilder Service. Always running");
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else if (strcasecmp("StopService", methodName) == 0)
+ {
+ CMLogMessage(_broker, 1, "VMBuilderService provider",
+ "StopService called, but not supported", NULL);
+ OMC_SETSTATUS(_broker, &status,
+ CMPI_RC_ERR_NOT_SUPPORTED,
+ "Cannot stop VMBuilder Service. Always running");
+ rv.uint32 = 1; // Not supported
+ CMReturnData(results, &rv, CMPI_uint32);
+ CMReturnDone(results);
+ }
+ else
+ {
+ OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_FOUND, methodName);
+ }
+ DEBUGOUT("Leaving InvokeMethod(): %s", (status.rc == CMPI_RC_OK)? "succeeded":"failed");
+ return status;
+}
+
+/*****************************************************************************
+ SETUP CMPI INSTANCE PROVIDER FUNCTION TABLE
+******************************************************************************/
+
+/* Macros to create entry points, function tables, etc.
+ Params:
+ 1: _optional_ prefix for function names.
+ 2: the name of the provider (within the cimom - must be unique among all
+ providers. Recommended: <OMC_FooClass>_Provider
+ This is the same name that must be used to register the provider
+ with the cimom
+ 3: local static variable for CMPIBroker (cimom handle)
+ Initialized by cimom when the provider is loaded.
+ 4: provider's additional init function, called right after provider load.
+ If no additional init is required, specify "CMNoHook"
+*/
+
+CMInstanceMIStub( , XEN_VMBuilderService, _broker, Init(&mi));
+CMMethodMIStub( , XEN_VMBuilderService, _broker, MethodInit(&mi));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 22:12:29
|
Revision: 587
http://omc.svn.sourceforge.net/omc/?rev=587&view=rev
Author: jcarey
Date: 2008-04-23 15:12:30 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Added value/valmap for return code of CreateVM
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 22:06:27 UTC (rev 586)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 22:12:30 UTC (rev 587)
@@ -10,7 +10,58 @@
"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.")]
+ "reflected in the properties of that instance."),
+ 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 CreateVM(
[IN, Description("The name that the VM will be given.")]
string VMName,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 22:06:27
|
Revision: 586
http://omc.svn.sourceforge.net/omc/?rev=586&view=rev
Author: jcarey
Date: 2008-04-23 15:06:27 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Added new mofs
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/Makefile.am
Modified: contrib/xen-vm-builder/trunk/mof/Makefile.am
===================================================================
--- contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-23 21:14:35 UTC (rev 585)
+++ contrib/xen-vm-builder/trunk/mof/Makefile.am 2008-04-23 22:06:27 UTC (rev 586)
@@ -1,9 +1,9 @@
EXTRA_DIST = \
XEN_HostedVMBuilderService.mof \
+ XEN_SettingsDefineBuild.mof \
XEN_VMBuilder.mof \
XEN_VMBuilderJob.mof \
XEN_VMBuilderOwningJobElement.mof \
XEN_VMBuilderProcessOfJob.mof \
XEN_VMBuilderService.mof \
XEN_VMBuilderVirtualSystemCreationData.mof
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 21:14:30
|
Revision: 585
http://omc.svn.sourceforge.net/omc/?rev=585&view=rev
Author: jcarey
Date: 2008-04-23 14:14:35 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Refactor
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.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
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 21:14:35 UTC (rev 585)
@@ -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 Builder Service hosted on the System.")]
+ XEN_VMBuilderService REF Dependent;
+};
+
Added: contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_SettingsDefineBuild.mof 2008-04-23 21:14:35 UTC (rev 585)
@@ -0,0 +1,18 @@
+// ==================================================================
+// XEN_SettingsDefineBuild
+// ==================================================================
+[Association, Description (
+ "XEN_SettingsDefineBuild is used to associate a XEN_VMBuilderJob "
+ "with the all the settings provided to build the virtual machine "
+ "(XEN_VMBuilderVirtualSystemCreationData)")]
+class XEN_SettingsDefineBuild : CIM_SettingsDefineState
+{
+ [Override("ManagedElement"), Key,
+ Description("The builder job")]
+ XEN_VMBuilderJob REF ManagedElement;
+
+ [Override("SettingData"), Key,
+ Description ("The creation data used for the build")]
+ XEN_VMBuilderVirtualSystemCreationData REF SettingData;
+};
+
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 21:14:35 UTC (rev 585)
@@ -0,0 +1,16 @@
+// Import OMC VM Builder schema
+#pragma include ("XEN_VMBuilderService.mof")
+#pragma include ("XEN_VMBuilderJob.mof")
+#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
+
+// Associations
+#pragma include ("XEN_VMBuilderOwningJobElement.mof")
+#pragma include ("XEN_VMBuilderProcessOfJob.mof")
+#pragma include ("XEN_HostedVMBuilderService.mof")
+#pragma include ("XEN_SettingsDefineBuild.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 21:14:35 UTC (rev 585)
@@ -0,0 +1,153 @@
+// ==================================================================
+// XEN_VMBuilderJob
+// ==================================================================
+[Description(
+ "XEN_VMBuilderJob represents a vm installation(build) job. "
+ "These jobs are the result of running the vm-install command "
+ "line utility")]
+class XEN_VMBuilderJob : CIM_Job
+{
+ [Key, Override("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"}]
+ 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;
+
+ // DeleteInstance:
+ // Deletes the job. The job must be in one of the FINISHED, FAILED, or
+ // CANCELED states. The VM's configuration is deleted, as are any disks
+ // that were created during the job.
+
+ [Description("Detaches the created VM from this job. This job must be in the "
+ "FINISHED state. This job will be deleted, but the VM's configuration "
+ "and its disks are left intact."),
+ ValueMap {
+ "0",
+ "1",
+ "2",
+ "4",
+ "4097" },
+ Values {
+ "Completed with No Error",
+ "Not Supported",
+ "Unknown/Unspecified Error",
+ "Failed",
+ "Invalid State Transition" }]
+ uint32 Detach();
+
+ [Description (
+ "Cancels the specified job. If the VM is still running, it is "
+ "stopped. This command may return before the VM is completely "
+ "stopped or the vm-install process has completely exited. The "
+ "job is not implicitly deleted, so that the cancelation progress "
+ "may be observed."),
+ ValueMap {
+ "0",
+ "1",
+ "2",
+ "4",
+ "4097"},
+ Values {
+ "Completed with No Error",
+ "Not Supported",
+ "Unknown/Unspecified Error",
+ "Failed",
+ "Invalid State Transition"}]
+ uint32 Cancel();
+};
+
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 21:14:35 UTC (rev 585)
@@ -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 21:14:35 UTC (rev 585)
@@ -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")]
+ OMC_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 21:14:35 UTC (rev 585)
@@ -0,0 +1,29 @@
+// ==================================================================
+// XEN_VMBuilderService
+// ==================================================================
+[Description (
+ "XEN_VMBuilderService represents the virtual machine incubator "
+ "functionality/service")]
+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("The name that the VM will be given.")]
+ string VMName,
+
+ [IN, Description("The object path to the instance of "
+ "XEN_VMBuilderVirtualSystemCreationData that will be used "
+ "for the build")]
+ XEN_VMBuilderVirtualSystemCreationData REF NewSystemCreationData,
+
+ [IN(false), OUT, Description ("REF to the new "
+ "XEN_VMBuilderJob instance.")]
+ XEN_VMBuilderJob REF VMBuilderJob);
+
+ [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 21:14:35 UTC (rev 585)
@@ -0,0 +1,120 @@
+// ==================================================================
+// 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[];
+
+ [Description("Extra arguments used for the VM Install. May not need.")]
+ string ExtraInstallArgs;
+
+ [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 Disks property:"
+ " 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;
+
+ [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;
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 21:08:35
|
Revision: 584
http://omc.svn.sourceforge.net/omc/?rev=584&view=rev
Author: jcarey
Date: 2008-04-23 14:08:16 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Clean up
Removed Paths:
-------------
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
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_HostedVMBuilderService.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,20 +0,0 @@
-// ==================================================================
-// 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;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,10 +0,0 @@
-// Import OMC VM Builder schema
-#pragma include ("XEN_VMBuilderService.mof")
-#pragma include ("XEN_VMBuilderJob.mof")
-#pragma include ("XEN_VMBuilderVirtualSystemCreationData.mof")
-
-// Associations
-#pragma include ("XEN_HostedVMBuilderService.mof")
-#pragma include ("XEN_VMBuilderOwningJobElement.mof")
-#pragma include ("XEN_VMBuilderProcessOfJob.mof")
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderJob.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,178 +0,0 @@
-// ==================================================================
-// XEN_VMBuilderJob
-// ==================================================================
-[Abstract, Description (
- "XEN_VMBuilderJob represents a vm installation(build) job")]
-class XEN_VMBuilderJob : CIM_Job
-{
- [Key, Override("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;
-
-};
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderOwningJobElement.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,17 +0,0 @@
-// ==================================================================
-// 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;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderProcessOfJob.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,21 +0,0 @@
-// ==================================================================
-// 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")]
- OMC_UnixProcess REF PartComponent;
-};
-
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,131 +0,0 @@
-// ==================================================================
-// 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 CancelBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob to cancel. "
- "Cancel will remove all remnants of the incubation job, leaving "
- "only an entry in the XEN_VMBuilderJobRecordLog.")]
- 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_VMBuilderJobRecordLog.")]
- boolean DeleteBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob 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_VMBuilderJobRecordLog.")]
- boolean DetachBuildJob(
- [IN, Description("The jobID of the XEN_VMBuilderJob 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_VMBuilderJob.")]
- string JobID);
-
- [Description("VM builder service version")]
- string BuilderVersion;
-};
Deleted: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-04-23 20:26:34 UTC (rev 583)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-04-23 21:08:16 UTC (rev 584)
@@ -1,92 +0,0 @@
-// ==================================================================
-// 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[];
-};
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2008-04-23 20:27:57
|
Revision: 583
http://omc.svn.sourceforge.net/omc/?rev=583&view=rev
Author: jcarey
Date: 2008-04-23 13:26:34 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Clean up
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 17:45:50 UTC (rev 582)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilderService.mof 2008-04-23 20:26:34 UTC (rev 583)
@@ -84,10 +84,10 @@
[Description("Cancel a vm installation job that was previously initiated.")]
- boolean CancelIncubationJob(
- [IN, Description("The jobID of the XEN_VMIncubationJob to cancel. "
+ boolean CancelBuildJob(
+ [IN, Description("The jobID of the XEN_VMBuilderJob to cancel. "
"Cancel will remove all remnants of the incubation job, leaving "
- "only an entry in the XEN_VMIncubationJobRecordLog.")]
+ "only an entry in the XEN_VMBuilderJobRecordLog.")]
string JobID,
[IN, Description("This flag applies to distributed incubation "
"environments. It indicates whether this request should be forced "
@@ -99,9 +99,9 @@
[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. ")]
+ "only an entry in the XEN_VMBuilderJobRecordLog.")]
+ boolean DeleteBuildJob(
+ [IN, Description("The jobID of the XEN_VMBuilderJob to delete. ")]
string JobID,
[IN, Description("This flag applies to distributed incubation "
"environments. It indicates whether this request should be forced "
@@ -114,16 +114,16 @@
[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. ")]
+ "an entry in XEN_VMBuilderJobRecordLog.")]
+ boolean DetachBuildJob(
+ [IN, Description("The jobID of the XEN_VMBuilderJob 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.")]
+ [IN, Description("The jobID of the XEN_VMBuilderJob.")]
string JobID);
[Description("VM builder service version")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
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.
|
|
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.
|
|
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] |
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
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] |
|
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.
|