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

[<jc...@us...>]

Revision: 857
          http://omc.svn.sourceforge.net/omc/?rev=857&view=rev
Author:   jcarey
Date:     2008-08-18 16:56:00 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Added vnc password to database schema and code to support the vncpassword in the database operations

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c
    contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c

Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c	2008-08-15 23:07:51 UTC (rev 856)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c	2008-08-18 16:56:00 UTC (rev 857)
@@ -79,6 +79,7 @@
 	"SuspendDataRoot TEXT,"
 	"SwapFileDataRoot TEXT,"
 	"VNCPort INTEGER,"
+	"VNCPassword TEXT,"
 	//-- 0: Unknown
 	//-- 1: Para
 	//-- 2: Full

Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c	2008-08-15 23:07:51 UTC (rev 856)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c	2008-08-18 16:56:00 UTC (rev 857)
@@ -96,6 +96,7 @@
 	"SuspendDataRoot," \
 	"SwapFileDataRoot," \
 	"VNCPort," \
+	"VNCPassword," \
 	"VirtType," \
 	"VirtualSystemIdentifier," \
 	"VirtualSystemType" 
@@ -141,6 +142,7 @@
 	CDF_SuspendDataRoot,
 	CDF_SwapFileDataRoot,
 	CDF_VNCPort,
+	CDF_VNCPassword,
 	CDF_VirtType,
 	CDF_VirtualSystemIdentifier,
 	CDF_VirtualSystemType
@@ -438,6 +440,7 @@
 	set_str_prop(dbctx, CDF_SuspendDataRoot, instance, "SuspendDataRoot");
 	set_str_prop(dbctx, CDF_SwapFileDataRoot, instance, "SwapFileDataRoot");
 	set_u32_prop(dbctx, CDF_VNCPort, instance, "VNCPort");
+	set_str_prop(dbctx, CDF_VNCPassword, instance, "VNCPassword");
 	set_u32_prop(dbctx, CDF_VirtType, instance, "VirtType");
 	set_str_prop(dbctx, CDF_VirtualSystemIdentifier, instance, "VirtualSystemIdentifier");
 	set_str_prop(dbctx, CDF_VirtualSystemType, instance, "VirtualSystemType");
@@ -923,6 +926,7 @@
 		mod_add_str_prop(pstra, modified_instance, "SuspendDataRoot", properties);
 		mod_add_str_prop(pstra, modified_instance, "SwapFileDataRoot", properties);
 		mod_add_u32_prop(pstra, modified_instance, "VNCPort", properties, NULL);
+		mod_add_str_prop(pstra, modified_instance, "VNCPassword", properties);
 		mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data);
 		if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
 			cmpiutilStrArray_destroy(pstra);
@@ -1115,6 +1119,7 @@
 		add_str_prop_to_query(pstrbuf, newinstance, "SuspendDataRoot", 0);
 		add_str_prop_to_query(pstrbuf, newinstance, "SwapFileDataRoot", 0);
 		add_u32_prop_to_query(pstrbuf, newinstance, "VNCPort", NULL);
+		add_str_prop_to_query(pstrbuf, newinstance, "VNCPassword", 0);
 		add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data);
 		if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
 			cmpiutilStrBuf_destroy(pstrbuf);


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