omc-commit Mailing List for OMC - Open Management with CIM

Revision: 1172
          http://omc.svn.sourceforge.net/omc/?rev=1172&view=rev
Author:   mgfritch
Date:     2009-04-02 22:29:05 +0000 (Thu, 02 Apr 2009)

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

- Fixup incomplete suse11_ostypes.patch

Modified Paths:
--------------
    contrib/xen-vm-builder/trunk/suse11_ostypes.patch

Modified: contrib/xen-vm-builder/trunk/suse11_ostypes.patch
===================================================================
--- contrib/xen-vm-builder/trunk/suse11_ostypes.patch	2009-04-02 18:37:19 UTC (rev 1171)
+++ contrib/xen-vm-builder/trunk/suse11_ostypes.patch	2009-04-02 22:29:05 UTC (rev 1172)
@@ -1,6 +1,6 @@
 Index: mof/XEN_VMBuilderVirtualSystemCreationData.mof
 ===================================================================
---- mof/XEN_VMBuilderVirtualSystemCreationData.mof	(revision 1169)
+--- mof/XEN_VMBuilderVirtualSystemCreationData.mof	(revision 1171)
 +++ mof/XEN_VMBuilderVirtualSystemCreationData.mof	(working copy)
 @@ -110,13 +110,13 @@
  		" provides bootstrap capability. "),
@@ -18,9 +18,22 @@
  	uint32 OSType;
  
  	[Description("Behaviour of a domain when it is powered off. "
+Index: src/providers/vm-builder/vmcreation-data.c
+===================================================================
+--- src/providers/vm-builder/vmcreation-data.c	(revision 1171)
++++ src/providers/vm-builder/vmcreation-data.c	(working copy)
+@@ -181,7 +181,7 @@
+ {
+ 	CMSetStatus(pstatus, CMPI_RC_OK);
+ 	if (!CMIsNullValue((*pdata))) {
+-		if (pdata->value.uint32 > 24) {
++		if (pdata->value.uint32 > 28) {
+ 			CMSetStatusWithChars(_broker, pstatus,
+ 				CMPI_RC_ERR_INVALID_PARAMETER,
+ 				"Invalid 'OSType' property");
 Index: src/providers/vm-builder/builder-service.c
 ===================================================================
---- src/providers/vm-builder/builder-service.c	(revision 1169)
+--- src/providers/vm-builder/builder-service.c	(revision 1171)
 +++ src/providers/vm-builder/builder-service.c	(working copy)
 @@ -93,7 +93,11 @@
  	"windowsvistax64",
@@ -28,10 +41,10 @@
  	"winserver2008",
 -	"winserver2008x64"
 +	"winserver2008x64",
-+        "opensuse11",
-+        "pxe",
-+        "sled11",
-+        "sles11"
++	"opensuse11",
++	"pxe",
++	"sled11",
++	"sles11"
  };
  size_t NumOsTypes = sizeof(OSTypes) / sizeof(char*);
  


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

Revision: 1171
          http://omc.svn.sourceforge.net/omc/?rev=1171&view=rev
Author:   mgfritch
Date:     2009-04-02 18:37:19 +0000 (Thu, 02 Apr 2009)

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

- Added patch for extending the OSTypes available on SUSE11

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

Added Paths:
-----------
    contrib/xen-vm-builder/trunk/suse11_ostypes.patch

Modified: contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec
===================================================================
--- contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec	2009-04-01 16:17:49 UTC (rev 1170)
+++ contrib/xen-vm-builder/trunk/sblim-cmpi-xenvm-builder.spec	2009-04-02 18:37:19 UTC (rev 1171)
@@ -16,7 +16,7 @@
 %define tarname sblim-cmpi-xenvm-builder
 Url:            http://www.omc-project.org
 # Increment the version every time the source code changes.
-Version:        1.0.1
+Version:        1.0.3
 Release:        0.2
 Group:          System/Management
 Summary:        Linux CIM providers for CMPI instrumentation of virtual machine creation
@@ -31,7 +31,11 @@
 Obsoletes:      novell-zenworks-vmbuilder-cimproviders novell-zenworks-vmbuilder-cli novell-zenworks-vmbuilder-zosjob
 Source0:        %{tarname}-%{version}.tar.gz
 #Source1:        %{tarname}-mof.tar.bz2
+%if 0%{?suse_version} >= 1100 || 0%{?sles_version} >= 11
+Patch0:         suse11_ostypes.patch
+%endif
 
+
 %description
 Linux CIM providers for CMPI instrumentation of XEN virtual machine
 creation.
@@ -45,6 +49,9 @@
 %prep
 # Untar the sources.
 %setup -n %{tarname}-%{version}
+%if 0%{?suse_version} >= 1100 || 0%{?sles_version} >= 11
+%patch0 -p0
+%endif
 
 %build
 # If the LD_RUN_PATH environment variable is set at link time,

Added: contrib/xen-vm-builder/trunk/suse11_ostypes.patch
===================================================================
--- contrib/xen-vm-builder/trunk/suse11_ostypes.patch	                        (rev 0)
+++ contrib/xen-vm-builder/trunk/suse11_ostypes.patch	2009-04-02 18:37:19 UTC (rev 1171)
@@ -0,0 +1,37 @@
+Index: mof/XEN_VMBuilderVirtualSystemCreationData.mof
+===================================================================
+--- mof/XEN_VMBuilderVirtualSystemCreationData.mof	(revision 1169)
++++ mof/XEN_VMBuilderVirtualSystemCreationData.mof	(working copy)
+@@ -110,13 +110,13 @@
+ 		" 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",
+-			"22", "23", "24"},
++			"22", "23", "24", "25", "26", "27", "28"},
+ 		Values { "other", "suse", "sles8", "sles9", "sles10", "sled10",
+ 			"oes2l", "oes2nw", "netware", "redhat", "rhel3", "rhel4",
+ 			"rhel5", "solaris9", "solaris10", "windows", "windowsx64",
+ 			"windowsnt", "windowsxp", "windowsxpx64", "windowsvista",
+ 			"windowsvistax64", "opensuse", "winserver2008",
+-			"winserver2008x64" }]
++			"winserver2008x64", "opensuse11", "pxe", "sled11", "sles11" }]
+ 	uint32 OSType;
+ 
+ 	[Description("Behaviour of a domain when it is powered off. "
+Index: src/providers/vm-builder/builder-service.c
+===================================================================
+--- src/providers/vm-builder/builder-service.c	(revision 1169)
++++ src/providers/vm-builder/builder-service.c	(working copy)
+@@ -93,7 +93,11 @@
+ 	"windowsvistax64",
+ 	"opensuse",
+ 	"winserver2008",
+-	"winserver2008x64"
++	"winserver2008x64",
++        "opensuse11",
++        "pxe",
++        "sled11",
++        "sles11"
+ };
+ size_t NumOsTypes = sizeof(OSTypes) / sizeof(char*);
+ 


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

Revision: 1170
          http://omc.svn.sourceforge.net/omc/?rev=1170&view=rev
Author:   bartw
Date:     2009-04-01 16:17:49 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
added version to caption

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

Modified: pybase/trunk/OMC_InitdService.py
===================================================================
--- pybase/trunk/OMC_InitdService.py	2009-03-30 13:56:02 UTC (rev 1169)
+++ pybase/trunk/OMC_InitdService.py	2009-04-01 16:17:49 UTC (rev 1170)
@@ -81,13 +81,14 @@
                        
 
 #------------------------------------------------------------------------------
-def _get_rpm_install_date(fullpath):
+def _get_rpm_install_date_and_version(fullpath):
     try:
         l=Popen([r'/bin/rpm', '-qf', '--queryformat', \
-                '%{INSTALLTIME}', fullpath], \
+                '%{INSTALLTIME} %{VERSION}', fullpath], \
                 stdout=PIPE).communicate()[0]
         if len(l):
-            return pywbem.CIMDateTime.fromtimestamp(long(l))
+            l = l.split()
+            return (pywbem.CIMDateTime.fromtimestamp(long(l[0])), l[1]) 
     except:
         pass
     return None
@@ -149,14 +150,17 @@
             if line.startswith('#') and 'Short-Description:' in line:
                 caption = line[line.find(':')+1:]
                 break
+
+        idt_and_ver = _get_rpm_install_date_and_version(fullpath)
+        if idt_and_ver is not None:
+            idt, ver = idt_and_ver
+            model['InstallDate'] = idt
+            caption+= ' version '+ver
+
         if caption:
             model['Caption'] = caption
             model['Description'] = caption
 
-        idt = _get_rpm_install_date(fullpath)
-        if idt:
-            model['InstallDate'] = idt
-
         osts = []
         cmd = fullpath + ' status'
         st = call(cmd, shell=True)


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