Ubuntu
cim-schema package

Merge lp:~mathiaz/ubuntu/karmic/cim-schema/2.22.0-update into lp:ubuntu/karmic/cim-schema

  1. Karmic (9.10)
  2. 2.22.0-update
  3. Merge into karmic
Proposed by Mathias Gug
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp:~mathiaz/ubuntu/karmic/cim-schema/2.22.0-update
Merge into: lp:ubuntu/karmic/cim-schema
Diff against target: None lines
To merge this branch: bzr merge lp:~mathiaz/ubuntu/karmic/cim-schema/2.22.0-update
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Review via email: mp+9397@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

Update to latest version of cim-schema (2.22.0)

Revision history for this message
Thierry Carrez (ttx) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2008-08-27 11:09:14 +0000
3+++ debian/changelog 2009-07-28 20:36:00 +0000
4@@ -1,3 +1,9 @@
5+cim-schema (2.22.0-0ubuntu1) karmic; urgency=low
6+
7+ * New upstream release.
8+
9+ -- Mathias Gug <mathiaz@ubuntu.com> Tue, 28 Jul 2009 15:07:28 -0400
10+
11 cim-schema (2.18.1-0ubuntu1) intrepid; urgency=low
12
13 * Initial Release.
14
15=== modified file 'debian/control'
16--- debian/control 2008-08-27 11:09:14 +0000
17+++ debian/control 2009-07-28 20:36:00 +0000
18@@ -1,7 +1,7 @@
19 Source: cim-schema
20 Priority: optional
21 Section: net
22-Build-Depends: debhelper
23+Build-Depends: debhelper (>= 5)
24 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
25 Standards-Version: 3.8.0
26
27
28=== added file 'debian/postinst'
29--- debian/postinst 1970-01-01 00:00:00 +0000
30+++ debian/postinst 2009-07-28 20:36:00 +0000
31@@ -0,0 +1,52 @@
32+#!/bin/sh
33+# postinst script for cim-schema
34+#
35+# see: dh_installdeb(1)
36+
37+set -e
38+
39+# summary of how this script can be called:
40+# * <postinst> `configure' <most-recently-configured-version>
41+# * <old-postinst> `abort-upgrade' <new version>
42+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
43+# <new-version>
44+# * <postinst> `abort-remove'
45+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
46+# <failed-install-package> <version> `removing'
47+# <conflicting-package> <version>
48+# for details, see http://www.debian.org/doc/debian-policy/ or
49+# the debian-policy package
50+
51+
52+case "$1" in
53+ configure)
54+ if [ -n "$2" ]; then
55+ # On package upgrade, rebuild the CIM repository
56+ if which sfcbrepos >/dev/null ; then sfcbrepos -f ; fi
57+
58+ # Restart sfcb
59+ if [ -x "/etc/init.d/sfcb" ]; then
60+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
61+ invoke-rc.d sfcb restart || exit $?
62+ else
63+ /etc/init.d/sfcb restart || exit $?
64+ fi
65+ fi
66+ fi
67+ ;;
68+
69+ abort-upgrade|abort-remove|abort-deconfigure)
70+ ;;
71+
72+ *)
73+ echo "postinst called with unknown argument \`$1'" >&2
74+ exit 1
75+ ;;
76+esac
77+
78+# dh_installdeb will replace this with shell code automatically
79+# generated by other debhelper scripts.
80+
81+#DEBHELPER#
82+
83+exit 0
84
85=== modified file 'debian/rules'
86--- debian/rules 2008-08-27 11:09:14 +0000
87+++ debian/rules 2009-07-28 20:36:00 +0000
88@@ -1,10 +1,10 @@
89 #!/usr/bin/make -f
90 # makefile for cim-schema
91
92-DMTF_CIM_DIR := http://www.dmtf.org/standards/cim/cim_schema_v2181
93-SCHEMA_ZIP := cim_schema_2.18.1-Final-MOFs.zip
94-CIM_VERSION := 2.18.1
95-SCHEMA_MOF := cimv218.mof
96+DMTF_CIM_DIR := http://www.dmtf.org/standards/cim/cim_schema_v2220
97+SCHEMA_ZIP := cim_schema_2.22.0Final-MOFs.zip
98+CIM_VERSION := 2.22.0
99+SCHEMA_MOF := cim_schema_2.22.0.mof
100
101 build:
102 dh_testdir
103
104=== modified file 'schema/Application/CIM_Action.mof'
105--- schema/Application/CIM_Action.mof 2008-08-27 11:09:14 +0000
106+++ schema/Application/CIM_Action.mof 2009-07-28 19:10:03 +0000
107@@ -56,7 +56,10 @@
108 "46", "47", "48", "49", "50", "51", "52", "53", "54",
109 "55", "56", "57", "58", "59", "60", "61", "62", "63",
110 "64", "65", "66", "67", "68", "69", "70", "71", "72",
111- "73", "74", "75", "76", "77" },
112+ "73", "74", "75", "76", "77", "78", "79", "80", "81",
113+ "82", "83", "84", "85", "86", "87", "88", "89", "90",
114+ "91", "92", "93", "94", "95", "96", "97", "98", "99",
115+ "100", "101", "102", "103" },
116 Values { "Unknown", "Other", "MACOS", "ATTUNIX", "DGUX",
117 "DECNT", "Tru64 UNIX", "OpenVMS", "HPUX", "AIX",
118 //10
119@@ -86,7 +89,21 @@
120 "Windows Vista", "Windows Vista 64-Bit",
121 "Windows Embedded for Point of Service",
122 "Microsoft Windows Server 2008",
123- "Microsoft Windows Server 2008 64-Bit" },
124+ "Microsoft Windows Server 2008 64-Bit", "FreeBSD 64-Bit",
125+ "RedHat Enterprise Linux",
126+ //80
127+ "RedHat Enterprise Linux 64-Bit",
128+ "Solaris 64-Bit", "SUSE", "SUSE 64-Bit", "SLES",
129+ "SLES 64-Bit", "Novell OES", "Novell Linux Desktop",
130+ "Sun Java Desktop System", "Mandriva",
131+ //90
132+ "Mandriva 64-Bit", "TurboLinux",
133+ "TurboLinux 64-Bit", "Ubuntu", "Ubuntu 64-Bit", "Debian",
134+ "Debian 64-Bit", "Linux 2.4.x", "Linux 2.4.x 64-Bit",
135+ "Linux 2.6.x", //100
136+ "Linux 2.6.x 64-Bit",
137+ "Linux 64-Bit", "Other 64-Bit",
138+ "Microsoft Windows Server 2008 R2" },
139 Propagated ( "CIM_SoftwareElement.TargetOperatingSystem" )]
140 uint16 TargetOperatingSystem;
141
142
143=== modified file 'schema/Application/CIM_ArchitectureCheck.mof'
144--- schema/Application/CIM_ArchitectureCheck.mof 2008-08-27 11:09:14 +0000
145+++ schema/Application/CIM_ArchitectureCheck.mof 2009-07-28 19:10:03 +0000
146@@ -1,5 +1,5 @@
147 // Copyright (c) 2008 DMTF. All rights reserved.
148- [Version ( "2.18.0" ),
149+ [Version ( "2.19.0" ),
150 UMLPackagePath ( "CIM::Application::CheckAction" ),
151 Description (
152 "ArchitectureCheck specifies the hardware platform on which a "
153@@ -23,13 +23,14 @@
154 ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
155 // 11
156 "11", "12", "13", "14",
157- "15", "16", "17", "18", "19",
158+ "15", "16", "17", "18", "19", "20", "21",
159 // 24
160 "24", "25", "26", "27",
161 "28", "29", "30", "31", "32", "33", "34", "35", "36",
162- "37", "38", "39", // 48
163- "48",
164- "49", "50", "51", "52", "53", "54", "55",
165+ "37", "38", "39", "40", "41", "42", "43",
166+ // 48
167+ "48", "49", "50", "51",
168+ "52", "53", "54", "55", "56", "57", "58",
169 // 64
170 "64", "65", "66", "67",
171 "68", "69", // 80
172@@ -48,17 +49,25 @@
173 "144", "145",
174 "146", "147", "148", "149", "150",
175 // 160
176- "160", "176",
177- "177", "178", "179", "180", "181", "182", "183", "184",
178- "185", "186", "187", "188", "189",
179+ "160", "161",
180+ "162", "163", "164", "165", "166", "167", "168", "169",
181+ // 170
182+ "170", "171", "172", "173", "174", "175",
183+ "176", "177", "178", "179", // 180
184+ "180", "181",
185+ "182", "183", "184", "185", "186", "187", "188", "189",
186 // 190
187- "190", "191",
188+ "190", "191", "192",
189+ "193", "194", "195", "196", "197", "198", "199",
190 // 200
191 "200", "201", "202",
192 "203", "204", // 210
193 "210", "211", "212", "213",
194- // 230
195- "230",
196+ "214", "215", "216", "218", "219", // 220
197+ "221",
198+ "222", "223", // 230
199+ "230", "231", "232",
200+ "233", "234", "235", "236", "237", "238", "239",
201 // 250
202 "250", "251", "254",
203 "255", "260", "261", "280", "281",
204@@ -75,6 +84,8 @@
205 "Pentium(R) processor with MMX(TM) technology",
206 "Celeron(TM)", "Pentium(R) II Xeon(TM)", "Pentium(R) III",
207 "M1 Family", "M2 Family",
208+ "Intel(R) Celeron(R) M processor",
209+ "Intel(R) Pentium(R) 4 HT processor",
210 // 24
211 "K5 Family",
212 "K6 Family", "K6-2", "K6-3",
213@@ -85,11 +96,19 @@
214 "Power PC Family", "Power PC 601", "Power PC 603",
215 "Power PC 603+", "Power PC 604", "Power PC 620",
216 "Power PC X704", "Power PC 750",
217+ "Intel(R) Core(TM) Duo processor",
218+ "Intel(R) Core(TM) Duo mobile processor",
219+ "Intel(R) Core(TM) Solo mobile processor",
220+ "Intel(R) Atom(TM) processor",
221 // 48
222 "Alpha Family",
223 "Alpha 21064", "Alpha 21066", "Alpha 21164",
224 "Alpha 21164PC", "Alpha 21164a", "Alpha 21264",
225 "Alpha 21364",
226+ // 56
227+ "AMD Turion(TM) II Ultra Dual-Core Mobile M Processor Family",
228+ "AMD Turion(TM) II Dual-Core Mobile M Processor Family",
229+ "AMD Athlon(TM) II Dual-Core Mobile M Processor Family",
230 // 64
231 "MIPS Family",
232 "MIPS R4000", "MIPS R4200", "MIPS R4400", "MIPS R4600",
233@@ -127,6 +146,23 @@
234 "PA-RISC 7200", "PA-RISC 7100LC", "PA-RISC 7100",
235 // 160
236 "V30 Family",
237+ // 161
238+ "Quad-Core Intel(R) Xeon(R) processor 3200 Series",
239+ "Dual-Core Intel(R) Xeon(R) processor 3000 Series",
240+ "Quad-Core Intel(R) Xeon(R) processor 5300 Series",
241+ "Dual-Core Intel(R) Xeon(R) processor 5100 Series",
242+ "Dual-Core Intel(R) Xeon(R) processor 5000 Series",
243+ "Dual-Core Intel(R) Xeon(R) processor LV",
244+ "Dual-Core Intel(R) Xeon(R) processor ULV",
245+ "Dual-Core Intel(R) Xeon(R) processor 7100 Series",
246+ "Quad-Core Intel(R) Xeon(R) processor 5400 Series",
247+ "Quad-Core Intel(R) Xeon(R) processor",
248+ "Dual-Core Intel(R) Xeon(R) processor 5200 Series",
249+ "Dual-Core Intel(R) Xeon(R) processor 7200 Series",
250+ "Quad-Core Intel(R) Xeon(R) processor 7300 Series",
251+ "Quad-Core Intel(R) Xeon(R) processor 7400 Series",
252+ "Multi-Core Intel(R) Xeon(R) processor 7400 Series",
253+ // 176
254 "Pentium(R) III Xeon(TM)",
255 "Pentium(R) III Processor with Intel(R) SpeedStep(TM) Technology",
256 "Pentium(R) 4", "Intel(R) Xeon(TM)",
257@@ -143,6 +179,14 @@
258 // 190
259 "K7",
260 "Intel(R) Core(TM)2 Duo Processor",
261+ "Intel(R) Core(TM)2 Solo processor",
262+ "Intel(R) Core(TM)2 Extreme processor",
263+ "Intel(R) Core(TM)2 Quad processor",
264+ "Intel(R) Core(TM)2 Extreme mobile processor",
265+ "Intel(R) Core(TM)2 Duo mobile processor",
266+ "Intel(R) Core(TM)2 Solo mobile processor",
267+ "Intel(R) Core(TM) i7 processor",
268+ "Dual-Core Intel(R) Celeron(R) Processor",
269 // 200
270 "S/390 and zSeries Family",
271 "ESA/390 G4", "ESA/390 G5", "ESA/390 G6",
272@@ -152,8 +196,26 @@
273 "VIA C7(TM)-D Processor Family",
274 "VIA C7(TM) Processor Family",
275 "VIA Eden(TM) Processor Family",
276+ "Multi-Core Intel(R) Xeon(R) processor",
277+ "Dual-Core Intel(R) Xeon(R) processor 3xxx Series",
278+ "Quad-Core Intel(R) Xeon(R) processor 3xxx Series",
279+ "Dual-Core Intel(R) Xeon(R) processor 5xxx Series",
280+ "Quad-Core Intel(R) Xeon(R) processor 5xxx Series",
281+ // 200
282+ "Dual-Core Intel(R) Xeon(R) processor 7xxx Series",
283+ "Quad-Core Intel(R) Xeon(R) processor 7xxx Series",
284+ "Multi-Core Intel(R) Xeon(R) processor 7xxx Series",
285 // 230
286 "Embedded AMD Opteron(TM) Quad-Core Processor Family",
287+ "AMD Phenom(TM) Triple-Core Processor Family",
288+ "AMD Turion(TM) Ultra Dual-Core Mobile Processor Family",
289+ "AMD Turion(TM) Dual-Core Mobile Processor Family",
290+ "AMD Athlon(TM) Dual-Core Processor Family",
291+ "AMD Sempron(TM) SI Processor Family",
292+ "AMD Phenom(TM) II Processor Family",
293+ "AMD Athlon(TM) II Processor Family",
294+ "Six-Core AMD Opteron(TM) Processor Family",
295+ "AMD Sempron(TM) M Processor Family",
296 // 250
297 "i860", "i960",
298 "Reserved (SMBIOS Extension)",
299
300=== modified file 'schema/Application/CIM_Check.mof'
301--- schema/Application/CIM_Check.mof 2008-08-27 11:09:14 +0000
302+++ schema/Application/CIM_Check.mof 2009-07-28 19:10:03 +0000
303@@ -64,7 +64,10 @@
304 "46", "47", "48", "49", "50", "51", "52", "53", "54",
305 "55", "56", "57", "58", "59", "60", "61", "62", "63",
306 "64", "65", "66", "67", "68", "69", "70", "71", "72",
307- "73", "74", "75", "76", "77" },
308+ "73", "74", "75", "76", "77", "78", "79", "80", "81",
309+ "82", "83", "84", "85", "86", "87", "88", "89", "90",
310+ "91", "92", "93", "94", "95", "96", "97", "98", "99",
311+ "100", "101", "102", "103" },
312 Values { "Unknown", "Other", "MACOS", "ATTUNIX", "DGUX",
313 "DECNT", "Tru64 UNIX", "OpenVMS", "HPUX", "AIX",
314 //10
315@@ -94,7 +97,21 @@
316 "Windows Vista", "Windows Vista 64-Bit",
317 "Windows Embedded for Point of Service",
318 "Microsoft Windows Server 2008",
319- "Microsoft Windows Server 2008 64-Bit" },
320+ "Microsoft Windows Server 2008 64-Bit", "FreeBSD 64-Bit",
321+ "RedHat Enterprise Linux",
322+ //80
323+ "RedHat Enterprise Linux 64-Bit",
324+ "Solaris 64-Bit", "SUSE", "SUSE 64-Bit", "SLES",
325+ "SLES 64-Bit", "Novell OES", "Novell Linux Desktop",
326+ "Sun Java Desktop System", "Mandriva",
327+ //90
328+ "Mandriva 64-Bit", "TurboLinux",
329+ "TurboLinux 64-Bit", "Ubuntu", "Ubuntu 64-Bit", "Debian",
330+ "Debian 64-Bit", "Linux 2.4.x", "Linux 2.4.x 64-Bit",
331+ "Linux 2.6.x", //100
332+ "Linux 2.6.x 64-Bit",
333+ "Linux 64-Bit", "Other 64-Bit",
334+ "Microsoft Windows Server 2008 R2" },
335 Propagated ( "CIM_SoftwareElement.TargetOperatingSystem" )]
336 uint16 TargetOperatingSystem;
337
338
339=== modified file 'schema/Application/CIM_DiskSpaceCheck.mof'
340--- schema/Application/CIM_DiskSpaceCheck.mof 2008-08-27 11:09:14 +0000
341+++ schema/Application/CIM_DiskSpaceCheck.mof 2009-07-28 19:10:03 +0000
342@@ -1,9 +1,4 @@
343 // Copyright (c) 2005 DMTF. All rights reserved.
344-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
345-// qualifier values to CIM Schema.</change>
346-// ==================================================================
347-// CIM_DiskSpaceCheck
348-// ==================================================================
349 [Version ( "2.6.0" ),
350 UMLPackagePath ( "CIM::Application::CheckAction" ),
351 Description (
352@@ -23,7 +18,8 @@
353 "amount of disk space that needs to be available on the "
354 "target system." ),
355 Units ( "KiloBytes" ),
356- ModelCorrespondence { "CIM_FileSystem.AvailableSpace" }]
357+ ModelCorrespondence { "CIM_FileSystem.AvailableSpace" },
358+ PUnit ( "byte * 10^3" )]
359 uint64 AvailableDiskSpace;
360
361
362
363=== modified file 'schema/Application/CIM_FileSpecification.mof'
364--- schema/Application/CIM_FileSpecification.mof 2008-08-27 11:09:14 +0000
365+++ schema/Application/CIM_FileSpecification.mof 2009-07-28 19:10:03 +0000
366@@ -1,9 +1,4 @@
367 // Copyright (c) 2005 DMTF. All rights reserved.
368-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
369-// qualifier values to CIM Schema.</change>
370-// ==================================================================
371-// CIM_FileSpecification
372-// ==================================================================
373 [Version ( "2.6.0" ),
374 UMLPackagePath ( "CIM::Application::CheckAction" ),
375 Description (
376@@ -28,7 +23,8 @@
377 datetime CreateTimeStamp;
378
379 [Description ( "The size of the file in Kilobytes." ),
380- Units ( "KiloBytes" )]
381+ Units ( "KiloBytes" ),
382+ PUnit ( "byte * 10^3" )]
383 uint64 FileSize;
384
385 [Description (
386
387=== modified file 'schema/Application/CIM_J2eeJCAConnectionFactory.mof'
388--- schema/Application/CIM_J2eeJCAConnectionFactory.mof 2008-08-27 11:09:14 +0000
389+++ schema/Application/CIM_J2eeJCAConnectionFactory.mof 2009-07-28 19:10:03 +0000
390@@ -1,17 +1,13 @@
391-// Copyright (c) 2005 DMTF. All rights reserved.
392-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
393-// qualifier values to CIM Schema.</change>
394-// ==================================================================
395-// CIM_J2eeJCAConnectionFactory
396-// ==================================================================
397- [Version ( "2.8.0" ),
398+// Copyright (c) 2008 DMTF. All rights reserved.
399+ [Version ( "2.19.0" ),
400 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
401 Description (
402 "The CIM_J2eeJCAConnectionFactory class identifies individual "
403 "JCA connection factories." )]
404 class CIM_J2eeJCAConnectionFactory : CIM_EnabledLogicalElement {
405
406- [Key, Description (
407+ [Key, Override ( "InstanceID" ),
408+ Description (
409 "InstanceID identifies a unique instance of a J2ee "
410 "JCAConnectionFactory. In order to ensure uniqueness, the "
411 "value of InstanceID MUST be constructed using the form "
412
413=== modified file 'schema/Application/CIM_J2eeJCAManagedConnectionFactory.mof'
414--- schema/Application/CIM_J2eeJCAManagedConnectionFactory.mof 2008-08-27 11:09:14 +0000
415+++ schema/Application/CIM_J2eeJCAManagedConnectionFactory.mof 2009-07-28 19:10:03 +0000
416@@ -1,16 +1,12 @@
417-// Copyright (c) 2005 DMTF. All rights reserved.
418-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
419-// qualifier values to CIM Schema.</change>
420-// ==================================================================
421-// CIM_J2eeJCAManagedConnectionFactory
422-// ==================================================================
423- [Version ( "2.8.0" ),
424+// Copyright (c) 2008 DMTF. All rights reserved.
425+ [Version ( "2.19.0" ),
426 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
427 Description (
428 "This class identifies JCA managed connection factories." )]
429 class CIM_J2eeJCAManagedConnectionFactory : CIM_EnabledLogicalElement {
430
431- [Key, Description (
432+ [Key, Override ( "InstanceID" ),
433+ Description (
434 "InstanceID identifies a unique instance of a J2ee "
435 "JCAManagedConnectionFactory. In order to ensure "
436 "uniqueness, the value of InstanceID MUST be constructed "
437
438=== modified file 'schema/Application/CIM_J2eeJDBCDataSource.mof'
439--- schema/Application/CIM_J2eeJDBCDataSource.mof 2008-08-27 11:09:14 +0000
440+++ schema/Application/CIM_J2eeJDBCDataSource.mof 2009-07-28 19:10:03 +0000
441@@ -1,17 +1,13 @@
442-// Copyright (c) 2005 DMTF. All rights reserved.
443-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
444-// qualifier values to CIM Schema.</change>
445-// ==================================================================
446-// CIM_J2eeJDBCDataSource
447-// ==================================================================
448- [Version ( "2.8.0" ),
449+// Copyright (c) 2008 DMTF. All rights reserved.
450+ [Version ( "2.19.0" ),
451 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
452 Description (
453 "The CIM_J2eeJDBCDataSource class contains instances that "
454 "identify physical JDBC data sources." )]
455 class CIM_J2eeJDBCDataSource : CIM_EnabledLogicalElement {
456
457- [Key, Description (
458+ [Key, Override ( "InstanceID" ),
459+ Description (
460 "InstanceID identifies a unique instance of a J2ee "
461 "JDBCDataSource. In order to ensure uniqueness, the value "
462 "of InstanceID MUST be constructed using the form "
463
464=== modified file 'schema/Application/CIM_J2eeJDBCDriver.mof'
465--- schema/Application/CIM_J2eeJDBCDriver.mof 2008-08-27 11:09:14 +0000
466+++ schema/Application/CIM_J2eeJDBCDriver.mof 2009-07-28 19:10:03 +0000
467@@ -1,17 +1,13 @@
468-// Copyright (c) 2005 DMTF. All rights reserved.
469-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
470-// qualifier values to CIM Schema.</change>
471-// ==================================================================
472-// CIM_J2eeJDBCDriver
473-// ==================================================================
474- [Version ( "2.8.0" ),
475+// Copyright (c) 2008 DMTF. All rights reserved.
476+ [Version ( "2.19.0" ),
477 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
478 Description (
479 "The CIM_J2eeJDBCDriver class identifies individual JDBC drivers."
480 )]
481 class CIM_J2eeJDBCDriver : CIM_EnabledLogicalElement {
482
483- [Key, Description (
484+ [Key, Override ( "InstanceID" ),
485+ Description (
486 "InstanceID identifies a unique instance of a J2ee "
487 "JDBCDriver. In order to ensure uniqueness, the value of "
488 "InstanceID MUST be constructed using the form specified "
489
490=== modified file 'schema/Application/CIM_J2eeJVM.mof'
491--- schema/Application/CIM_J2eeJVM.mof 2008-08-27 11:09:14 +0000
492+++ schema/Application/CIM_J2eeJVM.mof 2009-07-28 19:10:03 +0000
493@@ -1,10 +1,5 @@
494-// Copyright (c) 2005 DMTF. All rights reserved.
495-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
496-// qualifier values to CIM Schema.</change>
497-// ==================================================================
498-// CIM_J2eeJVM
499-// ==================================================================
500- [Version ( "2.8.0" ),
501+// Copyright (c) 2008 DMTF. All rights reserved.
502+ [Version ( "2.19.0" ),
503 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
504 Description (
505 "The CIM_J2eeJVM class identifies a Java VM that is utilized by "
506@@ -21,7 +16,8 @@
507 "be pushed down in the hierarchy." )]
508 class CIM_J2eeJVM : CIM_EnabledLogicalElement {
509
510- [Key, Description (
511+ [Key, Override ( "InstanceID" ),
512+ Description (
513 "InstanceID identifies a unique instance of a J2ee JVM In "
514 "order to ensure uniqueness, the value of InstanceID MUST "
515 "be constructed using the form specified in JSR77.3.1.1.1 "
516
517=== modified file 'schema/Application/CIM_J2eeJVMStats.mof'
518--- schema/Application/CIM_J2eeJVMStats.mof 2008-08-27 11:09:14 +0000
519+++ schema/Application/CIM_J2eeJVMStats.mof 2009-07-28 19:10:03 +0000
520@@ -1,9 +1,4 @@
521 // Copyright (c) 2005 DMTF. All rights reserved.
522-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
523-// qualifier values to CIM Schema.</change>
524-// ==================================================================
525-// CIM_J2eeJVMStats
526-// ==================================================================
527 [Version ( "2.8.2" ),
528 UMLPackagePath ( "CIM::Application::J2eeAppServerStats" ),
529 Description (
530@@ -14,17 +9,20 @@
531 [Description ( "The heap size of the JVM." ),
532 Units ( "Bytes" ),
533 Gauge, MappingStrings {
534- "JSR77.JCP|JSR77.6.31.1.1 getHeapSize|V1.0" }]
535+ "JSR77.JCP|JSR77.6.31.1.1 getHeapSize|V1.0" },
536+ PUnit ( "byte" )]
537 uint64 HeapSize;
538
539 [Description ( "The upper limit for the heap size of the JVM." ),
540 Units ( "Bytes" ),
541- MappingStrings { "JSR77.JCP|JSR77.6.8.1.1 getUpperBound|V1.0" }]
542+ MappingStrings { "JSR77.JCP|JSR77.6.8.1.1 getUpperBound|V1.0" },
543+ PUnit ( "byte" )]
544 uint64 HeapSizeUpperBound;
545
546 [Description ( "The lower limit for the heap size of the JVM." ),
547 Units ( "Bytes" ),
548- MappingStrings { "JSR77.JCP|JSR77.6.8.1.2 getLowerBound|V1.0" }]
549+ MappingStrings { "JSR77.JCP|JSR77.6.8.1.2 getLowerBound|V1.0" },
550+ PUnit ( "byte" )]
551 uint64 HeapSizeLowerBound;
552
553 [Description (
554@@ -32,7 +30,8 @@
555 "the measurement." ),
556 Units ( "Bytes" ),
557 MappingStrings {
558- "JSR77.JCP|JSR77.6.7.1.2 getLowWaterMark|V1.0" }]
559+ "JSR77.JCP|JSR77.6.7.1.2 getLowWaterMark|V1.0" },
560+ PUnit ( "byte" )]
561 uint64 HeapSizeLowWaterMark;
562
563 [Description (
564@@ -40,7 +39,8 @@
565 "the measurement." ),
566 Units ( "Bytes" ),
567 MappingStrings {
568- "JSR77.JCP|JSR77.6.7.1.1 getHighWaterMark|V1.0" }]
569+ "JSR77.JCP|JSR77.6.7.1.1 getHighWaterMark|V1.0" },
570+ PUnit ( "byte" )]
571 uint64 HeapSizeHighWaterMark;
572
573 [Description (
574
575=== modified file 'schema/Application/CIM_J2eeManagedObject.mof'
576--- schema/Application/CIM_J2eeManagedObject.mof 2008-08-27 11:09:14 +0000
577+++ schema/Application/CIM_J2eeManagedObject.mof 2009-07-28 19:10:03 +0000
578@@ -1,10 +1,5 @@
579-// Copyright (c) 2005 DMTF. All rights reserved.
580-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
581-// qualifier values to CIM Schema.</change>
582-// ==================================================================
583-// CIM_J2eeManagedObject
584-// ==================================================================
585- [Abstract, Version ( "2.8.0" ),
586+// Copyright (c) 2008 DMTF. All rights reserved.
587+ [Abstract, Version ( "2.19.0" ),
588 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
589 Description (
590 "CIM_J2eeManagedObject is a class for defining operations that "
591@@ -20,7 +15,8 @@
592 "effect start and stop." )]
593 class CIM_J2eeManagedObject : CIM_EnabledLogicalElement {
594
595- [Key, Description (
596+ [Key, Override ( "InstanceID" ),
597+ Description (
598 "InstanceID identifies a unique instance of a J2EE "
599 "ManagedObject\'s Capabilities in a given namespace. In "
600 "order to ensure uniqueness, the value of InstanceID MUST "
601
602=== modified file 'schema/Application/CIM_J2eeResource.mof'
603--- schema/Application/CIM_J2eeResource.mof 2008-08-27 11:09:14 +0000
604+++ schema/Application/CIM_J2eeResource.mof 2009-07-28 19:10:03 +0000
605@@ -1,10 +1,5 @@
606-// Copyright (c) 2005 DMTF. All rights reserved.
607-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
608-// qualifier values to CIM Schema.</change>
609-// ==================================================================
610-// CIM_J2eeResource
611-// ==================================================================
612- [Abstract, Version ( "2.8.0" ),
613+// Copyright (c) 2008 DMTF. All rights reserved.
614+ [Abstract, Version ( "2.19.0" ),
615 UMLPackagePath ( "CIM::Application::J2eeAppServer" ),
616 Description (
617 "The J2eeResource class is a base class for all managed object "
618@@ -19,7 +14,8 @@
619 "are significantly different from each other." )]
620 class CIM_J2eeResource : CIM_SystemResource {
621
622- [Key, Description (
623+ [Key, Override ( "InstanceID" ),
624+ Description (
625 "InstanceID identifies a unique instance of a J2ee "
626 "Resource. In order to ensure uniqueness, the value of "
627 "InstanceID MUST be constructed using the form specified "
628
629=== modified file 'schema/Application/CIM_MemoryCheck.mof'
630--- schema/Application/CIM_MemoryCheck.mof 2008-08-27 11:09:14 +0000
631+++ schema/Application/CIM_MemoryCheck.mof 2009-07-28 19:10:03 +0000
632@@ -1,9 +1,4 @@
633 // Copyright (c) 2005 DMTF. All rights reserved.
634-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
635-// qualifier values to CIM Schema.</change>
636-// ==================================================================
637-// CIM_MemoryCheck
638-// ==================================================================
639 [Version ( "2.6.0" ),
640 UMLPackagePath ( "CIM::Application::CheckAction" ),
641 Description (
642@@ -22,7 +17,8 @@
643 "The amount of memory that needs to exist on a computer "
644 "system for a SoftwareElement to execute properly." ),
645 Units ( "KiloBytes" ),
646- ModelCorrespondence { "CIM_OperatingSystem.FreePhysicalMemory" }]
647+ ModelCorrespondence { "CIM_OperatingSystem.FreePhysicalMemory" },
648+ PUnit ( "byte * 2^10" )]
649 uint64 MemorySize;
650
651
652
653=== modified file 'schema/Application/CIM_SoftwareElement.mof'
654--- schema/Application/CIM_SoftwareElement.mof 2008-08-27 11:09:14 +0000
655+++ schema/Application/CIM_SoftwareElement.mof 2009-07-28 19:10:03 +0000
656@@ -82,7 +82,10 @@
657 "46", "47", "48", "49", "50", "51", "52", "53", "54",
658 "55", "56", "57", "58", "59", "60", "61", "62", "63",
659 "64", "65", "66", "67", "68", "69", "70", "71", "72",
660- "73", "74", "75", "76", "77" },
661+ "73", "74", "75", "76", "77", "78", "79", "80", "81",
662+ "82", "83", "84", "85", "86", "87", "88", "89", "90",
663+ "91", "92", "93", "94", "95", "96", "97", "98", "99",
664+ "100", "101", "102", "103" },
665 Values { "Unknown", "Other", "MACOS", "ATTUNIX", "DGUX",
666 "DECNT", "Tru64 UNIX", "OpenVMS", "HPUX", "AIX",
667 //10
668@@ -112,7 +115,21 @@
669 "Windows Vista", "Windows Vista 64-Bit",
670 "Windows Embedded for Point of Service",
671 "Microsoft Windows Server 2008",
672- "Microsoft Windows Server 2008 64-Bit" },
673+ "Microsoft Windows Server 2008 64-Bit", "FreeBSD 64-Bit",
674+ "RedHat Enterprise Linux",
675+ //80
676+ "RedHat Enterprise Linux 64-Bit",
677+ "Solaris 64-Bit", "SUSE", "SUSE 64-Bit", "SLES",
678+ "SLES 64-Bit", "Novell OES", "Novell Linux Desktop",
679+ "Sun Java Desktop System", "Mandriva",
680+ //90
681+ "Mandriva 64-Bit", "TurboLinux",
682+ "TurboLinux 64-Bit", "Ubuntu", "Ubuntu 64-Bit", "Debian",
683+ "Debian 64-Bit", "Linux 2.4.x", "Linux 2.4.x 64-Bit",
684+ "Linux 2.6.x", //100
685+ "Linux 2.6.x 64-Bit",
686+ "Linux 64-Bit", "Other 64-Bit",
687+ "Microsoft Windows Server 2008 R2" },
688 MappingStrings { "MIF.DMTF|SubComponent Software|001.8" },
689 ModelCorrespondence { "CIM_OperatingSystem.OSType" }]
690 uint16 TargetOperatingSystem;
691
692=== modified file 'schema/Application/CIM_StatisticalRuntimeOverview.mof'
693--- schema/Application/CIM_StatisticalRuntimeOverview.mof 2008-08-27 11:09:14 +0000
694+++ schema/Application/CIM_StatisticalRuntimeOverview.mof 2009-07-28 19:10:03 +0000
695@@ -1,9 +1,4 @@
696 // Copyright (c) 2005 DMTF. All rights reserved.
697-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
698-// qualifier values to CIM Schema.</change>
699-// ==================================================================
700-// CIM_StatisticalRuntimeOverview
701-// ==================================================================
702 [Version ( "2.8.0" ),
703 UMLPackagePath ( "CIM::Application::AppRuntime" ),
704 Description (
705@@ -63,7 +58,8 @@
706 "the interval is too great, AverageResponseTime becomes "
707 "meaningless for monitoring. If no response time can be "
708 "determined, the value is 0." ),
709- Units ( "MilliSeconds" )]
710+ Units ( "MilliSeconds" ),
711+ PUnit ( "second * 10^-3" )]
712 uint32 AverageResponseTime;
713
714
715
716=== modified file 'schema/Application/CIM_SwapSpaceCheck.mof'
717--- schema/Application/CIM_SwapSpaceCheck.mof 2008-08-27 11:09:14 +0000
718+++ schema/Application/CIM_SwapSpaceCheck.mof 2009-07-28 19:10:03 +0000
719@@ -1,9 +1,4 @@
720 // Copyright (c) 2005 DMTF. All rights reserved.
721-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
722-// qualifier values to CIM Schema.</change>
723-// ==================================================================
724-// CIM_SwapSpaceCheck
725-// ==================================================================
726 [Version ( "2.6.0" ),
727 UMLPackagePath ( "CIM::Application::CheckAction" ),
728 Description (
729@@ -23,7 +18,8 @@
730 "of KiloBytes of swap space that needs to be available on "
731 "the target system." ),
732 Units ( "KiloBytes" ),
733- ModelCorrespondence { "CIM_OperatingSystem.TotalSwapSpaceSize" }]
734+ ModelCorrespondence { "CIM_OperatingSystem.TotalSwapSpaceSize" },
735+ PUnit ( "byte * 10^3" )]
736 uint64 SwapSpaceSize;
737
738
739
740=== added file 'schema/Core/CIM_AllocationCapabilities.mof'
741--- schema/Core/CIM_AllocationCapabilities.mof 1970-01-01 00:00:00 +0000
742+++ schema/Core/CIM_AllocationCapabilities.mof 2009-07-28 19:10:35 +0000
743@@ -0,0 +1,104 @@
744+// Copyright (c) 2009 DMTF. All rights reserved.
745+ [Version ( "2.22.0" ),
746+ UMLPackagePath ( "CIM::Core::Capabilities" ),
747+ Description (
748+ "CIM_AllocationCapabilities extends the CIM_Capabilities class "
749+ "for the purposes of expressing the resource allocation "
750+ "capabilities of the associated managed element for the "
751+ "allocation of a specific Resource Type. This class describes "
752+ "the supported types of allocations allowed, specific or "
753+ "general, the sharing modes supported for the device, dedicated "
754+ "and or shared and the system states where the addition or "
755+ "removal of the Resource Type is allowed." )]
756+class CIM_AllocationCapabilities : CIM_Capabilities {
757+
758+ [Description (
759+ "The type of resource this allocation setting represents." ),
760+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
761+ "11", "12", "13", "14", "15", "16", "17", "18", "19",
762+ "20", "21", "22", "23", "24", "25", "26", "27", "28",
763+ "29", "30", "31", "32", "33", "..", "0x8000..0xFFFF" },
764+ Values { "Other", "Computer System", "Processor", "Memory",
765+ "IDE Controller", "Parallel SCSI HBA", "FC HBA",
766+ "iSCSI HBA", "IB HCA", "Ethernet Adapter",
767+ "Other Network Adapter", "I/O Slot", "I/O Device",
768+ "Floppy Drive", "CD Drive", "DVD drive", "Disk Drive",
769+ "Tape Drive", "Storage Extent", "Other Storage Device",
770+ "Serial port", "Parallel port", "USB Controller",
771+ "Graphics controller", "IEEE 1394 Controller",
772+ "Partitionable Unit", "Base Partitionable Unit", "Power",
773+ "Cooling Capacity", "Ethernet Switch Port",
774+ "Logical Disk", "Storage Volume", "Ethernet Connection",
775+ "DMTF reserved", "Vendor Reserved" },
776+ ModelCorrespondence {
777+ "CIM_AllocationCapabilities.OtherResourceType",
778+ "CIM_ResourceAllocationSettingData.ResourceType" }]
779+ uint16 ResourceType;
780+
781+ [Description (
782+ "A string that describes the resource type when a well "
783+ "defined value is not available and ResourceType has the "
784+ "value \"Other\"." ),
785+ ModelCorrespondence {
786+ "CIM_ResourceAllocationSettingData.ResourceType" }]
787+ string OtherResourceType;
788+
789+ [Description (
790+ "A string describing an implementation specific sub-type "
791+ "for this resource. For example, this may be used to "
792+ "distinguish different models of the same resource type." )]
793+ string ResourceSubType;
794+
795+ [Description (
796+ "Indicates whether requesting a specific resource is "
797+ "supported \n"
798+ "\"Specific\" -- request can include a request for "
799+ "specific resource \n"
800+ "\"General\" -- request does not include specific "
801+ "resource \n"
802+ "\"Both\" -- both specific and general requests are "
803+ "supported." ),
804+ ValueMap { "0", "2", "3", "4", "..", "0x8000..0xFFFF" },
805+ Values { "Unknown", "Specific", "General", "Both",
806+ "DMTF reserved", "Vendor Reserved" }]
807+ uint16 RequestTypesSupported;
808+
809+ [Description (
810+ "Indicates how access to underlying resource is granted: \n"
811+ "\"Dedicated\" -- exclusive access to underlying resource \n"
812+ "\"Shared\" -- shared use of underlying resource. \n"
813+ "Actual quantity is controlled by min, max size, weights, "
814+ "etc." ),
815+ ValueMap { "0", "2", "3", "..", "0x8000..0xFFFF" },
816+ Values { "Unknown", "Dedicated", "Shared", "DMTF reserved",
817+ "Vendor Reserved" }]
818+ uint16 SharingMode;
819+
820+ [Description (
821+ "Indicates the states that the System, to which the "
822+ "resource will be associated via SystemDevice, may be in "
823+ "when a new resource is created." ),
824+ ValueMap { "0", "2", "3", "4", "5", "6", "7", "8", "9", "10",
825+ "11", "12", "..", "0x8000..0xFFFF" },
826+ Values { "Unknown", "Enabled", "Disabled", "Shutting Down",
827+ "Not Applicable", "Enabled but Offline", "In Test",
828+ "Deferred", "Quiesce", "Starting", "Paused", "Suspended",
829+ "DMTF Reserved", "Vendor Reserved" },
830+ ModelCorrespondence { "CIM_EnabledLogicalElement.EnabledState" }]
831+ uint16 SupportedAddStates[];
832+
833+ [Description (
834+ "Indicates the states that the System, to which the "
835+ "resource is associated via SystemDevice, may be in when "
836+ "a the resource is removed ." ),
837+ ValueMap { "0", "2", "3", "4", "5", "6", "7", "8", "9", "10",
838+ "11", "12", "..", "0x8000..0xFFFF" },
839+ Values { "Unknown", "Enabled", "Disabled", "Shutting Down",
840+ "Not Applicable", "Enabled but Offline", "In Test",
841+ "Deferred", "Quiesce", "Starting", "Paused", "Suspended",
842+ "DMTF Reserved", "Vendor Reserved" },
843+ ModelCorrespondence { "CIM_EnabledLogicalElement.EnabledState" }]
844+ uint16 SupportedRemoveStates[];
845+
846+
847+};
848
849=== added file 'schema/Core/CIM_AssociatedPowerManagementService.mof'
850--- schema/Core/CIM_AssociatedPowerManagementService.mof 1970-01-01 00:00:00 +0000
851+++ schema/Core/CIM_AssociatedPowerManagementService.mof 2009-07-28 19:10:35 +0000
852@@ -0,0 +1,89 @@
853+// Copyright (c) 2008 DMTF. All rights reserved.
854+ [Association, Version ( "2.20.0" ),
855+ UMLPackagePath ( "CIM::Core::PowerMgmt" ),
856+ Description (
857+ "The association between a Managed System Element and its power "
858+ "management service." )]
859+class CIM_AssociatedPowerManagementService : CIM_ServiceAvailableToElement {
860+
861+ [Override ( "ServiceProvided" ),
862+ Max ( 1 ),
863+ Description ( "The Service that is available." )]
864+ CIM_PowerManagementService REF ServiceProvided;
865+
866+ [Description (
867+ "The current power state of the associated Managed System Element."
868+ ),
869+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
870+ "11", "12", "13", "14", "15", "16", "17", "..",
871+ "0x7FFF..0xFFFF" },
872+ Values { "Other", "On", "Sleep - Light", "Sleep -Deep",
873+ "Power Cycle (Off - Soft)", "Off - Hard",
874+ "Hibernate (Off - Soft)", "Off - Soft",
875+ "Power Cycle (Off-Hard)", "Master Bus Reset",
876+ "Diagnostic Interrupt (NMI)", "Off - Soft Graceful",
877+ "Off - Hard Graceful", "Master Bus Reset Graceful",
878+ "Power Cycle (Off - Soft Graceful)",
879+ "Power Cycle (Off - Hard Graceful)",
880+ "Diagnostic Interrupt (INIT)", "DMTF Reserved",
881+ "Vendor Specific" },
882+ MappingStrings { "MIF.DMTF|System Power Controls|001.2" },
883+ ModelCorrespondence {
884+ "CIM_PowerManagementCapabilities.PowerCapabilities" }]
885+ uint16 PowerState;
886+
887+ [Description (
888+ "A string describing the additional power management "
889+ "state of the element, used when the PowerState is set to "
890+ "the value 1, \"Other\"." ),
891+ ModelCorrespondence {
892+ "CIM_AssociatedPowerManagementService.PowerState" }]
893+ string OtherPowerState;
894+
895+ [Description (
896+ "The desired or the last requested power state of the "
897+ "associated Managed System Element, irrespective of the "
898+ "mechanism through which the request was made. If the "
899+ "requested power state is unknown, then the property "
900+ "shall have the value of 0 (\"Unknown\"). If the property "
901+ "has no meaning or is not supported, then the property "
902+ "shall have value 12(\"Not Applicable\")." ),
903+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
904+ "10", "11", "12", "13", "14", "15", "16", "17", "18",
905+ "..", "0x7FFF..0xFFFF" },
906+ Values { "Unknown", "Other", "On", "Sleep - Light",
907+ "Sleep -_Deep", "Power Cycle (Off - Soft)", "Off - Hard",
908+ "Hibernate (Off - Soft)", "Off - Soft",
909+ "Power Cycle (Off-Hard)", "Master Bus Reset",
910+ "Diagnostic Interrupt (NMI)", "Not Applicable",
911+ "Off - Soft Graceful", "Off - Hard Graceful",
912+ "Master Bus Reset Graceful",
913+ "Power Cycle (Off - Soft Graceful)",
914+ "Power Cycle (Off - Hard Graceful)",
915+ "Diagnostic Interrupt (INIT)", "DMTF Reserved",
916+ "Vendor Specific" },
917+ MappingStrings { "MIF.DMTF|System Power Controls|001.2" },
918+ ModelCorrespondence {
919+ "CIM_PowerManagementCapabilities.PowerCapabilities",
920+ "CIM_AssociatedPowerManagementService.OtherRequestedPowerState" }]
921+ uint16 RequestedPowerState = 12;
922+
923+ [Description (
924+ "A string describing the additional power management "
925+ "state of the element, used when the RequestedPowerState "
926+ "is set to the value 1, \"Other\"." ),
927+ ModelCorrespondence {
928+ "CIM_AssociatedPowerManagementService.RequestedPowerState" }]
929+ string OtherRequestedPowerState;
930+
931+ [Description (
932+ "The time when the element will be powered on again, used "
933+ "when the RequestedPowerState has the value 2, \"On\", 5, "
934+ "\"Power Cycle (Off - Soft)\" or 6, \"Power Cycle (Off - "
935+ "Hard)\"." ),
936+ ModelCorrespondence {
937+ "CIM_AssociatedPowerManagementService.RequestedPowerState" }]
938+ datetime PowerOnTime;
939+
940+
941+};
942
943=== modified file 'schema/Core/CIM_Capabilities.mof'
944--- schema/Core/CIM_Capabilities.mof 2008-08-27 11:09:14 +0000
945+++ schema/Core/CIM_Capabilities.mof 2009-07-28 19:10:03 +0000
946@@ -1,10 +1,5 @@
947-// Copyright (c) 2005 DMTF. All rights reserved.
948-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
949-// qualifier values to CIM Schema.</change>
950-// ==================================================================
951-// CIM_Capabilities
952-// ==================================================================
953- [Abstract, Version ( "2.7.0" ),
954+// Copyright (c) 2008 DMTF. All rights reserved.
955+ [Abstract, Version ( "2.19.0" ),
956 UMLPackagePath ( "CIM::Core::Capabilities" ),
957 Description (
958 "Capabilities is an abstract class whose subclasses describe "
959@@ -27,7 +22,8 @@
960 "limitations) using this class." )]
961 class CIM_Capabilities : CIM_ManagedElement {
962
963- [Key, Description (
964+ [Key, Override ( "InstanceID" ),
965+ Description (
966 "Within the scope of the instantiating Namespace, "
967 "InstanceID opaquely and uniquely identifies an instance "
968 "of this class. In order to ensure uniqueness within the "
969
970=== modified file 'schema/Core/CIM_ConcreteCollection.mof'
971--- schema/Core/CIM_ConcreteCollection.mof 2008-08-27 11:09:14 +0000
972+++ schema/Core/CIM_ConcreteCollection.mof 2009-07-28 19:10:03 +0000
973@@ -1,11 +1,5 @@
974-// Copyright (c) 2005 DMTF. All rights reserved.
975-// <change cr="SysDevCR00707.002" type ="add">CPUBS corrections to CoreCollection.mof</change>
976-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
977-// qualifier values to CIM Schema.</change>
978-// ==================================================================
979-// CIM_ConcreteCollection
980-// ==================================================================
981- [Version ( "2.10.0" ),
982+// Copyright (c) 2008 DMTF. All rights reserved.
983+ [Version ( "2.19.0" ),
984 UMLPackagePath ( "CIM::Core::Collection" ),
985 Description (
986 "A concrete version of Collection. This class represents a "
987@@ -23,7 +17,8 @@
988 "an abstract to a concrete class." )]
989 class CIM_ConcreteCollection : CIM_Collection {
990
991- [Key, Description (
992+ [Key, Override ( "InstanceID" ),
993+ Description (
994 "Within the scope of the instantiating Namespace, "
995 "InstanceID opaquely and uniquely identifies an instance "
996 "of this class. To ensure uniqueness within the "
997
998=== modified file 'schema/Core/CIM_ConcreteJob.mof'
999--- schema/Core/CIM_ConcreteJob.mof 2008-08-27 11:09:14 +0000
1000+++ schema/Core/CIM_ConcreteJob.mof 2009-07-28 19:10:03 +0000
1001@@ -1,23 +1,13 @@
1002-// Copyright (c) 2005 DMTF. All rights reserved.
1003-// <change cr="SysDevCR00711.001" type ="change">Update of
1004-// descriptions based on Tech Edit review.</change>
1005-// <change cr="SysDevCR00796.002" type ="change">Remove Experimental
1006-// qualifier from TimeBeforeRemoval.</change>
1007-// <change cr="CIMCoreCR00812" type ="change">Added enumeration Query
1008-// Pending to property JobState."</change>
1009-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1010-// qualifier values to CIM Schema.</change>
1011-// ==================================================================
1012-// CIM_ConcreteJob
1013-// ==================================================================
1014- [Version ( "2.13.0" ),
1015+// Copyright (c) 2009 DMTF. All rights reserved.
1016+ [Version ( "2.22.0" ),
1017 UMLPackagePath ( "CIM::Core::CoreElements" ),
1018 Description (
1019 "A concrete version of Job. This class represents a generic and "
1020 "instantiable unit of work, such as a batch or a print job." )]
1021 class CIM_ConcreteJob : CIM_Job {
1022
1023- [Key, Description (
1024+ [Key, Override ( "InstanceID" ),
1025+ Description (
1026 "Within the scope of the instantiating Namespace, "
1027 "InstanceID opaquely and uniquely identifies an instance "
1028 "of this class. In order to ensure uniqueness within the "
1029@@ -170,4 +160,24 @@
1030 "Parameter Not Supported\' must be returned." )]
1031 datetime TimeoutPeriod);
1032
1033+ [Description (
1034+ "When the job is executing or has terminated without "
1035+ "error, then this method returns no CIM_Error instance. "
1036+ "However, if the job has failed because of some internal "
1037+ "problem or because the job has been terminated by a "
1038+ "client, then a CIM_Error instance is returned." ),
1039+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "..",
1040+ "32768..65535" },
1041+ Values { "Success", "Not Supported", "Unspecified Error",
1042+ "Timeout", "Failed", "Invalid Parameter", "Access Denied",
1043+ "DMTF Reserved", "Vendor Specific" }]
1044+ uint32 GetError(
1045+ [OUT, Description (
1046+ "If the OperationalStatus on the Job is not \"OK\", "
1047+ "then this method will return a CIM Error instance. "
1048+ "Otherwise, when the Job is \"OK\", null is "
1049+ "returned." ),
1050+ EmbeddedInstance ( "CIM_Error" )]
1051+ string Error);
1052+
1053 };
1054
1055=== added file 'schema/Core/CIM_ElementAllocatedFromPool.mof'
1056--- schema/Core/CIM_ElementAllocatedFromPool.mof 1970-01-01 00:00:00 +0000
1057+++ schema/Core/CIM_ElementAllocatedFromPool.mof 2009-07-28 19:10:35 +0000
1058@@ -0,0 +1,20 @@
1059+// Copyright (c) 2009 DMTF. All rights reserved.
1060+ [Association, Version ( "2.22.0" ),
1061+ UMLPackagePath ( "CIM::Core::Resource" ),
1062+ Description (
1063+ "ElementAllocatedFromPool associates an instance of "
1064+ "CIM_LogicalElement representing an allocated Resource with the "
1065+ "CIM_ResourcePool from which it was allocated." )]
1066+class CIM_ElementAllocatedFromPool : CIM_Dependency {
1067+
1068+ [Override ( "Antecedent" ),
1069+ Max ( 1 ),
1070+ Description ( "The resource pool." )]
1071+ CIM_ResourcePool REF Antecedent;
1072+
1073+ [Override ( "Dependent" ),
1074+ Description ( "The allocated resource." )]
1075+ CIM_LogicalElement REF Dependent;
1076+
1077+
1078+};
1079
1080=== modified file 'schema/Core/CIM_ElementCapabilities.mof'
1081--- schema/Core/CIM_ElementCapabilities.mof 2008-08-27 11:09:14 +0000
1082+++ schema/Core/CIM_ElementCapabilities.mof 2009-07-28 19:10:03 +0000
1083@@ -1,10 +1,5 @@
1084-// Copyright (c) 2005 DMTF. All rights reserved.
1085-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1086-// qualifier values to CIM Schema.</change>
1087-// ==================================================================
1088-// CIM_ElementCapabilities
1089-// ==================================================================
1090- [Association, Version ( "2.7.0" ),
1091+// Copyright (c) 2009 DMTF. All rights reserved.
1092+ [Association, Version ( "2.22.0" ),
1093 UMLPackagePath ( "CIM::Core::Capabilities" ),
1094 Description (
1095 "ElementCapabilities represents the association between "
1096@@ -27,5 +22,25 @@
1097 "The Capabilities object associated with the element." )]
1098 CIM_Capabilities REF Capabilities;
1099
1100+ [Description (
1101+ "Characteristics provides descriptive information about "
1102+ "the Capabilities. when the value 2 \"Default\" is "
1103+ "specified, the associated Capabilities shall represent "
1104+ "the default capabilities of the associated Managed "
1105+ "Element \n"
1106+ "when the value 2 \"Default\" is not specified, the "
1107+ "Capabilities instance may represent the default "
1108+ "capabilities of the Managed Element\n"
1109+ "When the value 3 \"Current\" is specified, the "
1110+ "associated Capabilities shall represent the current "
1111+ "capabilities of the associated Managed Element\n"
1112+ "When the value 3 \"Current\" is not specified, the "
1113+ "Capabilities instance may represent the current "
1114+ "capabilities of the Managed Element." ),
1115+ ValueMap { "2", "3", "..", "32768..65535" },
1116+ Values { "Default", "Current", "DMTF Reserved",
1117+ "Vendor Specific" }]
1118+ uint16 Characteristics[];
1119+
1120
1121 };
1122
1123=== modified file 'schema/Core/CIM_ElementSettingData.mof'
1124--- schema/Core/CIM_ElementSettingData.mof 2008-08-27 11:09:14 +0000
1125+++ schema/Core/CIM_ElementSettingData.mof 2009-07-28 19:10:03 +0000
1126@@ -1,10 +1,5 @@
1127-// Copyright (c) 2005 DMTF. All rights reserved.
1128-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1129-// qualifier values to CIM Schema.</change>
1130-// ==================================================================
1131-// CIM_ElementSettingData
1132-// ==================================================================
1133- [Association, Version ( "2.7.0" ),
1134+// Copyright (c) 2008 DMTF. All rights reserved.
1135+ [Association, Version ( "2.19.1" ),
1136 UMLPackagePath ( "CIM::Core::Settings" ),
1137 Description (
1138 "ElementSettingData represents the association between "
1139@@ -35,5 +30,35 @@
1140 Values { "Unknown", "Is Current", "Is Not Current" }]
1141 uint16 IsCurrent;
1142
1143+ [Description (
1144+ "An enumerated integer indicating whether or not the "
1145+ "referenced setting is the next setting to be applied. "
1146+ "For example, the application could take place on a "
1147+ "re-initialization, reset, reconfiguration request. This "
1148+ "could be a permanent setting, or a setting used only one "
1149+ "time, as indicated by the flag. If it is a permanent "
1150+ "setting then the setting is applied every time the "
1151+ "managed element reinitializes, until this flag is "
1152+ "manually reset. However, if it is single use, then the "
1153+ "flag is automatically cleared after the settings are "
1154+ "applied. Also note that if this flag is specified (i.e. "
1155+ "set to value other than \"Unknown\"), then this takes "
1156+ "precedence over any SettingData that may have been "
1157+ "specified as Default. For example: If the managed "
1158+ "element is a computer system, and the value of this flag "
1159+ "is \"Is Next\", then the setting will be effective next "
1160+ "time the system resets. And, unless this flag is "
1161+ "changed, it will persist for subsequent system resets. "
1162+ "However, if this flag is set to \"Is Next For Single "
1163+ "Use\", then this setting will only be used once and the "
1164+ "flag would be reset after that to \"Is Not Next\". So, "
1165+ "in the above example, if the system reboots in a quick "
1166+ "succession, the setting will not be used at the second "
1167+ "reboot." ),
1168+ ValueMap { "0", "1", "2", "3" },
1169+ Values { "Unknown", "Is Next", "Is Not Next",
1170+ "Is Next For Single Use" }]
1171+ uint16 IsNext;
1172+
1173
1174 };
1175
1176=== modified file 'schema/Core/CIM_ElementSoftwareIdentity.mof'
1177--- schema/Core/CIM_ElementSoftwareIdentity.mof 2008-08-27 11:09:14 +0000
1178+++ schema/Core/CIM_ElementSoftwareIdentity.mof 2009-07-28 19:10:03 +0000
1179@@ -1,10 +1,5 @@
1180-// Copyright (c) 2005 DMTF. All rights reserved.
1181-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1182-// qualifier values to CIM Schema.</change>
1183-// ==================================================================
1184-// CIM_ElementSoftwareIdentity
1185-// ==================================================================
1186- [Association, Version ( "2.8.0" ),
1187+// Copyright (c) 2008 DMTF. All rights reserved.
1188+ [Association, Version ( "2.20.0" ),
1189 UMLPackagePath ( "CIM::Core::Software" ),
1190 Description (
1191 "ElementSoftwareIdentity allows a Managed Element to report its "
1192@@ -23,17 +18,15 @@
1193
1194 [Description (
1195 "Indicates the element\'s ability to upgrade this "
1196- "software asset. \n"
1197+ "software asset.\n"
1198 "\'Resides off element\'(2), indicates the persistence of "
1199 "the software is outside of the element. Typically for a "
1200 "element this software is part of the OperatingSystem is "
1201- "typically upgradeable. \n"
1202+ "typically upgradeable.\n"
1203 "\'Owner Upgradeable\' (3), indicates the persistence of "
1204- "the software is on the element and is upgradeable by the "
1205- "owner. \n"
1206+ "the software is on the element and is upgradeable by the owner.\n"
1207 "\'FactoryUpgradeable\' (4),indicates the persistence of "
1208- "the software is on the element and is upgradeable by the "
1209- "manufacturer. \n"
1210+ "the software is on the element and is upgradeable by the manufacturer.\n"
1211 "\'Not Upgradeable\' (5), indicates the presistence of "
1212 "the software is on the element and is not upgradeable. "
1213 "(i.e. burned into a non replaceable ROM chip." ),
1214@@ -53,5 +46,41 @@
1215 "CIM_ElementSoftwareIdentity.UpgradeCondition" }]
1216 string OtherUpgradeCondition;
1217
1218+ [Description (
1219+ "A collection of properties describing the status of the "
1220+ "software on the managed element. Multiple properties "
1221+ "could be set at the same time. For example a "
1222+ "ElementSoftwareStatus could have \"Installed\", "
1223+ "\"Default\", \"Current\" and \"FallBack\" set at the "
1224+ "same time. \n"
1225+ "\"Current\" indicates that the software is currently "
1226+ "running on or for the Managed Element. \n"
1227+ "\"Next\" indicates that the software will run after the "
1228+ "next reset or reboot unless superseded by a software "
1229+ "with a status of \"SingleUse\". \n"
1230+ "\"FallBack\" indicates that the software will be run if "
1231+ "the software which has a status of \"Next\" or "
1232+ "\"SingleUse\" fails to run. \n"
1233+ "\"Default\" indicates the default version of the "
1234+ "software that was originally shipped by the "
1235+ "manufacturer. \n"
1236+ "\"Installed\" indicates that the software is "
1237+ "persistently located and is available for use on the "
1238+ "Managed Element. \n"
1239+ "\"SingleUse\" indicates that the software will run only "
1240+ "after the next reset or reboot but will not run after "
1241+ "the subsequent reset or reboot. \n"
1242+ "\"Available\" indicates that the software is available "
1243+ "for installation on the Managed Element. \n"
1244+ "\"Supports\"indicates that the software will work with "
1245+ "or operate the Managed Element but is or will be "
1246+ "installed on a different Managed Element." ),
1247+ ValueMap { "0", "2", "3", "4", "5", "6", "7", "8", "9", "..",
1248+ "32768..65535" },
1249+ Values { "Unknown", "Current", "Next", "FallBack", "Default",
1250+ "Installed", "Single Use", "Available", "Supports",
1251+ "DMTF Reserved", "Vendor Reserved" }]
1252+ uint16 ElementSoftwareStatus[];
1253+
1254
1255 };
1256
1257=== modified file 'schema/Core/CIM_EnabledLogicalElement.mof'
1258--- schema/Core/CIM_EnabledLogicalElement.mof 2008-08-27 11:09:14 +0000
1259+++ schema/Core/CIM_EnabledLogicalElement.mof 2009-07-28 19:10:03 +0000
1260@@ -1,5 +1,5 @@
1261-// Copyright (c) 2007 DMTF. All Rights Reserved.
1262- [Abstract, Version ( "2.17.0" ),
1263+// Copyright (c) 2009 DMTF. All rights reserved.
1264+ [Abstract, Version ( "2.22.0" ),
1265 UMLPackagePath ( "CIM::Core::CoreElements" ),
1266 Description (
1267 "This class extends LogicalElement to abstract the concept of "
1268@@ -128,6 +128,50 @@
1269 "property must not be updated." )]
1270 datetime TimeOfLastStateChange;
1271
1272+ [Description (
1273+ "AvailableRequestedStates indicates the possible values "
1274+ "for the RequestedState parameter of the method "
1275+ "RequestStateChange, used to initiate a state change. The "
1276+ "values listed shall be a subset of the values contained "
1277+ "in the RequestedStatesSupported property of the "
1278+ "associated instance of "
1279+ "CIM_EnabledLogicalElementCapabilities where the values "
1280+ "selected are a function of the current state of the "
1281+ "CIM_EnabledLogicalElement. This property may be non-null "
1282+ "if an implementation is able to advertise the set of "
1283+ "possible values as a function of the current state. This "
1284+ "property shall be null if an implementation is unable to "
1285+ "determine the set of possible values as a function of "
1286+ "the current state." ),
1287+ ValueMap { "2", "3", "4", "6", "7", "8", "9", "10", "11", ".." },
1288+ Values { "Enabled", "Disabled", "Shut Down", "Offline",
1289+ "Test", "Defer", "Quiesce", "Reboot", "Reset",
1290+ "DMTF Reserved" },
1291+ ModelCorrespondence {
1292+ "CIM_EnabledLogicalElement.RequestStateChange",
1293+ "CIM_EnabledLogicalElementCapabilities.RequestedStatesSupported" }]
1294+ uint16 AvailableRequestedStates[];
1295+
1296+ [Description (
1297+ "TransitioningToState indicates the target state to which "
1298+ "the instance is transitioning. \n"
1299+ "A value of 5 \"No Change\" shall indicate that no "
1300+ "transition is in progress.A value of 12 \"Not "
1301+ "Applicable\" shall indicate the implementation does not "
1302+ "support representing ongoing transitions. \n"
1303+ "A value other than 5 or 12 shall identify the state to "
1304+ "which the element is in the process of transitioning." ),
1305+ ValueMap { "0", "2", "3", "4", "5", "6", "7", "8", "9", "10",
1306+ "11", "12", ".." },
1307+ Values { "Unknown", "Enabled", "Disabled", "Shut Down",
1308+ "No Change", "Offline", "Test", "Defer", "Quiesce",
1309+ "Reboot", "Reset", "Not Applicable", "DMTF Reserved" },
1310+ ModelCorrespondence {
1311+ "CIM_EnabledLogicalElement.RequestStateChange",
1312+ "CIM_EnabledLogicalElement.RequestedState",
1313+ "CIM_EnabledLogicalElement.EnabledState" }]
1314+ uint16 TransitioningToState = 12;
1315+
1316
1317 [Description (
1318 "Requests that the state of the element be changed to the "
1319
1320=== modified file 'schema/Core/CIM_EnabledLogicalElementCapabilities.mof'
1321--- schema/Core/CIM_EnabledLogicalElementCapabilities.mof 2008-08-27 11:09:14 +0000
1322+++ schema/Core/CIM_EnabledLogicalElementCapabilities.mof 2009-07-28 19:10:03 +0000
1323@@ -1,14 +1,5 @@
1324-// Copyright (c) 2005 DMTF. All rights reserved.
1325-// <change cr="CIMCoreCR00804.001" type ="change">Remove Experimental
1326-// from class.</change>
1327-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1328-// qualifier values to CIM Schema.</change>
1329-// <change cr="CIMCoreCR00854" type ="change">Corrected typos
1330-// in description.</change>
1331-// ==================================================================
1332-// CIM_EnabledLogicalElementCapabilities
1333-// ==================================================================
1334- [Version ( "2.14.0" ),
1335+// Copyright (c) 2009 DMTF. All rights reserved.
1336+ [Version ( "2.22.0" ),
1337 UMLPackagePath ( "CIM::Core::Capabilities" ),
1338 Description (
1339 "EnabledLogicalElementCapabilities describes the capabilities "
1340@@ -29,7 +20,8 @@
1341 MappingStrings {
1342 "FC-SWAPI.INCITS-T11|SWAPI_UNIT_CONFIG_CAPS_T|MaxNameChars" },
1343 ModelCorrespondence {
1344- "CIM_FCSwitchCapabilities.ElementNameEditSupported" }]
1345+ "CIM_FCSwitchCapabilities.ElementNameEditSupported",
1346+ "CIM_EnabledLogicalElementCapabilities.ElementNameMask" }]
1347 uint16 MaxElementNameLen;
1348
1349 [Description (
1350@@ -43,5 +35,22 @@
1351 "CIM_EnabledLogicalElement.RequestStateChange" }]
1352 uint16 RequestedStatesSupported[];
1353
1354+ [Description (
1355+ "This string expresses the restrictions on "
1356+ "ElementName.The mask is expressed as a regular "
1357+ "expression.See DMTF standard ABNF with the Management "
1358+ "Profile Specification Usage Guide, appendix C for the "
1359+ "regular expression syntax permitted. \n"
1360+ "Since the ElementNameMask can describe the maximum "
1361+ "length of the ElementName,any length defined in the "
1362+ "regexp is in addition to the restriction defined in "
1363+ "MaxElementNameLen (causing the smaller value to be the "
1364+ "maximum length) The ElementName value satisfies the "
1365+ "restriction, if and only if it matches the regular "
1366+ "expression" ),
1367+ ModelCorrespondence {
1368+ "CIM_EnabledLogicalElementCapabilities.MaxElementNameLen" }]
1369+ string ElementNameMask;
1370+
1371
1372 };
1373
1374=== modified file 'schema/Core/CIM_ExtraCapacityGroup.mof'
1375--- schema/Core/CIM_ExtraCapacityGroup.mof 2008-08-27 11:09:14 +0000
1376+++ schema/Core/CIM_ExtraCapacityGroup.mof 2009-07-28 19:10:03 +0000
1377@@ -1,12 +1,6 @@
1378-// Copyright (c) 2005 DMTF. All rights reserved.
1379-// <change cr="SysDevCR00717.001" type ="add">Deprecated</change>
1380-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1381-// qualifier values to CIM Schema.</change>
1382-// ==================================================================
1383-// CIM_ExtraCapacityGroup
1384-// ==================================================================
1385+// Copyright (c) 2008 DMTF. All rights reserved.
1386 [Deprecated { "CIM_RedundancySet" },
1387- Version ( "2.8.1000" ),
1388+ Version ( "2.21.0" ),
1389 UMLPackagePath ( "CIM::Core::Redundancy" ),
1390 Description (
1391 "A class derived from RedundancyGroup indicating that the "
1392
1393=== added file 'schema/Core/CIM_HostedResourcePool.mof'
1394--- schema/Core/CIM_HostedResourcePool.mof 1970-01-01 00:00:00 +0000
1395+++ schema/Core/CIM_HostedResourcePool.mof 2009-07-28 19:10:35 +0000
1396@@ -0,0 +1,22 @@
1397+// Copyright (c) 2009 DMTF. All rights reserved.
1398+ [Association, Aggregation, Composition, Version ( "2.22.0" ),
1399+ UMLPackagePath ( "CIM::Core::Resource" ),
1400+ Description (
1401+ "HostedResourcePool is a specialization of the SystemComponent "
1402+ "association that establishes that the ResourcePool is defined "
1403+ "in the context of the System" )]
1404+class CIM_HostedResourcePool : CIM_SystemComponent {
1405+
1406+ [Aggregate, Override ( "GroupComponent" ),
1407+ Min ( 1 ),
1408+ Max ( 1 ),
1409+ Description ( "The parent system in the association" )]
1410+ CIM_System REF GroupComponent;
1411+
1412+ [Override ( "PartComponent" ),
1413+ Description (
1414+ "The ResourcePool that is a component of the system" )]
1415+ CIM_ResourcePool REF PartComponent;
1416+
1417+
1418+};
1419
1420=== modified file 'schema/Core/CIM_IsSpare.mof'
1421--- schema/Core/CIM_IsSpare.mof 2008-08-27 11:09:14 +0000
1422+++ schema/Core/CIM_IsSpare.mof 2009-07-28 19:10:03 +0000
1423@@ -1,11 +1,4 @@
1424 // Copyright (c) 2005 DMTF. All rights reserved.
1425-// <change cr="DMTFCR01466.001" type ="add">Fix descriptions</
1426-// <change cr="SysDevCR00717.001" type ="add">Remove Experimental</
1427-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1428-// qualifier values to CIM Schema.</change>
1429-// ==================================================================
1430-// CIM_IsSpare
1431-// ==================================================================
1432 [Association, Version ( "2.10.0" ),
1433 UMLPackagePath ( "CIM::Core::Redundancy" ),
1434 Description (
1435
1436=== added file 'schema/Core/CIM_LastAppliedSnapshot.mof'
1437--- schema/Core/CIM_LastAppliedSnapshot.mof 1970-01-01 00:00:00 +0000
1438+++ schema/Core/CIM_LastAppliedSnapshot.mof 2009-07-28 19:10:35 +0000
1439@@ -0,0 +1,38 @@
1440+// Copyright (c) 2009 DMTF. All rights reserved.
1441+ [Association, Version ( "2.22.0" ),
1442+ Description (
1443+ "The CIM_LastAppliedSnapshot association associates an instance "
1444+ "of the CIM_VirtualSystemSettingData class representing a "
1445+ "virtual system snapshot that was most recently applied to a "
1446+ "virtual system, and the instance of the CIM_ComputerSystem "
1447+ "class representing the related virtual system.\n"
1448+ "An instance of this assocation indicates that the referenced "
1449+ "snapshot is the snapshot the was last applied to the virtual "
1450+ "system from the set of snapshots taken from that virtual "
1451+ "system. For each virtual system at any time there is at most "
1452+ "one snapshot the last applied snapshot." )]
1453+class CIM_LastAppliedSnapshot : CIM_Dependency {
1454+
1455+ [Override ( "Antecedent" ),
1456+ Min ( 0 ),
1457+ Max ( 1 ),
1458+ Description (
1459+ "Reference to the instance of the "
1460+ "CIM_VirtualSystemSettingData class representing the "
1461+ "virtual system snapshot that was last applied to the "
1462+ "virtual system." )]
1463+ CIM_VirtualSystemSettingData REF Antecedent;
1464+
1465+ [Override ( "Dependent" ),
1466+ Min ( 0 ),
1467+ Max ( 1 ),
1468+ Description (
1469+ "Reference to the instance of the CIM_ComputerSystem "
1470+ "class representing the virtual system upon which the "
1471+ "virtual system snapshot represented by the instance of "
1472+ "the CIM_VirtualSystemSettingData class referenced by the "
1473+ "Antecedent property was most recently applied." )]
1474+ CIM_ComputerSystem REF Dependent;
1475+
1476+
1477+};
1478
1479=== modified file 'schema/Core/CIM_ManagedElement.mof'
1480--- schema/Core/CIM_ManagedElement.mof 2008-08-27 11:09:14 +0000
1481+++ schema/Core/CIM_ManagedElement.mof 2009-07-28 19:10:03 +0000
1482@@ -1,12 +1,5 @@
1483-// Copyright (c) 2005 DMTF. All rights reserved.
1484-// <change cr="SysDevCR00711.001" type ="change">Update of
1485-// descriptions based on Tech Edit review.</
1486-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1487-// qualifier values to CIM Schema.</change>
1488-// ==================================================================
1489-// CIM_ManagedElement
1490-// ==================================================================
1491- [Abstract, Version ( "2.10.0" ),
1492+// Copyright (c) 2009 DMTF. All rights reserved.
1493+ [Abstract, Version ( "2.19.0" ),
1494 UMLPackagePath ( "CIM::Core::CoreElements" ),
1495 Description (
1496 "ManagedElement is an abstract class that provides a common "
1497@@ -15,6 +8,41 @@
1498 class CIM_ManagedElement {
1499
1500 [Description (
1501+ "InstanceID is an optional property that may be used to "
1502+ "opaquely and uniquely identify an instance of this class "
1503+ "within the scope of the instantiating Namespace. Various "
1504+ "subclasses of this class may override this property to "
1505+ "make it required, or a key. Such subclasses may also "
1506+ "modify the preferred algorithms for ensuring uniqueness "
1507+ "that are defined below.\n"
1508+ "To ensure uniqueness within the NameSpace, the value of "
1509+ "InstanceID should be constructed using the following "
1510+ "\"preferred\" algorithm: \n"
1511+ "<OrgID>:<LocalID> \n"
1512+ "Where <OrgID> and <LocalID> are separated by a colon "
1513+ "(:), and where <OrgID> must include a copyrighted, "
1514+ "trademarked, or otherwise unique name that is owned by "
1515+ "the business entity that is creating or defining the "
1516+ "InstanceID or that is a registered ID assigned to the "
1517+ "business entity by a recognized global authority. (This "
1518+ "requirement is similar to the <Schema Name>_<Class Name> "
1519+ "structure of Schema class names.) In addition, to ensure "
1520+ "uniqueness, <OrgID> must not contain a colon (:). When "
1521+ "using this algorithm, the first colon to appear in "
1522+ "InstanceID must appear between <OrgID> and <LocalID>. \n"
1523+ "<LocalID> is chosen by the business entity and should "
1524+ "not be reused to identify different underlying "
1525+ "(real-world) elements. If not null and the above "
1526+ "\"preferred\" algorithm is not used, the defining entity "
1527+ "must assure that the resulting InstanceID is not reused "
1528+ "across any InstanceIDs produced by this or other "
1529+ "providers for the NameSpace of this instance. \n"
1530+ "If not set to null for DMTF-defined instances, the "
1531+ "\"preferred\" algorithm must be used with the <OrgID> "
1532+ "set to CIM." )]
1533+ string InstanceID;
1534+
1535+ [Description (
1536 "The Caption property is a short textual description "
1537 "(one- line string) of the object." ),
1538 MaxLen ( 64 )]
1539@@ -37,7 +65,11 @@
1540 "user-friendly name, without inconsistencies. Where Name "
1541 "exists and is not a Key (such as for instances of "
1542 "LogicalDevice), the same information can be present in "
1543- "both the Name and ElementName properties." )]
1544+ "both the Name and ElementName properties. Note that if "
1545+ "there is an associated instance of "
1546+ "CIM_EnabledLogicalElementCapabilities, restrictions on "
1547+ "this properties may exist as defined in ElementNameMask "
1548+ "and MaxElementNameLen properties defined in that class." )]
1549 string ElementName;
1550
1551
1552
1553=== modified file 'schema/Core/CIM_ManagedSystemElement.mof'
1554--- schema/Core/CIM_ManagedSystemElement.mof 2008-08-27 11:09:14 +0000
1555+++ schema/Core/CIM_ManagedSystemElement.mof 2009-07-28 19:10:03 +0000
1556@@ -1,14 +1,5 @@
1557-// Copyright (c) 2005 DMTF. All rights reserved.
1558-// <change cr="SysDevCR00711.001" type ="change">Update of
1559-// descriptions based on Tech Edit review.</change>
1560-// <change cr="SysDevCR00796.002" type ="change">Remove Experimantal
1561-// qualifier from HealthState property.</change>
1562-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
1563-// qualifier values to CIM Schema.</change>
1564-// ==================================================================
1565-// CIM_ManagedSystemElement
1566-// ==================================================================
1567- [Abstract, Version ( "2.11.0" ),
1568+// Copyright (c) 2009 DMTF. All rights reserved.
1569+ [Abstract, Version ( "2.22.0" ),
1570 UMLPackagePath ( "CIM::Core::CoreElements" ),
1571 Description (
1572 "CIM_ManagedSystemElement is the base class for the System "
1573@@ -182,5 +173,176 @@
1574 "Non-recoverable error", "DMTF Reserved" }]
1575 uint16 HealthState;
1576
1577+ [Description (
1578+ "CommunicationStatus indicates the ability of the "
1579+ "instrumentation to communicate with the underlying "
1580+ "ManagedElement. CommunicationStatus consists of one of "
1581+ "the following values: Unknown, None, Communication OK, "
1582+ "Lost Communication, or No Contact. \n"
1583+ "A Null return indicates the implementation (provider) "
1584+ "does not implement this property. \n"
1585+ "\"Unknown\" indicates the implementation is in general "
1586+ "capable of returning this property, but is unable to do "
1587+ "so at this time. \n"
1588+ "\"Not Available\" indicates that the implementation "
1589+ "(provider) is capable of returning a value for this "
1590+ "property, but not ever for this particular piece of "
1591+ "hardware/software or the property is intentionally not "
1592+ "used because it adds no meaningful information (as in "
1593+ "the case of a property that is intended to add "
1594+ "additional info to another property). \n"
1595+ "\"Communication OK \" indicates communication is "
1596+ "established with the element, but does not convey any "
1597+ "quality of service. \n"
1598+ "\"No Contact\" indicates that the monitoring system has "
1599+ "knowledge of this element, but has never been able to "
1600+ "establish communications with it. \n"
1601+ "\"Lost Communication\" indicates that the Managed "
1602+ "Element is known to exist and has been contacted "
1603+ "successfully in the past, but is currently unreachable." ),
1604+ ValueMap { "0", "1", "2", "3", "4", "..", "0x8000.." },
1605+ Values { "Unknown", "Not Available", "Communication OK",
1606+ "Lost Communication", "No Contact", "DMTF Reserved",
1607+ "Vendor Reserved" }]
1608+ uint16 CommunicationStatus;
1609+
1610+ [Description (
1611+ "DetailedStatus compliments PrimaryStatus with additional "
1612+ "status detail. It consists of one of the following "
1613+ "values: Not Available, No Additional Information, "
1614+ "Stressed, Predictive Failure, Error, Non-Recoverable "
1615+ "Error, SupportingEntityInError. Detailed status is used "
1616+ "to expand upon the PrimaryStatus of the element. \n"
1617+ "A Null return indicates the implementation (provider) "
1618+ "does not implement this property. \n"
1619+ "\"Not Available\" indicates that the implementation "
1620+ "(provider) is capable of returning a value for this "
1621+ "property, but not ever for this particular piece of "
1622+ "hardware/software or the property is intentionally not "
1623+ "used because it adds no meaningful information (as in "
1624+ "the case of a property that is intended to add "
1625+ "additional info to another property). \n"
1626+ "\"No Additional Information\" indicates that the element "
1627+ "is functioning normally as indicated by PrimaryStatus = "
1628+ "\"OK\". \n"
1629+ "\"Stressed\" indicates that the element is functioning, "
1630+ "but needs attention. Examples of \"Stressed\" states are "
1631+ "overload, overheated, and so on. \n"
1632+ "\"Predictive Failure\" indicates that an element is "
1633+ "functioning normally but a failure is predicted in the "
1634+ "near future. \n"
1635+ "\"Non-Recoverable Error \" indicates that this element "
1636+ "is in an error condition that requires human "
1637+ "intervention. \n"
1638+ "\"Supporting Entity in Error\" indicates that this "
1639+ "element might be \"OK\" but that another element, on "
1640+ "which it is dependent, is in error. An example is a "
1641+ "network service or endpoint that cannot function due to "
1642+ "lower-layer networking problems." ),
1643+ ValueMap { "0", "1", "2", "3", "4", "5", "..", "0x8000.." },
1644+ Values { "Not Available", "No Additional Information",
1645+ "Stressed", "Predictive Failure", "Non-Recoverable Error",
1646+ "Supporting Entity in Error", "DMTF Reserved",
1647+ "Vendor Reserved" },
1648+ ModelCorrespondence {
1649+ "CIM_EnabledLogicalElement.PrimaryStatus",
1650+ "CIM_ManagedSystemElement.HealthState" }]
1651+ uint16 DetailedStatus;
1652+
1653+ [Description (
1654+ "OperatingStatus provides a current status value for the "
1655+ "operational condition of the element and can be used for "
1656+ "providing more detail with respect to the value of "
1657+ "EnabledState. It can also provide the transitional "
1658+ "states when an element is transitioning from one state "
1659+ "to another, such as when an element is transitioning "
1660+ "between EnabledState and RequestedState, as well as "
1661+ "other transitional conditions.\n"
1662+ "OperatingStatus consists of one of the following values: "
1663+ "Unknown, Not Available, In Service, Starting, Stopping, "
1664+ "Stopped, Aborted, Dormant, Completed, Migrating, "
1665+ "Emmigrating, Immigrating, Snapshotting. Shutting Down, "
1666+ "In Test \n"
1667+ "A Null return indicates the implementation (provider) "
1668+ "does not implement this property. \n"
1669+ "\"Unknown\" indicates the implementation is in general "
1670+ "capable of returning this property, but is unable to do "
1671+ "so at this time. \n"
1672+ "\"None\" indicates that the implementation (provider) is "
1673+ "capable of returning a value for this property, but not "
1674+ "ever for this particular piece of hardware/software or "
1675+ "the property is intentionally not used because it adds "
1676+ "no meaningful information (as in the case of a property "
1677+ "that is intended to add additional info to another "
1678+ "property). \n"
1679+ "\"Servicing\" describes an element being configured, "
1680+ "maintained, cleaned, or otherwise administered. \n"
1681+ "\"Starting\" describes an element being initialized. \n"
1682+ "\"Stopping\" describes an element being brought to an "
1683+ "orderly stop. \n"
1684+ "\"Stopped\" and \"Aborted\" are similar, although the "
1685+ "former implies a clean and orderly stop, while the "
1686+ "latter implies an abrupt stop where the state and "
1687+ "configuration of the element might need to be updated. \n"
1688+ "\"Dormant\" indicates that the element is inactive or "
1689+ "quiesced. \n"
1690+ "\"Completed\" indicates that the element has completed "
1691+ "its operation. This value should be combined with either "
1692+ "OK, Error, or Degraded in the PrimaryStatus so that a "
1693+ "client can tell if the complete operation Completed with "
1694+ "OK (passed), Completed with Error (failed), or Completed "
1695+ "with Degraded (the operation finished, but it did not "
1696+ "complete OK or did not report an error). \n"
1697+ "\"Migrating\" element is being moved between host "
1698+ "elements. \n"
1699+ "\"Immigrating\" element is being moved to new host "
1700+ "element. \n"
1701+ "\"Emigrating\" element is being moved away from host "
1702+ "element. \n"
1703+ "\"Shutting Down\" describes an element being brought to "
1704+ "an abrupt stop. \n"
1705+ "\"In Test\" element is performing test functions. \n"
1706+ "\"Transitioning\" describes an element that is between "
1707+ "states, that is, it is not fully available in either its "
1708+ "previous state or its next state. This value should be "
1709+ "used if other values indicating a transition to a "
1710+ "specific state are not applicable.\n"
1711+ "\"In Service\" describes an element that is in service "
1712+ "and operational." ),
1713+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
1714+ "10", "11", "12", "13", "14", "15", "16", "..", "0x8000.." },
1715+ Values { "Unknown", "Not Available", "Servicing", "Starting",
1716+ "Stopping", "Stopped", "Aborted", "Dormant", "Completed",
1717+ "Migrating", "Emigrating", "Immigrating", "Snapshotting",
1718+ "Shutting Down", "In Test", "Transitioning", "In Service",
1719+ "DMTF Reserved", "Vendor Reserved" },
1720+ ModelCorrespondence { "CIM_EnabledLogicalElement.EnabledState" }]
1721+ uint16 OperatingStatus;
1722+
1723+ [Description (
1724+ "PrimaryStatus provides a high level status value, "
1725+ "intended to align with Red-Yellow-Green type "
1726+ "representation of status. It should be used in "
1727+ "conjunction with DetailedStatus to provide high level "
1728+ "and detailed health status of the ManagedElement and its "
1729+ "subcomponents. \n"
1730+ "PrimaryStatus consists of one of the following values: "
1731+ "Unknown, OK, Degraded or Error. \"Unknown\" indicates "
1732+ "the implementation is in general capable of returning "
1733+ "this property, but is unable to do so at this time. \n"
1734+ "\"OK\" indicates the ManagedElement is functioning "
1735+ "normally. \n"
1736+ "\"Degraded\" indicates the ManagedElement is functioning "
1737+ "below normal. \n"
1738+ "\"Error\" indicates the ManagedElement is in an Error "
1739+ "condition." ),
1740+ ValueMap { "0", "1", "2", "3", "..", "0x8000.." },
1741+ Values { "Unknown", "OK", "Degraded", "Error",
1742+ "DMTF Reserved", "Vendor Reserved" },
1743+ ModelCorrespondence {
1744+ "CIM_ManagedSystemElement.DetailedStatus",
1745+ "CIM_ManagedSystemElement.HealthState" }]
1746+ uint16 PrimaryStatus;
1747+
1748
1749 };
1750
1751=== added file 'schema/Core/CIM_OpaqueManagementData.mof'
1752--- schema/Core/CIM_OpaqueManagementData.mof 1970-01-01 00:00:00 +0000
1753+++ schema/Core/CIM_OpaqueManagementData.mof 2009-07-28 19:10:35 +0000
1754@@ -0,0 +1,60 @@
1755+// Copyright (c) 2009 DMTF. All rights reserved.
1756+ [Version ( "2.22.0" ),
1757+ UMLPackagePath ( "CIM::Core::OpaqueManagementData" ),
1758+ Description (
1759+ "A class derived from StorageExtent that describes opaque "
1760+ "management data in managed systems. The structure and "
1761+ "semantics of opaque management data, which may be standardized "
1762+ "or proprietary, are assumed to be known by at least one "
1763+ "management client, but need not be known by the CIM server. "
1764+ "The UntransformedDataFormat property identifies the structure "
1765+ "and semantics of the data.\n"
1766+ "Opaque management data are typically stored in non-volatile "
1767+ "memory that is accessible to the server. Management clients "
1768+ "are able to read and write opaque data, to manage their "
1769+ "lifetime, and to configure the access rights associated with "
1770+ "them. The non-volatile storage is often used as a mailbox, "
1771+ "with local management agents producing data for consumption by "
1772+ "remote management clients, or vice versa.\n"
1773+ "This class is not intended as a general-purpose opaque "
1774+ "alternative to any existing or planned CIM classes. It is "
1775+ "expressly intended for the mailbox usage model described "
1776+ "above." )]
1777+class CIM_OpaqueManagementData : CIM_StorageExtent {
1778+
1779+ [Description (
1780+ "The maximum number of bytes of opaque management data "
1781+ "that the instance may contain." ),
1782+ PUnit ( "byte" )]
1783+ uint64 MaxSize;
1784+
1785+ [Description (
1786+ "The date and time when the opaque management data was "
1787+ "last accessed. Any operation on the OpaqueManagementData "
1788+ "instance constitutes access. This property shall be NULL "
1789+ "if it is not supported by the implementation." )]
1790+ datetime LastAccessed;
1791+
1792+ [Description (
1793+ "Indicates whether the data are stored on a medium that "
1794+ "has a limited number of write/erase cycles (e.g., flash "
1795+ "memory)." ),
1796+ ValueMap { "0", "1", "2", ".." },
1797+ Values { "Unknown", "Not write-limited", "Write-limited",
1798+ "DMTF Reserved" }]
1799+ uint16 WriteLimited;
1800+
1801+ [Description (
1802+ "Describes the format of the opaque management data. A "
1803+ "free-form string that shall only be set by an authorized "
1804+ "client, and shall not be changed by the implementation." )]
1805+ string DataFormat;
1806+
1807+ [Description (
1808+ "The number of bytes of opaque management data in the instance."
1809+ ),
1810+ PUnit ( "byte" )]
1811+ uint64 DataSize;
1812+
1813+
1814+};
1815
1816=== added file 'schema/Core/CIM_OpaqueManagementDataCapabilities.mof'
1817--- schema/Core/CIM_OpaqueManagementDataCapabilities.mof 1970-01-01 00:00:00 +0000
1818+++ schema/Core/CIM_OpaqueManagementDataCapabilities.mof 2009-07-28 19:10:35 +0000
1819@@ -0,0 +1,89 @@
1820+// Copyright (c) 2009 DMTF. All rights reserved.
1821+ [Version ( "2.22.0" ),
1822+ UMLPackagePath ( "CIM::Core::OpaqueManagementData" ),
1823+ Description (
1824+ "CIM_OpaqueManagementDataCapabilities describes the "
1825+ "capabilities of CIM_OpaqueManagementDataService." )]
1826+class CIM_OpaqueManagementDataCapabilities : CIM_EnabledLogicalElementCapabilities {
1827+
1828+ [Description (
1829+ "The maximum number of bytes of opaque management data "
1830+ "storage managed by the associated "
1831+ "CIM_OpaqueManagementDataService, and hence the maximum "
1832+ "value of the AvailableStorage property in the associated "
1833+ "CIM_OpaqueManagementDataService." ),
1834+ ModelCorrespondence {
1835+ "CIM_OpaqueManagementDataService.AvailableStorage" },
1836+ PUnit ( "byte" )]
1837+ uint64 MaxAvailableStorage;
1838+
1839+ [Description (
1840+ "MaxReadLength indicates the maximum value that the "
1841+ "service supports in the Length parameter of the "
1842+ "ReadOpaqueManagementData method. Larger extents can be "
1843+ "read by successively invoking ReadOpaqueManagementData "
1844+ "on chunks of the data and reassembling them in the "
1845+ "management client. When this is done, the "
1846+ "LockOpaqueManagementData method should be used to "
1847+ "prevent modification of the data by other clients "
1848+ "between successive reads." ),
1849+ PUnit ( "byte" )]
1850+ uint64 MaxReadLength;
1851+
1852+ [Description (
1853+ "MaxWriteLength indicates the maximum value that the "
1854+ "service supports in the Length parameter of the "
1855+ "WriteOpaqueManagementData method. Larger extents can be "
1856+ "written by successively invoking "
1857+ "WriteOpaqueManagementData on chunks of the data and "
1858+ "reassembling them in the management client. When this is "
1859+ "done, the LockOpaqueManagementData method should be used "
1860+ "to prevent modification of the data by other clients "
1861+ "between successive writes." ),
1862+ PUnit ( "byte" )]
1863+ uint64 MaxWriteLength;
1864+
1865+ [Description (
1866+ "This property lists the URI schemes supported by "
1867+ "OpaqueManagementDataService.ExportOpaqueManagementDataToURI()."
1868+ ),
1869+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "..",
1870+ "0x8000..0xFFFF" },
1871+ Values { "data", "file", "ftp", "http", "https", "nfs",
1872+ "tftp", "DMTF Reserved", "Vendor Specific" }]
1873+ uint16 SupportedExportURISchemes[];
1874+
1875+ [Description (
1876+ "This property lists the URI schemes supported by "
1877+ "OpaqueManagementDataService.ImportOpaqueManagementDataFromURI()."
1878+ ),
1879+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "..",
1880+ "0x8000..0xFFFF" },
1881+ Values { "data", "file", "ftp", "http", "https", "nfs",
1882+ "tftp", "DMTF Reserved", "Vendor Specific" }]
1883+ uint16 SupportedImportURISchemes[];
1884+
1885+ [Description (
1886+ "This property advertises the methods that are supported "
1887+ "by the service." ),
1888+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "..",
1889+ "0x80.." },
1890+ Values { "Other", "Create", "Read", "ExportToURI", "Write",
1891+ "ImportFromURI", "Lock", "ReassignOwnership",
1892+ "AssignAccess", "DMTF Reserved", "Vendor Specific" }]
1893+ uint16 SupportedMethods[];
1894+
1895+ [Description (
1896+ "TruncationSupported indicates whether the associated "
1897+ "CIM_OpaqueManagementDataService allows a client to "
1898+ "truncate the data in a CIM_OpaqueManagementData instance "
1899+ "by reducing the value of its DataSize property.\n"
1900+ "If TruncationSupported = true, then the Service shall "
1901+ "support reduction of the value of CIM_OpaqueManagementData.DataSize\n"
1902+ ".If TruncationSupported = false or is null, then the "
1903+ "Service shall not support reduction of the value of "
1904+ "CIM_OpaqueManagementData.DataSize" )]
1905+ boolean TruncationSupported = false;
1906+
1907+
1908+};
1909
1910=== added file 'schema/Core/CIM_OpaqueManagementDataService.mof'
1911--- schema/Core/CIM_OpaqueManagementDataService.mof 1970-01-01 00:00:00 +0000
1912+++ schema/Core/CIM_OpaqueManagementDataService.mof 2009-07-28 19:10:35 +0000
1913@@ -0,0 +1,430 @@
1914+// Copyright (c) 2009 DMTF. All rights reserved.
1915+ [Version ( "2.22.0" ),
1916+ UMLPackagePath ( "CIM::Core::OpaqueManagementData" ),
1917+ Description (
1918+ "A class derived from Service that contains global properties "
1919+ "of the opaque management data functionality in the CIM server, "
1920+ "and provides methods for using this functionality." )]
1921+class CIM_OpaqueManagementDataService : CIM_Service {
1922+
1923+ [Description (
1924+ "The number of bytes of opaque management data storage "
1925+ "available from the CIM_OpaqueManagementDataService. The "
1926+ "value of AvailableStorage shall not exceed the value of "
1927+ "MaxAvailableStorage in the associated "
1928+ "CIM_OpaqueManagementDataCapabilities." ),
1929+ ModelCorrespondence {
1930+ "CIM_OpaqueManagementDataCapabilities.MaxAvailableStorage" },
1931+ PUnit ( "byte" )]
1932+ uint64 AvailableStorage;
1933+
1934+ [Description (
1935+ "The amount of time a lock on a CIM_OpaqueManagementData "
1936+ "instance shall remain in effect without execution of any "
1937+ "CIM_OpaqueManagementDataService extrinsic methods on "
1938+ "that CIM_OpaqueManagementData instance by the Identity "
1939+ "that holds the lock. Locks on CIM_OpaqueManagementData "
1940+ "are created by Lock(). The intent of the timeout is to "
1941+ "ensure that a lock is released if the lock holder "
1942+ "neglects to release it or is unable to release it. The "
1943+ "value of LockTimeout shall be a duration." )]
1944+ datetime LockTimeout;
1945+
1946+ [Description (
1947+ "MaxCreateSize shall contain the maximum value that the "
1948+ "implementation will currently accept in the MaxSize "
1949+ "property of the OpaqueManagementDataTemplate embedded "
1950+ "instance parameter in a call to Create(). This value may "
1951+ "change over time for any reason, including but not "
1952+ "limited to fragmentation of the storage resources "
1953+ "managed by the service." ),
1954+ ModelCorrespondence { "CIM_OpaqueManagementData.MaxSize" },
1955+ PUnit ( "byte" )]
1956+ uint64 MaxCreateSize;
1957+
1958+
1959+ [Description (
1960+ "Grants or removes access to the referenced "
1961+ "CIM_OpaqueManagementData instance by the referenced "
1962+ "CIM_Identity instance." ),
1963+ ValueMap { "0", "1", "2", "3..32767", "32768..65535" },
1964+ Values { "Completed with No Error", "Not Supported",
1965+ "Unknown/Unspecified Error", "DMTF Reserved",
1966+ "Vendor Specified" }]
1967+ uint32 AssignAccess(
1968+ [Required, IN, Description (
1969+ "Reference to the CIM_Identity instance that is the "
1970+ "subject of the access rights modified by this "
1971+ "method." )]
1972+ CIM_Identity REF Identity,
1973+ [Required, IN, Description (
1974+ "Reference to the CIM_OpaqueManagementData instance "
1975+ "that is the target of the access rights modified "
1976+ "by this method." )]
1977+ CIM_OpaqueManagementData REF OpaqueManagementData,
1978+ [Required, IN, Description (
1979+ "The subset of values from the value map that shall "
1980+ "be contained in the resulting Activities property "
1981+ "of the CIM_AssociatedPrivilege between the "
1982+ "CIM_Identity instance referenced by the Identity "
1983+ "parameter and the CIM_OpaqueManagementData "
1984+ "instance referenced by the OpaqueManagementData "
1985+ "parameter. If such an instance of "
1986+ "CIM_AssociatedPrivilege does not exist before the "
1987+ "method is invoked, the method shall create it." ),
1988+ ValueMap { "5", "6" },
1989+ Values { "Read", "Write" },
1990+ ModelCorrespondence {
1991+ "CIM_AssociatedPrivilege.Activities" }]
1992+ uint16 Activities[]);
1993+
1994+ [Description (
1995+ "Create() creates an instance of CIM_OpaqueManagementData "
1996+ "using the property values in the OpaqueManagementData "
1997+ "parameter, and allocates the number of bytes of storage "
1998+ "specified in the MaxSize property of the "
1999+ "OpaqueManagementData parameter. It also optionally "
2000+ "allows the client to specify an existing "
2001+ "CIM_StorageExtent instance as the basis (storage "
2002+ "location) of the new CIM_OpaqueManagementData instance." ),
2003+ ValueMap { "0", "1", "2", "3..4095", "4096", "4097..32767",
2004+ "32768..65535" },
2005+ Values { "Completed with No Error", "Not Supported",
2006+ "Unknown/Unspecified Error", "DMTF Reserved",
2007+ "Method Parameters Checked - Job Started",
2008+ "Method Reserved", "Vendor Specified" }]
2009+ uint32 Create(
2010+ [Required, IN, Description (
2011+ "Specifies the instance of CIM_Identity or its "
2012+ "subclass that shall be the owner of the new "
2013+ "CIM_OpaqueManagementData instance. Create() shall "
2014+ "associate the new CIM_OpaqueManagementData "
2015+ "instance with this CIM_Identity instance using a "
2016+ "new instance of CIM_AssociatedPrivilege." )]
2017+ CIM_Identity REF Owner,
2018+ [IN, Description (
2019+ "Specifies the instance of CIM_StorageExtent on "
2020+ "which the new instance of CIM_OpaqueManagementData "
2021+ "shall be based (i.e., in which it shall be "
2022+ "stored). If this parameter is NULL, the choice of "
2023+ "storage location shall be left to the "
2024+ "implementation." )]
2025+ CIM_StorageExtent REF BasedOnExtent,
2026+ [IN ( false ), OUT, Description (
2027+ "Reference to the instance of "
2028+ "CIM_OpaqueManagementData created when the method "
2029+ "returns a value of 0." )]
2030+ CIM_OpaqueManagementData REF OpaqueManagementData,
2031+ [IN ( false ), OUT, Description (
2032+ "Reference to the job (may be null if job completed)."
2033+ )]
2034+ CIM_ConcreteJob REF Job);
2035+
2036+ [Description (
2037+ "ExportToURI() copies all or some of the bytes of opaque "
2038+ "management data in the extent represented by the "
2039+ "referenced instance of CIM_OpaqueManagementData to the "
2040+ "Uniform Resource Identifier (URI) specified in the "
2041+ "ExportURI parameter. The URI scheme implies the protocol "
2042+ "that shall be used. Typically, the URI will be a Uniform "
2043+ "Resource Locator (URL), but a Uniform Resource Name "
2044+ "(URN) is not prohibited.\n"
2045+ "If 0 is returned, the function completed successfully "
2046+ "and no ConcreteJob instance was required. If 4096/0x1000 "
2047+ "is returned, a ConcreteJob shall be started to to "
2048+ "perform the operation. The Job\'s reference shall be "
2049+ "returned in the output parameter Job." ),
2050+ ValueMap { "0", "1", "2", "3..4095", "4096", "4097..32767",
2051+ "32768..65535" },
2052+ Values { "Completed with No Error", "Not Supported",
2053+ "Unknown/Unspecified Error", "DMTF Reserved",
2054+ "Method Parameters Checked - Job Started",
2055+ "Method Reserved", "Vendor Specified" }]
2056+ uint32 ExportToURI(
2057+ [Required, IN, Description (
2058+ "The CIM_OpaqueManagementData instance that "
2059+ "represents the extent that is the target of the "
2060+ "operation." )]
2061+ CIM_OpaqueManagementData REF OpaqueManagementData,
2062+ [Required, IN, Description (
2063+ "Offset specifies the byte offset at which to start reading."
2064+ ),
2065+ PUnit ( "byte" )]
2066+ uint64 Offset,
2067+ [Required, IN, OUT, Description (
2068+ "On entry, Length contains the number of bytes to "
2069+ "be read, starting at the byte offset in the Offset "
2070+ "property. On return, Length contains the number of "
2071+ "bytes that were actually read." ),
2072+ PUnit ( "byte" )]
2073+ uint64 Length,
2074+ [Required, IN, Description (
2075+ "On entry, ExportURI contains a URI based on RFC "
2076+ "3986 that indicates the location to which the "
2077+ "service shall copy the specified bytes of opaque "
2078+ "management data and from which the client "
2079+ "subsequently retrieves them." ),
2080+ ModelCorrespondence {
2081+ "CIM_OpaqueManagementDataCapabilities.SupportedExportURISchemes" }]
2082+ string ExportURI,
2083+ [IN, Description (
2084+ "A token that represents a Lock placed on the data "
2085+ "in the extent referenced by the "
2086+ "OpaqueManagementData parameter, using the Lock() "
2087+ "method." ),
2088+ OctetString]
2089+ uint8 LockToken[],
2090+ [IN ( false ), OUT, Description (
2091+ "Reference to the job (may be null if job completed)."
2092+ )]
2093+ CIM_ConcreteJob REF Job);
2094+
2095+ [Description (
2096+ "ImportFromURI() modifies all or some of the bytes in the "
2097+ "referenced instance of CIM_OpaqueManagementData. The "
2098+ "imported data for the operation is copied from the URI "
2099+ "specified in the ImportURI parameter. The URI scheme "
2100+ "implies the protocol that shall be used. Typically, the "
2101+ "URI will be a Uniform Resource Locator (URL), but a "
2102+ "Uniform Resource Name (URN) is not prohibited.\n"
2103+ "Any data already present in the instance outside the "
2104+ "range specified by Offset and Length is unchanged.\n"
2105+ "If 0 is returned, the function completed successfully "
2106+ "and no ConcreteJob instance was required. If 4096/0x1000 "
2107+ "is returned, a ConcreteJob shall be started to perform "
2108+ "the operation. The Job\'s reference shall be returned in "
2109+ "the output parameter Job." ),
2110+ ValueMap { "0", "1", "2", "3..4095", "4096", "4097..32767",
2111+ "32768..65535" },
2112+ Values { "Completed with No Error", "Not Supported",
2113+ "Unknown/Unspecified Error", "DMTF Reserved",
2114+ "Method Parameters Checked - Job Started",
2115+ "Method Reserved", "Vendor Specified" }]
2116+ uint32 ImportFromURI(
2117+ [Required, IN, Description (
2118+ "The CIM_OpaqueManagementData instance that "
2119+ "represents the extent that is the target of the "
2120+ "operation." )]
2121+ CIM_OpaqueManagementData REF OpaqueManagementData,
2122+ [Required, IN, Description (
2123+ "Offset specifies the byte offset at which to start writing."
2124+ ),
2125+ PUnit ( "byte" )]
2126+ uint64 Offset,
2127+ [Required, IN, OUT, Description (
2128+ "On entry, Length contains the number of bytes to "
2129+ "be written, starting at the byte offset in the "
2130+ "Offset. property. On return, Length contains the "
2131+ "number of bytes that were actually written." ),
2132+ PUnit ( "byte" )]
2133+ uint64 Length,
2134+ [IN, Description (
2135+ "If the value of the DataSize property of the "
2136+ "instance referenced by the OpaqueManagementData "
2137+ "parameter is greater than Offset + Length, then a "
2138+ "value of TRUE shall indicate that the DataSize "
2139+ "property value shall be reduced by this operation "
2140+ "to Offset + Length, and a value of FALSE shall "
2141+ "indicate that the DataSize property value shall "
2142+ "remain unchanged by this operation. If the value "
2143+ "of the DataSize property is not greater than "
2144+ "Offset + Length, then this parameter shall be "
2145+ "ignored." ),
2146+ ModelCorrespondence {
2147+ "CIM_OpaqueManagementData.DataSize" }]
2148+ boolean Truncate,
2149+ [Required, IN, Description (
2150+ "On entry, ImportURI contains a URI based on RFC "
2151+ "3986 that shall be used by the service to retrieve "
2152+ "the bytes of opaque management data to be written "
2153+ "into the extent represented by the "
2154+ "OpaqueManagementData parameter." ),
2155+ ModelCorrespondence {
2156+ "CIM_OpaqueManagementDataCapabilities.SupportedImportURISchemes" }]
2157+ string ImportURI,
2158+ [IN, Description (
2159+ "A token that represents a Lock placed on the data "
2160+ "in the extent referenced by the "
2161+ "OpaqueManagementData parameter, using the Lock() "
2162+ "method." ),
2163+ OctetString]
2164+ uint8 LockToken[],
2165+ [IN ( false ), OUT, Description (
2166+ "Reference to the job (may be null if job completed)."
2167+ )]
2168+ CIM_ConcreteJob REF Job);
2169+
2170+ [Description (
2171+ "Lock() allows a management client to atomically read or "
2172+ "write an opaque management data storage extent larger "
2173+ "than MaxReadLength or MaxWriteLength, respectively. A "
2174+ "server that supports this method shall support the "
2175+ "following pattern:\n"
2176+ "1. Issue Lock() with Lock set to true to lock the "
2177+ "CIM_OpaqueManagementData instance.\n"
2178+ "2. Repeat Read() or Write() as many times as necessary "
2179+ "to complete the transfer\n"
2180+ "3. Issue Lock() with Lock set to false to unlock the "
2181+ "CIM_OpaqueManagementData instance\n"
2182+ "If Lock() with Lock set to true completes successfully, "
2183+ "the server shall return a LockToken to the client. Until "
2184+ "the lock is removed or expires, the server shall deny "
2185+ "OpaqueManagementDataService method requests on the same "
2186+ "CIM_OpaqueManagementData instance that do not contain "
2187+ "the same LockToken value.\n"
2188+ "Lock() shall not lock the properties of the "
2189+ "OpaqueManagementData instance. The method shall return 0 "
2190+ "if successful, 1 if not supported, and any other value "
2191+ "if an error occurred." ),
2192+ ValueMap { "0", "1", "2", "3..32767", "32768..65535" },
2193+ Values { "Completed with No Error", "Not Supported",
2194+ "Unknown/Unspecified Error", "DMTF Reserved",
2195+ "Vendor Specified" }]
2196+ uint32 Lock(
2197+ [Required, IN, Description (
2198+ "The CIM_OpaqueManagementData instance that "
2199+ "represents the extent that is the target of the "
2200+ "operation." )]
2201+ CIM_OpaqueManagementData REF OpaqueManagementData,
2202+ [Required, IN, Description (
2203+ "If true, lock the data from access by another "
2204+ "management client. If false, release the data." )]
2205+ boolean Lock,
2206+ [IN, OUT, Description (
2207+ "A token that shall be returned to the client as "
2208+ "output if Lock is True, and supplied by the client "
2209+ "as input if Lock is False. In this way, only the "
2210+ "client that set the Lock may remove it or delegate "
2211+ "such responsibility to another client." ),
2212+ OctetString]
2213+ uint8 LockToken[]);
2214+
2215+ [Description (
2216+ "Read() returns all or some of the bytes of opaque "
2217+ "management data in the extent represented by the "
2218+ "referenced instance of CIM_OpaqueManagementData." ),
2219+ ValueMap { "0", "1", "2", "3..32767", "32768..65535" },
2220+ Values { "Completed with No Error", "Not Supported",
2221+ "Unknown/Unspecified Error", "DMTF Reserved",
2222+ "Vendor Specified" }]
2223+ uint32 Read(
2224+ [Required, IN, Description (
2225+ "The CIM_OpaqueManagementData instance that "
2226+ "represents the extent that is the target of the "
2227+ "operation." )]
2228+ CIM_OpaqueManagementData REF OpaqueManagementData,
2229+ [Required, IN, Description (
2230+ "Offset specifies the byte offset at which to start reading."
2231+ ),
2232+ PUnit ( "byte" )]
2233+ uint64 Offset,
2234+ [Required, IN, OUT, Description (
2235+ "On entry, Length shall contain the number of bytes "
2236+ "to be read, starting at the byte offset in the "
2237+ "Offset property. On return, Length shall contain "
2238+ "the number of bytes that were actually read." ),
2239+ ModelCorrespondence {
2240+ "CIM_OpaqueManagementDataCapabilities.MaxReadLength" },
2241+ PUnit ( "byte" )]
2242+ uint64 Length,
2243+ [IN ( false ), OUT, Description (
2244+ "On return, Data shall contain the bytes of opaque "
2245+ "management data read from the extent represented "
2246+ "by the OpaqueManagementData parameter." ),
2247+ OctetString]
2248+ uint8 Data[],
2249+ [IN, Description (
2250+ "A token that represents a Lock placed on the data "
2251+ "in the extent referenced by the "
2252+ "OpaqueManagementData parameter, using the Lock() "
2253+ "method. Parameter shall be NULL if data is not "
2254+ "locked." ),
2255+ OctetString]
2256+ uint8 LockToken[]);
2257+
2258+ [Description (
2259+ "Transfers ownership of a CIM_OpaqueManagementData "
2260+ "instance to the CIM_Identity instance referenced by the "
2261+ "Identity parameter." ),
2262+ ValueMap { "0", "1", "2", "3..32767", "32768..65535" },
2263+ Values { "Completed with No Error", "Not Supported",
2264+ "Unknown/Unspecified Error", "DMTF Reserved",
2265+ "Vendor Specified" }]
2266+ uint32 ReassignOwnership(
2267+ [Required, IN, Description (
2268+ "Reference to the CIM_Identity instance that will "
2269+ "become the new owner of the "
2270+ "CIM_OpaqueManagementData instance referenced by "
2271+ "the OpaqueManagementData parameter." )]
2272+ CIM_Identity REF NewOwner,
2273+ [Required, IN, Description (
2274+ "Reference to the CIM_OpaqueManagementData instance "
2275+ "that is the target of ownership reassignment." )]
2276+ CIM_OpaqueManagementData REF OpaqueManagementData);
2277+
2278+ [Description (
2279+ "Write() modifies all or some of the bytes in the extent "
2280+ "represented by the referenced instance of "
2281+ "CIM_OpaqueManagementData. Any data already present in "
2282+ "the extent outside the range specified by Offset and "
2283+ "Length shall remain unchanged by this operation." ),
2284+ ValueMap { "0", "1", "2", "3..4095", "4096", "4097..32767",
2285+ "32768..65535" },
2286+ Values { "Completed with No Error", "Not Supported",
2287+ "Unknown/Unspecified Error", "DMTF Reserved",
2288+ "Method Parameters Checked - Job Started",
2289+ "Method Reserved", "Vendor Specified" }]
2290+ uint32 Write(
2291+ [Required, IN, Description (
2292+ "The CIM_OpaqueManagementData instance that "
2293+ "represents the extent that is the target of the "
2294+ "operation." )]
2295+ CIM_OpaqueManagementData REF OpaqueManagementData,
2296+ [Required, IN, Description (
2297+ "Offset specifies the byte offset at which to start writing."
2298+ ),
2299+ PUnit ( "byte" )]
2300+ uint64 Offset,
2301+ [Required, IN, OUT, Description (
2302+ "On entry, Length contains the number of bytes to "
2303+ "be written, starting at the byte offset in the "
2304+ "Offset. property. On return, Length contains the "
2305+ "number of bytes that were actually written." ),
2306+ ModelCorrespondence {
2307+ "CIM_OpaqueManagementDataCapabilities.MaxWriteLength" },
2308+ PUnit ( "byte" )]
2309+ uint64 Length,
2310+ [IN, Description (
2311+ "If the value of the DataSize property of the "
2312+ "instance referenced by the OpaqueManagementData "
2313+ "parameter is greater than Offset + Length, then a "
2314+ "value of TRUE shall indicate that the DataSize "
2315+ "property value shall be reduced by this operation "
2316+ "to Offset + Length, and a value of FALSE shall "
2317+ "indicate that the DataSize property value shall "
2318+ "remain unchanged by this operation. If the value "
2319+ "of the DataSize property is not greater than "
2320+ "Offset + Length, then this parameter shall be "
2321+ "ignored." ),
2322+ ModelCorrespondence {
2323+ "CIM_OpaqueManagementData.DataSize" }]
2324+ boolean Truncate,
2325+ [Required, IN, Description (
2326+ "On entry, Data contains the bytes of opaque "
2327+ "management data to be written into the extent "
2328+ "represented by the OpaqueManagementData parameter." ),
2329+ OctetString]
2330+ uint8 Data[],
2331+ [IN, Description (
2332+ "A token that represents a Lock placed on the data "
2333+ "in the extent referenced by the "
2334+ "OpaqueManagementData parameter, using the Lock() "
2335+ "method." ),
2336+ OctetString]
2337+ uint8 LockToken[],
2338+ [IN ( false ), OUT, Description (
2339+ "Reference to the job (may be null if job completed)."
2340+ )]
2341+ CIM_ConcreteJob REF Job);
2342+
2343+};
2344
2345=== added file 'schema/Core/CIM_OrderedComponent.mof'
2346--- schema/Core/CIM_OrderedComponent.mof 1970-01-01 00:00:00 +0000
2347+++ schema/Core/CIM_OrderedComponent.mof 2009-07-28 19:10:35 +0000
2348@@ -0,0 +1,46 @@
2349+// Copyright (c) 2008 DMTF. All rights reserved.
2350+ [Association, Aggregation, Version ( "2.19.1" ),
2351+ UMLPackagePath ( "CIM::Core::CoreElements" ),
2352+ Description (
2353+ "CIM_OrderedComponent is a generic association used to "
2354+ "establish \'part of\' relationships between ManagedElements. "
2355+ "It arranges the PartComponents in a specific assigned order. "
2356+ "The semantics of the order depends on the context and use by "
2357+ "the referencing classes. For example, if this association is "
2358+ "used to arrange settings in a hierarchical order, then this "
2359+ "specifies the sequence in which the settings are applied." )]
2360+class CIM_OrderedComponent : CIM_Component {
2361+
2362+ [Description (
2363+ "AssignedSequence is an unsigned integer \'n\' that "
2364+ "indicates the relative order of ManagedElement "
2365+ "instances. When \'n\' is a positive integer, it "
2366+ "indicates a place in the sequence of members, with "
2367+ "smaller integers indicating earlier positions in the "
2368+ "sequence. The special value \'0\' indicates \'don\'t "
2369+ "care\'. If two or more members have the same non-zero "
2370+ "sequence number, then the ordering between those members "
2371+ "is irrelevant, but they must all be ordered at the "
2372+ "appropriate place in the overall sequence. \n"
2373+ "\n"
2374+ "A series of examples will make ordering of members "
2375+ "clearer: \n"
2376+ "If all members have the same sequence number, \n"
2377+ "regardless of whether it is \'0\' or non-zero, any \n"
2378+ "order is acceptable. \n"
2379+ "o The values: \n"
2380+ "1:MEMBER A \n"
2381+ "2:MEMBER B \n"
2382+ "1:MEMBER C \n"
2383+ "3:MEMBER D \n"
2384+ "indicate two acceptable orders: A,C,B,D or C,A,B,D, \n"
2385+ "since A and C can be ordered in either sequence, but \n"
2386+ "only at the \'1\' position. \n"
2387+ "\n"
2388+ "Note that the non-zero sequence numbers need not start "
2389+ "with \'1\', and they need not be consecutive. All that "
2390+ "matters is their relative magnitude." )]
2391+ uint64 AssignedSequence;
2392+
2393+
2394+};
2395
2396=== added file 'schema/Core/CIM_OrderedDependency.mof'
2397--- schema/Core/CIM_OrderedDependency.mof 1970-01-01 00:00:00 +0000
2398+++ schema/Core/CIM_OrderedDependency.mof 2009-07-28 19:10:35 +0000
2399@@ -0,0 +1,48 @@
2400+// Copyright (c) 2009 DMTF. All rights reserved.
2401+ [Association, Version ( "2.22.0" ),
2402+ UMLPackagePath ( "CIM::Core::CoreElements" ),
2403+ Description (
2404+ "CIM_OrderedDependency is used to establish a relationship "
2405+ "between a ManagedElement and its dependencies. Each dependency "
2406+ "is an Antecedent reference and the order in which the "
2407+ "dependencies need to be resolved is indicated by the "
2408+ "AssignedSequence property. \n"
2409+ "For example, if this association is used to arrange "
2410+ "dependencies of a software in a hierarchical order, then this "
2411+ "specifies the sequence in which the dependencies need to be "
2412+ "installed prior to installing the software." )]
2413+class CIM_OrderedDependency : CIM_Dependency {
2414+
2415+ [Description (
2416+ "AssignedSequence is an unsigned integer \'n\' that "
2417+ "indicates the relative order of ManagedElement "
2418+ "instances. When \'n\' is a positive integer, it "
2419+ "indicates a place in the sequence of members, with "
2420+ "smaller integers indicating earlier positions in the "
2421+ "sequence. The special value \'0\' indicates \'don\'t "
2422+ "care\'. If two or more members have the same non-zero "
2423+ "sequence number, then the ordering between those members "
2424+ "is irrelevant, but they must all be ordered at the "
2425+ "appropriate place in the overall sequence. \n"
2426+ "\n"
2427+ "A series of examples will make ordering of members "
2428+ "clearer: \n"
2429+ "If all members have the same sequence number, \n"
2430+ "regardless of whether it is \'0\' or non-zero, any \n"
2431+ "order is acceptable. \n"
2432+ "o The values: \n"
2433+ "1:MEMBER A \n"
2434+ "2:MEMBER B \n"
2435+ "1:MEMBER C \n"
2436+ "3:MEMBER D \n"
2437+ "indicate two acceptable orders: A,C,B,D or C,A,B,D, \n"
2438+ "since A and C can be ordered in either sequence, but \n"
2439+ "only at the \'1\' position. \n"
2440+ "\n"
2441+ "Note that the non-zero sequence numbers need not start "
2442+ "with \'1\', and they need not be consecutive. All that "
2443+ "matters is their relative magnitude." )]
2444+ uint64 AssignedSequence;
2445+
2446+
2447+};
2448
2449=== modified file 'schema/Core/CIM_PowerManagementCapabilities.mof'
2450--- schema/Core/CIM_PowerManagementCapabilities.mof 2008-08-27 11:09:14 +0000
2451+++ schema/Core/CIM_PowerManagementCapabilities.mof 2009-07-28 19:10:03 +0000
2452@@ -54,5 +54,109 @@
2453 "CIM_PowerManagementCapabilities.PowerCapabilities" }]
2454 string OtherPowerCapabilitiesDescriptions[];
2455
2456+ [Description (
2457+ "An enumeration that indicates the power states supported "
2458+ "by a managed element. Because this is an array, multiple "
2459+ "values can be specified. The current values in the "
2460+ "enumeration are: \n"
2461+ "2=On, corresponding to ACPI state G0 or S0 or D0. \n"
2462+ "3=Sleep - Light, corresponding to ACPI state G1, S1/S2, "
2463+ "or D1. \n"
2464+ "4=Sleep - Deep, corresponding to ACPI state G1, S3, or D2.\n"
2465+ "5=Power Cycle (Off - Soft), corresponding to ACPI state "
2466+ "G2, S5, or D3, but where the managed element is set to "
2467+ "return to power state \"On\" at a pre-determined time. \n"
2468+ "6=Off - Hard, corresponding to ACPI state G3, S5, or D3. \n"
2469+ "7=Hibernate (Off - Soft), corresponding to ACPI state "
2470+ "S4, where the state of the managed element is preserved "
2471+ "and will be recovered upon powering on. \n"
2472+ "8=Off - Soft, corresponding to ACPI state G2, S5, or D3. "
2473+ "9= Power Cycle (Off-Hard), corresponds to the managed "
2474+ "element reaching the ACPI state G3 followed by ACPI "
2475+ "state S0. \n"
2476+ "10=Master Bus Reset, corresponds to the system reaching "
2477+ "ACPI state S5 followed by ACPI state S0. This is used to "
2478+ "represent system master bus reset. 11=Diagnostic "
2479+ "Interrupt (NMI), corresponding to the system reaching "
2480+ "ACPI state S5 followed by ACPI state S0. This is used to "
2481+ "represent system non-maskable interrupt. 12=Off - Soft "
2482+ "Graceful, equivalent to Off Soft but preceded by a "
2483+ "request to the managed element to perform an "
2484+ "orderlyshutdown. \n"
2485+ "13=Off - Hard Graceful, equivalent to Off Hard but "
2486+ "preceded by a request to the managed element to perform "
2487+ "an orderly shutdown. \n"
2488+ "14=Master Bus Rest Graceful, equivalent to Master Bus "
2489+ "Reset but preceded by a request to the managed element "
2490+ "to perform an orderly shutdown. \n"
2491+ "15=Power Cycle (Off - Soft Graceful), equivalent to "
2492+ "Power Cycle (Off - Soft) but preceded by a request to "
2493+ "the managed element to perform an orderly shutdown. \n"
2494+ "16=Power Cycle (Off - Hard Graceful), equivalent to "
2495+ "Power Cycle (Off - Hard) but preceded by a request to "
2496+ "the managed element to perform an orderly shutdown. \n"
2497+ "..=DMTF Reserved. \n"
2498+ "0x7FFF..0xFFFF = Vendor Specific." ),
2499+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
2500+ "11", "12", "13", "14", "15", "16", "..", "0x7FFF..0xFFFF" },
2501+ Values { "Other", "On", "Sleep - Light", "Sleep -Deep",
2502+ "Power Cycle (Off - Soft)", "Off - Hard",
2503+ "Hibernate (Off - Soft)", "Off - Soft",
2504+ "Power Cycle (Off-Hard)", "Master Bus Reset",
2505+ "Diagnostic Interrupt (NMI)", "Off - Soft Graceful",
2506+ "Off - Hard Graceful", "Master Bus Reset Graceful",
2507+ "Power Cycle (Off - Soft Graceful)",
2508+ "Power Cycle (Off - Hard Graceful)", "DMTF Reserved",
2509+ "Vendor Specific" },
2510+ MappingStrings { "IEEE P1621 | 3.2" },
2511+ ModelCorrespondence {
2512+ "CIM_PowerManagementService.RequestPowerStateChange",
2513+ "CIM_AssociatedPowerManagementService.PowerState" }]
2514+ uint16 PowerStatesSupported[];
2515+
2516+ [Description (
2517+ "An enumeration indicating the specific power-related "
2518+ "capabilities of a managed element. Since this is an "
2519+ "array, multiple values may be specified. The current "
2520+ "values in the enumeration are: \n"
2521+ "0 = Unknown \n"
2522+ "1 = Other \n"
2523+ "2 = Power Saving Modes Entered Automatically, describing "
2524+ "that a managed element can change its power state based "
2525+ "on usage or other criteria \n"
2526+ "3 = Power State Settable, indicating that the "
2527+ "RequestPowerStateChange method is supported \n"
2528+ "4 = Power Cycling Supported, indicating that the "
2529+ "RequestPowerStateChange method can be invoked with the "
2530+ "PowerState input variable set to \'Power Cycle (Off "
2531+ "Soft)\' \n"
2532+ "5 = Timed Power On Supported, indicating that the "
2533+ "RequestPowerStateChange method can be invoked with the "
2534+ "PowerState input variable set to \'Power On\' and the "
2535+ "Time parameter set to a specific date and time, or "
2536+ "interval, for power-on.8 = Graceful Shutdown Supported, "
2537+ "indicating that the managed element can be sent a "
2538+ "hardware signal requesting an orderly shutdown prior to "
2539+ "the requested power state change." ),
2540+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8" },
2541+ Values { "Unknown", "Other",
2542+ "Power Saving Modes Entered Automatically",
2543+ "Power State Settable", "Power Cycling Supported",
2544+ "Timed Power On Supported",
2545+ "Off Hard Power Cycling Supported", "HW Reset Supported",
2546+ "Graceful Shutdown Supported" },
2547+ ModelCorrespondence {
2548+ "CIM_PowerManagementService.RequestPowerStateChange",
2549+ "CIM_PowerManagementCapabilities.OtherPowerChangeCapabilities" }]
2550+ uint16 PowerChangeCapabilities[];
2551+
2552+ [Description (
2553+ "A string describing the additional power management "
2554+ "capabilities of the element, used when the "
2555+ "PowerChangeCapabilities is set to the value 1, \"Other\"." ),
2556+ ModelCorrespondence {
2557+ "CIM_PowerManagementCapabilities.PowerChangeCapabilities" }]
2558+ string OtherPowerChangeCapabilities;
2559+
2560
2561 };
2562
2563=== modified file 'schema/Core/CIM_PowerManagementService.mof'
2564--- schema/Core/CIM_PowerManagementService.mof 2008-08-27 11:09:14 +0000
2565+++ schema/Core/CIM_PowerManagementService.mof 2009-07-28 19:10:03 +0000
2566@@ -1,50 +1,51 @@
2567-// Copyright (c) 2005 DMTF. All rights reserved.
2568-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
2569-// qualifier values to CIM Schema.</change>
2570-// ==================================================================
2571-// CIM_PowerManagementService
2572-// ==================================================================
2573- [Version ( "2.7.0" ),
2574+// Copyright (c) 2008 DMTF. All Rights Reserved.
2575+ [Version ( "2.19.1" ),
2576 UMLPackagePath ( "CIM::Core::PowerMgmt" ),
2577 Description (
2578 "A class derived from Service that describes power management "
2579- "functionality, hosted on a System. The fact that this service "
2580- "may be used to affect the power state of a particular element "
2581- "is defined by the CIM_ServiceAvailable ToElement association." )]
2582+ "functionality, hosted on a System. Whether this service might "
2583+ "be used to affect the power state of a particular element is "
2584+ "defined by the CIM_ServiceAvailable ToElement association." )]
2585 class CIM_PowerManagementService : CIM_Service {
2586
2587
2588- [Description (
2589- "SetPowerState defines the desired power state of the "
2590- "managed element, and when the element should be put into "
2591- "that state. The SetPowerState method has three input "
2592- "parameters, no output parameters, and a result. \n"
2593+ [Deprecated {
2594+ "CIM_PowerManagementService.RequestPowerStateChange" },
2595+ Description (
2596+ "The CIM_PowerManagementService.RequestPowerStateChange "
2597+ "method should be used instead of SetPowerState method, "
2598+ "which is deprecated. SetPowerState defines the desired "
2599+ "power state of the managed element and when the element "
2600+ "should be put into that state. The SetPowerState method "
2601+ "has three input parameters, no output parameters, and a "
2602+ "result. \n"
2603 "- PowerState indicates the desired power state. \n"
2604 "- ManagedElement indicates the element whose state is "
2605- "set. This element SHOULD be associated to the service "
2606+ "set. This element should be associated with the service "
2607 "using the ServiceAvailableToElement relationship. \n"
2608 "- Time indicates when the power state should be set, "
2609 "either as a regular date-time value or as an interval "
2610 "value (where the interval begins when the method "
2611 "invocation is received). \n"
2612 "Note that when the PowerState parameter is equal to 5, "
2613- "\"Power Cycle\", the Time parameter indicates when the "
2614- "managed element should powered on again. Power off is "
2615- "immediate. \n"
2616+ "\"Power Cycle (Off -Soft)\", the Time parameter "
2617+ "indicates when the managed element should be powered on "
2618+ "again. Power-off is immediate. \n"
2619 "SetPowerState should return 0 if successful, 1 if the "
2620 "specified State and Time request is not supported for "
2621 "the element, and some other value if any other error "
2622 "occurred. In a subclass, the set of possible return "
2623 "codes could be specified, using a ValueMap qualifier on "
2624 "the method. The strings to which the ValueMap contents "
2625- "are \'translated\' may also be specified in the subclass "
2626+ "are \'translated\' can also be specified in the subclass "
2627 "as a Values array qualifier." )]
2628 uint32 SetPowerState(
2629 [IN, Description ( "The power state for ManagedElement." ),
2630 ValueMap { "1", "2", "3", "4", "5", "6", "7", "8" },
2631- Values { "Full Power", "Power Save - Low Power Mode",
2632- "Power Save - Standby", "Power Save - Other",
2633- "Power Cycle", "Power Off", "Hibernate", "Soft Off" }]
2634+ Values { "On", "Sleep - Light", "Sleep -Deep",
2635+ "Vendor Specific", "Power Cycle (Off - Soft)",
2636+ "Off - Hard", "Hibernate (Off - Soft)", "Off - Soft" },
2637+ MappingStrings { "IEEE P1621 | 3.2" }]
2638 uint16 PowerState,
2639 [IN, Description (
2640 "ManagedElement indicates the element whose state is set."
2641@@ -57,4 +58,74 @@
2642 "method invocation is received." )]
2643 datetime Time);
2644
2645+ [Description (
2646+ "RequestPowerStateChange defines the desired power state "
2647+ "of the managed element, and when the element should be "
2648+ "put into that state. The RequestPowerStateChange method "
2649+ "has five input parameters and a result code. \n"
2650+ "- PowerState indicates the desired power state. \n"
2651+ "- ManagedElement indicates the element whose state is "
2652+ "set. This element SHOULD be associated to the service "
2653+ "using the AssociatedPowerManagementService relationship. \n"
2654+ "- Time indicates when the power state should be set, "
2655+ "either as a regular date-time value or as an interval "
2656+ "value (where the interval begins when the method "
2657+ "invocation is received). \n"
2658+ "- Job is a reference to the job if started. \n"
2659+ "- TimeOutPeriod indicates the maximum amount of time a "
2660+ "client is expects the transition to take. \n"
2661+ "See CIM_PowerStateCapabilities for descriptions of "
2662+ "PowerState parameter enumerations." ),
2663+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096",
2664+ "4097", "4098", "4099", "4100..32767", "32768..65535" },
2665+ Values { "Completed with No Error", "Not Supported",
2666+ "Unknown or Unspecified Error",
2667+ "Cannot complete within Timeout Period", "Failed",
2668+ "Invalid Parameter", "In Use", "DMTF Reserved",
2669+ "Method Parameters Checked - Job Started",
2670+ "Invalid State Transition",
2671+ "Use of Timeout Parameter Not Supported", "Busy",
2672+ "Method Reserved", "Vendor Specific" }]
2673+ uint32 RequestPowerStateChange(
2674+ [IN, Description ( "The power state for ManagedElement." ),
2675+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "9",
2676+ "10", "11", "12", "13", "14", "15", "16" },
2677+ Values { "Power On", "Sleep - Light", "Sleep - Deep",
2678+ "Power Cycle (Off Soft)", "Power Off - Hard",
2679+ "Hibernate", "Power Off - Soft",
2680+ "Power Cycle (Off Hard)", "Master Bus Reset",
2681+ "Diagnostic Interrupt (NMI)",
2682+ "Power Off - Soft Graceful",
2683+ "Power Off - Hard Graceful",
2684+ "Master Bus Reset Graceful",
2685+ "Power Cycle (Off - Soft Graceful)",
2686+ "Power Cycle (Off - Hard Graceful)" }]
2687+ uint16 PowerState,
2688+ [IN, Description (
2689+ "ManagedElement indicates the element whose state is set."
2690+ )]
2691+ CIM_ManagedElement REF ManagedElement,
2692+ [IN, Description (
2693+ "Time indicates when the power state should be set, "
2694+ "either as a regular date-time value or as an "
2695+ "interval value (where the interval begins when the "
2696+ "method invocation is received." )]
2697+ datetime Time,
2698+ [IN ( false ), OUT, Description (
2699+ "Reference to the job (can be null if the task is completed)."
2700+ )]
2701+ CIM_ConcreteJob REF Job,
2702+ [IN, Description (
2703+ "A timeout period that specifies the maximum amount "
2704+ "of time that the client expects the transition to "
2705+ "the new state to take. The interval format must be "
2706+ "used to specify the TimeoutPeriod. A value of 0 or "
2707+ "a null parameter indicates that the client has no "
2708+ "time requirements for the transition. \n"
2709+ "If this property does not contain 0 or null and "
2710+ "the implementation does not support this "
2711+ "parameter, a return code of \'Use Of Timeout "
2712+ "Parameter Not Supported\' must be returned." )]
2713+ datetime TimeoutPeriod);
2714+
2715 };
2716
2717=== modified file 'schema/Core/CIM_Product.mof'
2718--- schema/Core/CIM_Product.mof 2008-08-27 11:09:14 +0000
2719+++ schema/Core/CIM_Product.mof 2009-07-28 19:10:03 +0000
2720@@ -1,9 +1,4 @@
2721 // Copyright (c) 2005 DMTF. All rights reserved.
2722-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
2723-// qualifier values to CIM Schema.</change>
2724-// ==================================================================
2725-// CIM_Product
2726-// ==================================================================
2727 [Version ( "2.7.0" ),
2728 UMLPackagePath ( "CIM::Core::ProductFRU" ),
2729 Description (
2730@@ -74,7 +69,8 @@
2731 "warranty in days." ),
2732 Units ( "Days" ),
2733 MappingStrings { "MIF.DMTF|FRU|002.10" },
2734- ModelCorrespondence { "CIM_Product.WarrantyStartDate" }]
2735+ ModelCorrespondence { "CIM_Product.WarrantyStartDate" },
2736+ PUnit ( "day" )]
2737 uint32 WarrantyDuration;
2738
2739
2740
2741=== modified file 'schema/Core/CIM_Profile.mof'
2742--- schema/Core/CIM_Profile.mof 2008-08-27 11:09:14 +0000
2743+++ schema/Core/CIM_Profile.mof 2009-07-28 19:10:03 +0000
2744@@ -1,16 +1,7 @@
2745-// Copyright (c) 2005 DMTF. All rights reserved.
2746-// <change cr="DMTFCR01378.002" type ="deprecate">Deprecate
2747-// class.</change>
2748-// <change cr="SysDevCR00728.000" type ="change">Update of
2749-// descriptions based on Tech Edit review.</
2750-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
2751-// qualifier values to CIM Schema.</change>
2752-// ==================================================================
2753-// CIM_Profile
2754-// ==================================================================
2755+// Copyright (c) 2008 DMTF. All rights reserved.
2756 [Deprecated { "CIM_SettingData", "CIM_Setting",
2757 "CIM_ConcreteComponent" },
2758- Version ( "2.10.0" ),
2759+ Version ( "2.19.0" ),
2760 UMLPackagePath ( "CIM::Core::Settings" ),
2761 Description (
2762 "Note: The use of CIM_Profile is deprecated in favor of "
2763@@ -47,7 +38,8 @@
2764
2765 [Deprecated { "CIM_SettingData.InstanceID",
2766 "CIM_Setting.SettingID" },
2767- Key, Description (
2768+ Key, Override ( "InstanceID" ),
2769+ Description (
2770 "Note: The use of this element is deprecated. Deprecated "
2771 "description: Within the scope of the instantiating "
2772 "Namespace, InstanceID opaquely and uniquely identifies "
2773
2774=== added file 'schema/Core/CIM_ProtocolService.mof'
2775--- schema/Core/CIM_ProtocolService.mof 1970-01-01 00:00:00 +0000
2776+++ schema/Core/CIM_ProtocolService.mof 2009-07-28 19:10:35 +0000
2777@@ -0,0 +1,109 @@
2778+// Copyright (c) 2009 DMTF. All rights reserved.
2779+ [Version ( "2.22.0" ),
2780+ UMLPackagePath ( "CIM::Core::Service" ),
2781+ Description (
2782+ "ProtocolService represents represents an application layer "
2783+ "service available on a hosting system. Often times, the "
2784+ "service name reflects the employed/supported communication "
2785+ "protocol (e.g. file transfer - FTP), however in some other "
2786+ "cases it does not. (e.g. mail notification service - biff). "
2787+ "Access to the service is modeled with one or more instances of "
2788+ "ProtocolEndpoint. This class represents the availability of "
2789+ "the function on the system. Issuing a stop to this instance is "
2790+ "equivalent to disabling the functionality and making it "
2791+ "unavailable to users. Thus a stop of this service will result "
2792+ "in the removing of all ProtocolEndpoints which are associated "
2793+ "with the instance via ServicAccessBySAP. The functionality can "
2794+ "be made available again by issuing a start to the service. "
2795+ "This class contains service definitions which are currently "
2796+ "needed. Future extensions are expected." )]
2797+class CIM_ProtocolService : CIM_Service {
2798+
2799+ [Description (
2800+ "The protocol this service provides. Values defined for "
2801+ "this property are limited to the known use cases where "
2802+ "it is desirable to represent the ability to enable or "
2803+ "disable the functionality on the system." ),
2804+ ValueMap { "0", "1", "2", "3", "4", "5..32767", "32768..65535" },
2805+ Values { "Unknown", "Other", "SSH", "Telnet", "CLP",
2806+ "DMTF Reserved", "Vendor Reserved" },
2807+ ModelCorrespondence { "CIM_ProtocolService.OtherProtocol" }]
2808+ uint16 Protocol;
2809+
2810+ [Description (
2811+ "If the Protocol property is set to 1 \"Other\" then free "
2812+ "form string providing more information about the "
2813+ "protocol. If not set to 1, this string has no meaning." ),
2814+ ModelCorrespondence { "CIM_ProtocolService.Protocol" }]
2815+ string OtherProtocol;
2816+
2817+ [Write, Description (
2818+ "MaxConnections specifies the maximum number of "
2819+ "connections currently allowed by the service. The values "
2820+ "32768..65535 are DMTF Reserved." ),
2821+ MinValue ( 1 ),
2822+ MaxValue ( 65535 )]
2823+ uint16 MaxConnections = 1;
2824+
2825+ [Description (
2826+ "CurrentActiveConnections indicates the number of "
2827+ "sessions currently established with the protocol "
2828+ "service. A value of null for this property shall "
2829+ "indicate the number of active sessions is unknown. A "
2830+ "value of zero shall indicate there are no active "
2831+ "sessions. Any other value shall correspond to the number "
2832+ "of active sessions." ),
2833+ MinValue ( 0 ),
2834+ MaxValue ( 65535 )]
2835+ uint16 CurrentActiveConnections;
2836+
2837+
2838+ [Description (
2839+ "Create a CIM_TCPProtocoEndpoint instance and associate "
2840+ "it with this CIM_ProtocolService instance via an "
2841+ "instance of CIM_ServiceAccessBySAP. The newly created "
2842+ "instance of CIM_TCPProtocolEndpoint will be for the port "
2843+ "specified. When the CIM_IPProtocolEndpoint is not "
2844+ "specified, the method will create an instance of "
2845+ "CIM_HostedAccessPoint which associates the newly created "
2846+ "CIM_TCPProtocolEndpoint instance with the instance of "
2847+ "CIM_ComputerSystem with which this instance is "
2848+ "associated via an instance of CIM_HostedService (the "
2849+ "scoping system) It will also create instances of "
2850+ "CIM_BindsTo which associate the created "
2851+ "CIM_TCPProtocolEndpoint with each instance "
2852+ "CIM_IPProtocolEndpoint which is associated with the "
2853+ "scoping system. When an instance of "
2854+ "CIM_IPProtocolEndpoint is specified, the "
2855+ "CIM_HostedAccessPoint will associate the "
2856+ "CIM_TCPProtocolEndpoint with the same instance which is "
2857+ "associated with the CIM_IPProtocolEndpoint. In addition, "
2858+ "the implementation will create a single instance of "
2859+ "CIM_BindsTo that associates the CIM_TCPProtocolEndpoint "
2860+ "with the specified instance of CIM_IPProtocolEndpoint. "
2861+ "For each instance of CIM_BindsTo created by this method, "
2862+ "the value of the Dependent property will be a reference "
2863+ "to the newly created instance of "
2864+ "CIM_TCPProtocolEndpoint. An extrinsic method is required "
2865+ "in order to provide atomic creation of multiple, related "
2866+ "instances. Prior to creating the instances, the "
2867+ "implementation will verify that a "
2868+ "CIM_TCPProtocolEndpoint instance can be created and "
2869+ "associated with this instance." ),
2870+ ValueMap { "0", "1", "2", "4", "..", "32768..65535" },
2871+ Values { "Completed with No Error", "Not Supported",
2872+ "Error Occurred", "Invalid Port", "DMTF Reserved",
2873+ "Vendor Reserved" }]
2874+ uint32 ListenOnPort(
2875+ [Required, IN, Description (
2876+ "The desired listening port." )]
2877+ uint32 PortNumber,
2878+ [IN, Description (
2879+ "A specific CIM_IPProtocolEndpoint on which the "
2880+ "service will listen to the specified port." )]
2881+ CIM_IPProtocolEndpoint REF IPEndpoint,
2882+ [IN ( false ), OUT, Description (
2883+ "The created TCPProtocolEndpoint." )]
2884+ CIM_TCPProtocolEndpoint REF TCPEndpoint);
2885+
2886+};
2887
2888=== modified file 'schema/Core/CIM_RemoteServiceAccessPoint.mof'
2889--- schema/Core/CIM_RemoteServiceAccessPoint.mof 2008-08-27 11:09:14 +0000
2890+++ schema/Core/CIM_RemoteServiceAccessPoint.mof 2009-07-28 19:10:03 +0000
2891@@ -1,12 +1,5 @@
2892-// Copyright (c) 2005 DMTF. All rights reserved.
2893-// <change cr="SysDevCR00722.000" type ="change">Update of
2894-// descriptions based on Tech Edit review.</
2895-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
2896-// qualifier values to CIM Schema.</change>
2897-// ==================================================================
2898-// CIM_RemoteServiceAccessPoint
2899-// ==================================================================
2900- [Version ( "2.10.0" ),
2901+// Copyright (c) 2008 DMTF. All rights reserved.
2902+ [Version ( "2.21.0" ),
2903 UMLPackagePath ( "CIM::Core::Service" ),
2904 Description (
2905 "RemoteServiceAccessPoint describes access or addressing "
2906@@ -31,10 +24,19 @@
2907
2908 [Description (
2909 "An enumerated integer that describes the format and "
2910- "interpretation of the AccessInfo property." ),
2911+ "interpretation of the AccessInfo property.\n"
2912+ "206\'Parameterized URL\'- a URL containing "
2913+ "${parameterName} strings. Those strings are intended to "
2914+ "be replaced in their entirety by the value of the named "
2915+ "parameter. The interpretation of such parameters is not "
2916+ "defined by this subclass. \n"
2917+ "As an example use: If a parameter named \'CompanyURL\' "
2918+ "has a value of \'www.DMTF.org\' and the value of "
2919+ "AccessInfo was \'http:\\${CompanyURL}\', then the "
2920+ "resultant URL is intended to be \'http:\\www.dmtf.org\'." ),
2921 ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
2922 "11", "12", "13", "100", "101", "102", "103", "104",
2923- "200", "201", "202", "203", "204", "205", "..",
2924+ "200", "201", "202", "203", "204", "205", "206", "..",
2925 "32768..65535" },
2926 Values { "Other", "Host Name", "IPv4 Address",
2927 "IPv6 Address", "IPX Address", "DECnet Address",
2928@@ -43,8 +45,8 @@
2929 "IPv4 Address Range", "IPv6 Address Range", "Dial String",
2930 "Ethernet Address", "Token Ring Address", "ATM Address",
2931 "Frame Relay Address", "URL", "FQDN", "User FQDN",
2932- "DER ASN1 DN", "DER ASN1 GN", "Key ID", "DMTF Reserved",
2933- "Vendor Reserved" },
2934+ "DER ASN1 DN", "DER ASN1 GN", "Key ID",
2935+ "Parameterized URL", "DMTF Reserved", "Vendor Reserved" },
2936 ModelCorrespondence {
2937 "CIM_RemoteServiceAccessPoint.OtherInfoFormatDescription" }]
2938 uint16 InfoFormat;
2939@@ -56,5 +58,29 @@
2940 "CIM_RemoteServiceAccessPoint.InfoFormat" }]
2941 string OtherInfoFormatDescription;
2942
2943+ [Description (
2944+ "The AccessContext property identifies the role this "
2945+ "RemoteServiceAccessPoint is playing in the hosting "
2946+ "system." ),
2947+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
2948+ "10", "..", "32768..65535" },
2949+ Values { "Unknown", "Other", "Default Gateway", "DNS Server",
2950+ "SNMP Trap Destination", "MPLS Tunnel Destination",
2951+ "DHCP Server", "SMTP Server", "LDAP Server",
2952+ "Network Time Protocol (NTP) Server",
2953+ "Management Service", "DMTF Reserved", "Vendor Reserved" },
2954+ ModelCorrespondence {
2955+ "CIM_RemoteServiceAccessPoint.OtherAccessContext" }]
2956+ uint16 AccessContext = 0;
2957+
2958+ [Description (
2959+ "When the AccessContext property contains a value of 1, "
2960+ "\"Other\" then this is a free form string providing more "
2961+ "information about the role of RemoteServiceAccessPoint "
2962+ "in the hosting system." ),
2963+ ModelCorrespondence {
2964+ "CIM_RemoteServiceAccessPoint.AccessContext" }]
2965+ string OtherAccessContext;
2966+
2967
2968 };
2969
2970=== added file 'schema/Core/CIM_ResourceAllocationFromPool.mof'
2971--- schema/Core/CIM_ResourceAllocationFromPool.mof 1970-01-01 00:00:00 +0000
2972+++ schema/Core/CIM_ResourceAllocationFromPool.mof 2009-07-28 19:10:35 +0000
2973@@ -0,0 +1,21 @@
2974+// Copyright (c) 2009 DMTF. All rights reserved.
2975+ [Association, Version ( "2.22.0" ),
2976+ UMLPackagePath ( "CIM::System::Resource" ),
2977+ Description (
2978+ "ResourceAllocationFromPool associates an instance of "
2979+ "CIM_ResourceAllocationSettingData representing a resource "
2980+ "allocation with the CIM_ResourcePool from which it is "
2981+ "allocated." )]
2982+class CIM_ResourceAllocationFromPool : CIM_Dependency {
2983+
2984+ [Override ( "Antecedent" ),
2985+ Max ( 1 ),
2986+ Description ( "The resource pool." )]
2987+ CIM_ResourcePool REF Antecedent;
2988+
2989+ [Override ( "Dependent" ),
2990+ Description ( "The resource allocation." )]
2991+ CIM_ResourceAllocationSettingData REF Dependent;
2992+
2993+
2994+};
2995
2996=== added file 'schema/Core/CIM_ResourceAllocationSettingData.mof'
2997--- schema/Core/CIM_ResourceAllocationSettingData.mof 1970-01-01 00:00:00 +0000
2998+++ schema/Core/CIM_ResourceAllocationSettingData.mof 2009-07-28 19:10:35 +0000
2999@@ -0,0 +1,257 @@
3000+// Copyright (c) 2009 DMTF. All rights reserved.
3001+ [Version ( "2.22.0" ),
3002+ UMLPackagePath ( "CIM::Core::Resource" ),
3003+ Description (
3004+ "The ResourceAllocationSettingData class represents settings "
3005+ "specifically related to an allocated resource that are outside "
3006+ "the scope of the CIM class typically used to represent the "
3007+ "resource itself. These settings include information specific "
3008+ "to the allocation that may not be visible to the consumer of "
3009+ "the resource itself. For example, a virtual processor may look "
3010+ "like a 2 ghz processor to the consumer (virtual computer "
3011+ "system), however the virtualization system may use "
3012+ "time-slicing to schedule the the virtual processor to only "
3013+ "allow it to use 1 ghz." )]
3014+class CIM_ResourceAllocationSettingData : CIM_SettingData {
3015+
3016+ [Description (
3017+ "The type of resource this allocation setting represents." ),
3018+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
3019+ "11", "12", "13", "14", "15", "16", "17", "18", "19",
3020+ "20", "21", "22", "23", "24", "25", "26", "27", "28",
3021+ "29", "30", "31", "32", "33", "..", "0x8000..0xFFFF" },
3022+ Values { "Other", "Computer System", "Processor", "Memory",
3023+ "IDE Controller", "Parallel SCSI HBA", "FC HBA",
3024+ "iSCSI HBA", "IB HCA", "Ethernet Adapter",
3025+ "Other Network Adapter", "I/O Slot", "I/O Device",
3026+ "Floppy Drive", "CD Drive", "DVD drive", "Disk Drive",
3027+ "Tape Drive", "Storage Extent", "Other storage device",
3028+ "Serial port", "Parallel port", "USB Controller",
3029+ "Graphics controller", "IEEE 1394 Controller",
3030+ "Partitionable Unit", "Base Partitionable Unit", "Power",
3031+ "Cooling Capacity", "Ethernet Switch Port",
3032+ "Logical Disk", "Storage Volume", "Ethernet Connection",
3033+ "DMTF reserved", "Vendor Reserved" },
3034+ ModelCorrespondence {
3035+ "CIM_ResourceAllocationSettingData.OtherResourceType",
3036+ "CIM_ResourceAllocationSettingData.ResourceSubType" }]
3037+ uint16 ResourceType;
3038+
3039+ [Description (
3040+ "A string that describes the resource type when a well "
3041+ "defined value is not available and ResourceType has the "
3042+ "value \"Other\"." ),
3043+ ModelCorrespondence {
3044+ "CIM_ResourceAllocationSettingData.ResourceType" }]
3045+ string OtherResourceType;
3046+
3047+ [Description (
3048+ "A string describing an implementation specific sub-type "
3049+ "for this resource. For example, this may be used to "
3050+ "distinguish different models of the same resource type." ),
3051+ ModelCorrespondence {
3052+ "CIM_ResourceAllocationSettingData.ResourceType" }]
3053+ string ResourceSubType;
3054+
3055+ [Description (
3056+ "This property specifies which ResourcePool the resource "
3057+ "is currently allocated from, or which ResourcePool the "
3058+ "resource will be allocated from when the allocation "
3059+ "occurs." ),
3060+ ModelCorrespondence { "CIM_ResourcePool.PoolId" }]
3061+ string PoolID;
3062+
3063+ [Description (
3064+ "Describes the consumers visibility to the allocated resource.\n"
3065+ "A value of \"Passed-Through\" indicates the underlying "
3066+ "or host resource is utilized and passed through to the "
3067+ "consumer, possibly using partitioning. At least one item "
3068+ "shall be present in the HostResource property. \n"
3069+ "A value of \"Virtualized\" indicates the resource is "
3070+ "virtualized and may not map directly to an "
3071+ "underlying/host resource. Some implementations may "
3072+ "support specific assignment for virtualized resources, "
3073+ "in which case the host resource(s) are exposed using the "
3074+ "HostResource property. \n"
3075+ "A value of \"Not represented\" indicates a "
3076+ "representation of the resource does not exist within the "
3077+ "context of the resource consumer." ),
3078+ ValueMap { "0", "2", "3", "4", "..", "32767..65535" },
3079+ Values { "Unknown", "Passed-Through", "Virtualized",
3080+ "Not represented", "DMTF reserved", "Vendor Reserved" }]
3081+ uint16 ConsumerVisibility;
3082+
3083+ [Description (
3084+ "This property exposes specific assignment of resources. "
3085+ "Each non-null value of the HostResource property shall "
3086+ "be formated as a URI per RFC3986.\n"
3087+ "If this resource is modeled then a value should be a "
3088+ "WBEM URI (DSP0207). If the resource is not modeled then "
3089+ "see the appropriate profile. \n"
3090+ "Profiles may further constrain the type of URI. A NULL "
3091+ "value or empty array requests the implementation decide "
3092+ "the kind of host resource.\n"
3093+ "If the virtual resource is mapped to more than "
3094+ "oneunderlying resource, this property may be left NULL.\n"
3095+ "If NULL, the DeviceAllocatedFromPool or "
3096+ "ResourceAllocationFromPool associations may be used to "
3097+ "determine the pool of host resources this virtual "
3098+ "resource may use. If specific assignment is utilized, "
3099+ "all underlying resources used by this virtual resource "
3100+ "should be listed.The kind of dependency is specified by "
3101+ "the ConsumerVisibility and the MappingBehavior "
3102+ "properties. Typically the array contains one item, "
3103+ "however multiple host resources may be specified. \n"
3104+ "A client may set the value(s) to indicate that the "
3105+ "requested virtual resource allocation be based on host "
3106+ "resources that are identified by element values." ),
3107+ ModelCorrespondence {
3108+ "CIM_ResourceAllocationSettingData.ConsumerVisibility",
3109+ "CIM_ResourceAllocationSettingData.MappingBehavior" }]
3110+ string HostResource[];
3111+
3112+ [Description (
3113+ "This property specifies the units of allocation used by "
3114+ "the Reservation and Limit properties. For example, when "
3115+ "ResourceType=Processor, AllocationUnits may be set to "
3116+ "hertz*10^6 or percent. When ResourceType=Memory, "
3117+ "AllocationUnits may be set to bytes*10^3. \n"
3118+ "It is expected that profiles constrain the units that "
3119+ "apply in context of particular resource types.\n"
3120+ "The value of this property shall be a legal value of the "
3121+ "Programmatic Units qualifier as defined in Annex C.1 of "
3122+ "DSP0004 V2.5 or later." ),
3123+ ModelCorrespondence {
3124+ "CIM_ResourceAllocationSettingData.Reservation",
3125+ "CIM_ResourceAllocationSettingData.Limit" },
3126+ IsPUnit]
3127+ string AllocationUnits;
3128+
3129+ [Description (
3130+ "This property specifies the quantity of resources "
3131+ "presented to the consumer. For example, when "
3132+ "ResourceType=Processor, this property would reflect the "
3133+ "number of discrete Processors presented to the virtual "
3134+ "computer system. When ResourceType=Memory, this property "
3135+ "could reflect the number of MB reported to the virtual "
3136+ "computer system.\n"
3137+ "The value of the VirtualQuantity property should be "
3138+ "expressed in units as defined by the value of the "
3139+ "VirtualQuantityUnits property." ),
3140+ ModelCorrespondence {
3141+ "CIM_ResourceAllocationSettingData.VirtualQuantityUnits" }]
3142+ uint64 VirtualQuantity;
3143+
3144+ [Description (
3145+ "This property specifies the amount of resource "
3146+ "guaranteed to be available for this allocation. On "
3147+ "system which support over-commitment of resources, this "
3148+ "value is typically used for admission control to prevent "
3149+ "an an allocation from being accepted thus preventing starvation.\n"
3150+ "The value of the Reservation property is expressed in "
3151+ "the unit specified by the value of the AllocationUnits "
3152+ "property." ),
3153+ ModelCorrespondence {
3154+ "CIM_ResourceAllocationSettingData.AllocationUnits" }]
3155+ uint64 Reservation;
3156+
3157+ [Description (
3158+ "This property specifies the upper bound, or maximum "
3159+ "amount of resource that will be granted for this "
3160+ "allocation. For example, a system which supports memory "
3161+ "paging may support setting the Limit of a Memory "
3162+ "allocation below that of the VirtualQuantity, thus "
3163+ "forcing paging to occur for this allocation.\n"
3164+ "The value of the Limit property is expressed in the unit "
3165+ "specified by the value of the AllocationUnits property." ),
3166+ ModelCorrespondence {
3167+ "CIM_ResourceAllocationSettingData.AllocationUnits" }]
3168+ uint64 Limit;
3169+
3170+ [Description (
3171+ "This property specifies a relative priority for this "
3172+ "allocation in relation to other allocations from the "
3173+ "same ResourcePool. This property has no unit of measure, "
3174+ "and is only relevant when compared to other allocations "
3175+ "vying for the same host resources." )]
3176+ uint32 Weight;
3177+
3178+ [Description (
3179+ "This property specifies if the resource will be "
3180+ "automatically allocated. For example when set to true, "
3181+ "when the consuming virtual computer system is powered "
3182+ "on, this resource would be allocated. A value of false "
3183+ "indicates the resource must be explicitly allocated. For "
3184+ "example, the setting may represent removable media "
3185+ "(cdrom, floppy, etc.) where at power on time, the media "
3186+ "is not present. An explicit operation is required to "
3187+ "allocate the resource." )]
3188+ boolean AutomaticAllocation;
3189+
3190+ [Description (
3191+ "This property specifies if the resource will be "
3192+ "automatically de-allocated. For example, when set to "
3193+ "true, when the consuming virtual computer system is "
3194+ "powered off, this resource would be de-allocated. When "
3195+ "set to false, the resource will remain allocated and "
3196+ "must be explicitly de-allocated." )]
3197+ boolean AutomaticDeallocation;
3198+
3199+ [Description (
3200+ "The Parent of the resource. For example, a controller "
3201+ "for the current allocation" )]
3202+ string Parent;
3203+
3204+ [Description (
3205+ "The thing to which this resource is connected. For "
3206+ "example, a named network or switch port." )]
3207+ string Connection[];
3208+
3209+ [Description (
3210+ "The address of the resource. For example, the MAC "
3211+ "address of a Ethernet port." )]
3212+ string Address;
3213+
3214+ [Description (
3215+ "Specifies how this resource maps to underlying "
3216+ "resourcesIf the HostResource array contains any entries, "
3217+ "this property reflects how the resource maps to those "
3218+ "specific resources." ),
3219+ ValueMap { "0", "2", "3", "4", "5", "..", "32767..65535" },
3220+ Values { "Unknown", "Not Supported", "Dedicated",
3221+ "Soft Affinity", "Hard Affinity", "DMTF Reserved",
3222+ "Vendor Reserved" }]
3223+ uint16 MappingBehavior;
3224+
3225+ [Description (
3226+ "Describes the address of this resource in the context of "
3227+ "the Parent. The Parent/AddressOnParent properties are "
3228+ "used to describe the controller relationship as well the "
3229+ "ordering of devices on a controller.For example, if the "
3230+ "parent is a PCI Controller, this property would specify "
3231+ "the PCI slot of this child device." )]
3232+ string AddressOnParent;
3233+
3234+ [Description (
3235+ "This property specifies the units used by the "
3236+ "VirtualQuantity property. For example\n"
3237+ "- if ResourceType=Processor, the value of the "
3238+ "VirtualQuantityUnits property may be set to \"count\", "
3239+ "indicating that the value of the VirtualQuantity "
3240+ "property is expressed as a count.\n"
3241+ "- if ResourceType=Memory, the value of the "
3242+ "VirtualQuantityUnits property may be set to "
3243+ "\"bytes*10^3\", indicating that the value of the "
3244+ "VirtualQuantity property is expressed in kilobyte.\n"
3245+ "It is expected that profiles constrain the units that "
3246+ "apply in context of particular resource types.\n"
3247+ "The value of this property shall be a legal value of the "
3248+ "Programmatic Units qualifier as defined in Annex C.1 of "
3249+ "DSP0004 V2.5 or later." ),
3250+ ModelCorrespondence {
3251+ "CIM_ResourceAllocationSettingData.VirtualQuantity" },
3252+ IsPUnit]
3253+ string VirtualQuantityUnits = "count";
3254+
3255+
3256+};
3257
3258=== added file 'schema/Core/CIM_ResourcePool.mof'
3259--- schema/Core/CIM_ResourcePool.mof 1970-01-01 00:00:00 +0000
3260+++ schema/Core/CIM_ResourcePool.mof 2009-07-28 19:10:35 +0000
3261@@ -0,0 +1,176 @@
3262+// Copyright (c) 2009 DMTF. All rights reserved.
3263+ [Version ( "2.22.0" ),
3264+ UMLPackagePath ( "CIM::Core::Resource" ),
3265+ Description (
3266+ "A ResourcePool is a logical entity (with associated "
3267+ "controls)provided by the host system for the purpose of "
3268+ "allocation and assignment of resources. A given ResourcePool "
3269+ "may be used to allocate resources of a specific type. "
3270+ "Hierarchies of ResourcePools may be created to provide "
3271+ "administrative control over allocations. In the cases where "
3272+ "resources are subdivided, multiple resource pools may exist "
3273+ "(e.g. nodal boundaries in NUMA-like systems). In systems that "
3274+ "support over commitment, pools represent the reservable "
3275+ "capacity, not an upper bound or limit on the maximum amount "
3276+ "that can be allocated. Admission control during power on may "
3277+ "detect and prevent systems from powering due to resource "
3278+ "exhaustion. For example, over commitment on a ResourcePool "
3279+ "with ResourceType=Memory would require that sufficient space "
3280+ "be available in some backing-store, that may be managed "
3281+ "through a storage ResourcePool." )]
3282+class CIM_ResourcePool : CIM_LogicalElement {
3283+
3284+ [Key, Override ( "InstanceID" ),
3285+ Description (
3286+ "Within the scope of the instantiating Namespace, "
3287+ "InstanceID opaquely and uniquely identifies an instance "
3288+ "of this class. To ensure uniqueness within the "
3289+ "NameSpace, the value of InstanceID should be constructed "
3290+ "using the following \"preferred\" algorithm: \n"
3291+ "<OrgID>:<LocalID> \n"
3292+ "Where <OrgID> and <LocalID> are separated by a colon "
3293+ "(:), and where <OrgID> must include a copyrighted, "
3294+ "trademarked, or otherwise unique name that is owned by "
3295+ "the business entity that is creating or defining the "
3296+ "InstanceID or that is a registered ID assigned to the "
3297+ "business entity by a recognized global authority. (This "
3298+ "requirement is similar to the <Schema Name>_<Class Name> "
3299+ "structure of Schema class names.) In addition, to ensure "
3300+ "uniqueness, <OrgID> must not contain a colon (:). When "
3301+ "using this algorithm, the first colon to appear in "
3302+ "InstanceID must appear between <OrgID> and <LocalID>. \n"
3303+ "<LocalID> is chosen by the business entity and should "
3304+ "not be reused to identify different underlying "
3305+ "(real-world) elements. If the above \"preferred\" "
3306+ "algorithm is not used, the defining entity must ensure "
3307+ "that the resulting InstanceID is not reused across any "
3308+ "InstanceIDs produced by this or other providers for the "
3309+ "NameSpace of this instance. \n"
3310+ "For DMTF-defined instances, the \"preferred\" algorithm "
3311+ "must be used with the <OrgID> set to CIM." )]
3312+ string InstanceID;
3313+
3314+ [Description (
3315+ "An opaque identifier for the pool. This property is used "
3316+ "to provide correlation across save and restore of "
3317+ "configuration data to underlying persistent storage." ),
3318+ ModelCorrespondence {
3319+ "CIM_ResourceAllocationSettingData.PoolId" }]
3320+ string PoolID;
3321+
3322+ [Description (
3323+ "If true, \"Primordial\" indicates that this ResourcePool "
3324+ "is a base from which resources are drawn and returned in "
3325+ "the activity of resource management. Being primordial "
3326+ "means that this ResourcePool shall not be created or "
3327+ "deleted by consumers of this model. However, other "
3328+ "actions, modeled or not, may affect the characteristics "
3329+ "or size of primordial ResourcePools. If false, "
3330+ "\"Primordial\" indicates that the ResourcePool, a "
3331+ "concrete Resource Pool, is subject to resource "
3332+ "allocation services functions. This distinction is "
3333+ "important because higher-level ResourcePools may be "
3334+ "assembled using the Component or "
3335+ "ElementAllocatedFromPool associations. Although the "
3336+ "higher-level abstractions can be created and deleted, "
3337+ "the most basic, (i.e. primordial), hardware-based "
3338+ "ResourcePools cannot. They are physically realized as "
3339+ "part of the System, or are actually managed by some "
3340+ "other System and imported as if they were physically "
3341+ "realized." )]
3342+ boolean Primordial = false;
3343+
3344+ [Description (
3345+ "This property represents the maximum amount (in units of "
3346+ "AllocationUnits) of reservations that the ResourcePool "
3347+ "can support." )]
3348+ uint64 Capacity;
3349+
3350+ [Description (
3351+ "This property represents the current reservations (in "
3352+ "units of AllocationUnits) spread across all active "
3353+ "allocations from this pool. In a hierarchical "
3354+ "configuration, this represents the sum of all descendant "
3355+ "ResourcePool current reservations." )]
3356+ uint64 Reserved;
3357+
3358+ [Description (
3359+ "The type of resource this ResourcePool may allocate." ),
3360+ ValueMap { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
3361+ "11", "12", "13", "14", "15", "16", "17", "18", "19",
3362+ "20", "21", "22", "23", "24", "25", "26", "27", "28",
3363+ "29", "30", "31", "32", "33", "..", "0x8000..0xFFFF" },
3364+ Values { "Other", "Computer System", "Processor", "Memory",
3365+ "IDE Controller", "Parallel SCSI HBA", "FC HBA",
3366+ "iSCSI HBA", "IB HCA", "Ethernet Adapter",
3367+ "Other Network Adapter", "I/O Slot", "I/O Device",
3368+ "Floppy Drive", "CD Drive", "DVD drive", "Disk Drive",
3369+ "Tape Drive", "Storage Extent", "Other storage device",
3370+ "Serial port", "Parallel port", "USB Controller",
3371+ "Graphics controller", "IEEE 1394 Controller",
3372+ "Partitionable Unit", "Base Partitionable Unit", "Power",
3373+ "Cooling Capacity", "Ethernet Switch Port",
3374+ "Logical Disk", "Storage Volume", "Ethernet Connection",
3375+ "DMTF reserved", "Vendor Reserved" },
3376+ ModelCorrespondence { "CIM_ResourcePool.OtherResourceType",
3377+ "CIM_ResourcePool.ResourceSubType" }]
3378+ uint16 ResourceType;
3379+
3380+ [Description (
3381+ "A string that describes the resource type when a well "
3382+ "defined value is not available and ResourceType is set "
3383+ "to 0 for Other." ),
3384+ ModelCorrespondence { "CIM_ResourcePool.ResourceType" }]
3385+ string OtherResourceType;
3386+
3387+ [Description (
3388+ "A string describing an implementation specific sub-type "
3389+ "for this pool. For example, this may be used to "
3390+ "distinguish different models of the same resource type." ),
3391+ ModelCorrespondence { "CIM_ResourcePool.ResourceType" }]
3392+ string ResourceSubType;
3393+
3394+ [Description (
3395+ "This property specifies the units of allocation used by "
3396+ "the Reservation and Limit properties. For example, when "
3397+ "ResourceType=Processor, AllocationUnits may be set to "
3398+ "hertz*10^6 or percent. When ResourceType=Memory, "
3399+ "AllocationUnits may be set to bytes*10^3. The value of "
3400+ "this property shall be a legal value of the Programmatic "
3401+ "Units qualifier as defined in Appendix C.1 of DSP0004 "
3402+ "V2.4 or later." ),
3403+ IsPUnit]
3404+ string AllocationUnits;
3405+
3406+ [Description (
3407+ "This property specifies the units for the MaxConsumable "
3408+ "and the Consumed properties." ),
3409+ ModelCorrespondence {
3410+ "CIM_ResourcePool.MaxConsumableResource",
3411+ "CIM_ResourcePool.CurrentlyConsumedResource" },
3412+ IsPUnit]
3413+ string ConsumedResourceUnits = "count";
3414+
3415+ [Description (
3416+ "This property specifies the amount of resource that the "
3417+ "resource pool currently presents to consumers.\n"
3418+ "This property is different from the Reserved property in "
3419+ "that it describes the consumers view of the resource "
3420+ "while the Reserved property describes the producers view "
3421+ "of the resource." ),
3422+ ModelCorrespondence { "CIM_ResourcePool.ConsumedResourceUnits" }]
3423+ uint64 CurrentlyConsumedResource;
3424+
3425+ [Description (
3426+ "This property specifies the maximum of amount of "
3427+ "consumable resource that the resource pool can present "
3428+ "to consumers.\n"
3429+ "This property is different from the Capacity property in "
3430+ "that it describes the consumers view of the resource "
3431+ "while the Capacity property describes the producers view "
3432+ "of the resource." ),
3433+ ModelCorrespondence { "CIM_ResourcePool.ConsumedResourceUnits" }]
3434+ uint64 MaxConsumableResource;
3435+
3436+
3437+};
3438
3439=== added file 'schema/Core/CIM_ResourcePoolConfigurationCapabilities.mof'
3440--- schema/Core/CIM_ResourcePoolConfigurationCapabilities.mof 1970-01-01 00:00:00 +0000
3441+++ schema/Core/CIM_ResourcePoolConfigurationCapabilities.mof 2009-07-28 19:10:35 +0000
3442@@ -0,0 +1,42 @@
3443+// Copyright (c) 2009 DMTF. All rights reserved.
3444+ [Version ( "2.22.0" ),
3445+ UMLPackagePath ( "CIM::Core::Resource" ),
3446+ Description (
3447+ "This class exposes the supported capabilities of a "
3448+ "ResourcePoolConfigurationService. Not all implementations will "
3449+ "support all methods on the service. Clients may use instances "
3450+ "of this class to determine which methods are supported. The "
3451+ "same method must not be listed in both lists. Implementations "
3452+ "must either be non-blocking and use a Job for long running "
3453+ "operations, or always block until the operation completes." )]
3454+class CIM_ResourcePoolConfigurationCapabilities : CIM_Capabilities {
3455+
3456+ [Description (
3457+ "This property reflects the methods of the associated "
3458+ "service class that are supported that may return a Job." ),
3459+ ValueMap { "2", "3", "4", "5", "6", "7", "..", "32768..65535" },
3460+ Values { "CreateResourcePool is supported",
3461+ "CreateChild ResourcePool is supported",
3462+ "DeleteResourcePool is supported",
3463+ "AddResourcesToResourcePool is supported",
3464+ "RemoveResourcesFromResourcePool is supported",
3465+ "ChangeParentResourcePool is supported", "DMTF Reserved",
3466+ "Vendor Reserved" }]
3467+ uint32 AsynchronousMethodsSupported[];
3468+
3469+ [Description (
3470+ "This property reflects the methods of the associated "
3471+ "service class that are supported andblock until "
3472+ "completed (no Job is returned.)" ),
3473+ ValueMap { "2", "3", "4", "5", "6", "7", "..", "32768..65535" },
3474+ Values { "CreateResourcePool is supported",
3475+ "CreateChild ResourcePool is supported",
3476+ "DeleteResourcePool is supported",
3477+ "AddResourcesToResourcePool is supported",
3478+ "RemoveResourcesFromResourcePool is supported",
3479+ "CIM_ChangeParentResourcePool is supported",
3480+ "DMTF Reserved", "Vendor Reserved" }]
3481+ uint32 SynchronousMethodsSupported[];
3482+
3483+
3484+};
3485
3486=== added file 'schema/Core/CIM_ResourcePoolConfigurationService.mof'
3487--- schema/Core/CIM_ResourcePoolConfigurationService.mof 1970-01-01 00:00:00 +0000
3488+++ schema/Core/CIM_ResourcePoolConfigurationService.mof 2009-07-28 19:10:35 +0000
3489@@ -0,0 +1,220 @@
3490+// Copyright (c) 2009 DMTF. All rights reserved.
3491+ [Version ( "2.1522.0" ),
3492+ UMLPackagePath ( "CIM::Core::Resource" ),
3493+ Description (
3494+ "This service provides for active management of Resource Pools. "
3495+ "It allows jobs to be started for the creation and deletion of "
3496+ "ResourcePools as well as addition and subtraction of host "
3497+ "resources from ResourcePools" )]
3498+class CIM_ResourcePoolConfigurationService : CIM_Service {
3499+
3500+
3501+ [Description (
3502+ "Starts a job to create a root ResourcePool. The "
3503+ "ResourcePool will be scoped to the same System as this "
3504+ "Service. If 0 is returned, then the task completed "
3505+ "successfully and the use of ConcreteJob was not "
3506+ "required. If the task will take some time to complete, a "
3507+ "ConcreteJob will be created and its reference returned "
3508+ "in the output parameter Job. The resulting pool will be "
3509+ "a root pool with no parent pool." ),
3510+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "..",
3511+ "4096", "4097", "4098..32767", "32768..65535" },
3512+ Values { "Job Completed with No Error", "Not Supported",
3513+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3514+ "In Use", "Incorrect ResourceType for the Pool",
3515+ "DMTF Reserved",
3516+ "Method Parameters Checked - Job Started",
3517+ "Size Not Supported", "Method Reserved", "Vendor Specific" }]
3518+ uint32 CreateResourcePool(
3519+ [IN, Description (
3520+ "A end user relevant name for the pool being "
3521+ "created. If NULL, then a system supplied default "
3522+ "name can be used. The value will be stored in the "
3523+ "\'ElementName\' property for the created pool." )]
3524+ string ElementName,
3525+ [IN, Description (
3526+ "Array of zero or more devices that are used to "
3527+ "create the Pool or modify the source extents. All "
3528+ "elements in the array must be of the same type." )]
3529+ CIM_LogicalDevice REF HostResources[],
3530+ [IN, Description (
3531+ "The type of resources the created poolwill manage. "
3532+ "If HostResources contains elements, this property "
3533+ "must mach their type." )]
3534+ string ResourceType,
3535+ [IN ( false ), OUT, Description (
3536+ "On success, a reference to the resulting "
3537+ "ResourcePool is returned. When a Job is returned, "
3538+ "this may be NULL, in which case, the client must "
3539+ "use the Job to find the resulting ResourcePool "
3540+ "once the Job completes." )]
3541+ CIM_ResourcePool REF Pool,
3542+ [IN ( false ), OUT, Description (
3543+ "Reference to the job (may be null if job completed)."
3544+ )]
3545+ CIM_ConcreteJob REF Job);
3546+
3547+ [Description (
3548+ "Start a job to create a sub-pool from a parent pool "
3549+ "using the specified allocation settings If 0 is "
3550+ "returned, the function completed successfully and no "
3551+ "ConcreteJob instance was required. If 4096/0x1000 is "
3552+ "returned, a ConcreteJob will be started to create the "
3553+ "sub-pool. The Job\'s reference will be returned in the "
3554+ "output parameter Job." ),
3555+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "..",
3556+ "4096", "4097", "4098..32767", "32768..65535" },
3557+ Values { "Job Completed with No Error", "Not Supported",
3558+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3559+ "In Use", "Incorrect ResourceType for the Pool",
3560+ "Insufficient Resources", "DMTF Reserved",
3561+ "Method Parameters Checked - Job Started",
3562+ "Size Not Supported", "Method Reserved", "Vendor Specific" }]
3563+ uint32 CreateChildResourcePool(
3564+ [IN, Description (
3565+ "A end user relevant name for the pool being "
3566+ "created. If NULL, then a system supplied default "
3567+ "name can be used. The value will be stored in the "
3568+ "\'ElementName\' property for the created element." )]
3569+ string ElementName,
3570+ [IN, Description (
3571+ "String containing a representation of a "
3572+ "CIM_SettingData instance that is used to specify "
3573+ "the settings for the child Pool." ),
3574+ EmbeddedInstance ( "CIM_ResourceAllocationSettingData" ),
3575+ ModelCorrespondence {
3576+ "CIM_ResourcePoolConfigurationService.CreateChildResourcePool.ParentPool" }]
3577+ string Settings[],
3578+ [IN, Description (
3579+ "The Pool(s) from which to create the new Pool." ),
3580+ ModelCorrespondence {
3581+ "CIM_ResourcePoolConfigurationService.CreateChildResourcePool.Settings" }]
3582+ CIM_ResourcePool REF ParentPool[],
3583+ [IN ( false ), OUT, Description (
3584+ "A reference to the resulting pool." )]
3585+ CIM_ResourcePool REF Pool,
3586+ [IN ( false ), OUT, Description (
3587+ "Reference to the job (may be null if job completed)."
3588+ )]
3589+ CIM_ConcreteJob REF Job);
3590+
3591+ [Description (
3592+ "Start a job to delete a ResourcePool. No allocations may "
3593+ "be outstanding or the delete will fail with \"In Use.\" "
3594+ "If the resource pool is a root resource pool, any host "
3595+ "resources are returned back to the underlying system. If "
3596+ "0 is returned, the function completed successfully, and "
3597+ "no ConcreteJob was required. If 4096/0x1000 is returned, "
3598+ "a ConcreteJob will be started to delete the "
3599+ "ResourcePool. A reference to the Job is returned in the "
3600+ "Job parameter." ),
3601+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "..",
3602+ "4096", "4097..32767", "32768..65535" },
3603+ Values { "Job Completed with No Error", "Not Supported",
3604+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3605+ "In Use", "Incorrect ResourceType for the Pool",
3606+ "DMTF Reserved",
3607+ "Method Parameters Checked - Job Started",
3608+ "Method Reserved", "Vendor Specific" }]
3609+ uint32 DeleteResourcePool(
3610+ [IN, Description ( "Reference to the pool to delete." )]
3611+ CIM_ResourcePool REF Pool,
3612+ [IN ( false ), OUT, Description (
3613+ "Reference to the job (may be null if job completed)."
3614+ )]
3615+ CIM_ConcreteJob REF Job);
3616+
3617+ [Description (
3618+ "Starts a job to add resources to a ResourcePool. If 0 is "
3619+ "returned, then the task completed successfully and the "
3620+ "use of ConcreteJob was not required. If the task will "
3621+ "take some time to complete, a ConcreteJob will be "
3622+ "created and its reference returned in the output "
3623+ "parameter Job. The resulting pool will be a root pool "
3624+ "with no parent pool." ),
3625+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "..",
3626+ "4096", "4097", "4098..32767", "32768..65535" },
3627+ Values { "Job Completed with No Error", "Not Supported",
3628+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3629+ "In Use", "Incorrect ResourceType for the Pool",
3630+ "DMTF Reserved",
3631+ "Method Parameters Checked - Job Started",
3632+ "Size Not Supported", "Method Reserved", "Vendor Specific" }]
3633+ uint32 AddResourcesToResourcePool(
3634+ [IN, Description (
3635+ "Array of CIM_LogicalDevice instances to add to the Pool."
3636+ )]
3637+ CIM_LogicalDevice REF HostResources[],
3638+ [IN, Description ( "The pool to add the resources to." )]
3639+ CIM_ResourcePool REF Pool,
3640+ [IN ( false ), OUT, Description (
3641+ "Reference to the job (may be null if job completed)."
3642+ )]
3643+ CIM_ConcreteJob REF Job);
3644+
3645+ [Description (
3646+ "Starts a job to remove resources from a ResourcePool. If "
3647+ "0 is returned, then the task completed successfully and "
3648+ "the use of ConcreteJob was not required. If the task "
3649+ "will take some time to complete, a ConcreteJob will be "
3650+ "created and its reference returned in the output "
3651+ "parameter Job. The resulting pool will be a root pool "
3652+ "with no parent pool." ),
3653+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "..",
3654+ "4096", "4097", "4098..32767", "32768..65535" },
3655+ Values { "Job Completed with No Error", "Not Supported",
3656+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3657+ "In Use", "Incorrect ResourceType for the Pool",
3658+ "DMTF Reserved",
3659+ "Method Parameters Checked - Job Started",
3660+ "Size Not Supported", "Method Reserved", "Vendor Specific" }]
3661+ uint32 RemoveResourcesFromResourcePool(
3662+ [IN, Description (
3663+ "Array of CIM_LogicalDevice instances to remove from the Pool."
3664+ )]
3665+ CIM_LogicalDevice REF HostResources[],
3666+ [IN, Description (
3667+ "The pool to remove the resources from." )]
3668+ CIM_ResourcePool REF Pool,
3669+ [IN ( false ), OUT, Description (
3670+ "Reference to the job (may be null if job completed)."
3671+ )]
3672+ CIM_ConcreteJob REF Job);
3673+
3674+ [Description (
3675+ "Start a job to change a parent pool using the specified "
3676+ "allocation settings If 0 is returned, the function "
3677+ "completed successfully and no ConcreteJob instance was "
3678+ "required. If 4096/0x1000 is returned, a ConcreteJob will "
3679+ "be started to change the parent pool. The Job\'s "
3680+ "reference will be returned in the output parameter Job." ),
3681+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "..",
3682+ "4096", "4097", "4098..32767", "32768..65535" },
3683+ Values { "Job Completed with No Error", "Not Supported",
3684+ "Unknown", "Timeout", "Failed", "Invalid Parameter",
3685+ "In Use", "Incorrect ResourceType for the Pool",
3686+ "Insufficient Resources", "DMTF Reserved",
3687+ "Method Parameters Checked - Job Started",
3688+ "Size Not Supported", "Method Reserved", "Vendor Specific" }]
3689+ uint32 ChangeParentResourcePool(
3690+ [IN, Description ( "Reference to the child pool." )]
3691+ CIM_ResourcePool REF ChildPool,
3692+ [IN, Description ( "Reference to the parent pool(s)." )]
3693+ CIM_ResourcePool REF ParentPool[],
3694+ [IN, Description (
3695+ "Optional string containing a representation of a "
3696+ "CIM_SettingData instance that is used to specify "
3697+ "the settings for the Parent Pool." ),
3698+ EmbeddedInstance ( "CIM_ResourceAllocationSettingData" ),
3699+ ModelCorrespondence {
3700+ "CIM_ResourcePoolConfigurationService.ChangeParentResourcePool.Settings" }]
3701+ string Settings[],
3702+ [IN ( false ), OUT, Description (
3703+ "Reference to the job (may be null if job completed)."
3704+ ),
3705+ ModelCorrespondence {
3706+ "CIM_ResourcePoolConfigurationService.ChangeParentResourcePool.ParentPool" }]
3707+ CIM_ConcreteJob REF Job);
3708+
3709+};
3710
3711=== added file 'schema/Core/CIM_ServiceAffectsElementWithQuota.mof'
3712--- schema/Core/CIM_ServiceAffectsElementWithQuota.mof 1970-01-01 00:00:00 +0000
3713+++ schema/Core/CIM_ServiceAffectsElementWithQuota.mof 2009-07-28 19:10:35 +0000
3714@@ -0,0 +1,32 @@
3715+// Copyright (c) 2009 DMTF. All rights reserved.
3716+ [Association, Version ( "2.22.0" ),
3717+ UMLPackagePath ( "CIM::Core::Service" ),
3718+ Description (
3719+ "ServiceAffectsElementWithQuota represents an extension of "
3720+ "ServiceAffectsElement to include a quota imposed on the "
3721+ "AffectedElement by the Service. The quota governs the amount "
3722+ "of a resource controlled by the Service that can be allocated "
3723+ "by the AffectedElement in one or more allocations." )]
3724+class CIM_ServiceAffectsElementWithQuota : CIM_ServiceAffectsElement {
3725+
3726+ [Description (
3727+ "Quota is the maximum number of resource units that may "
3728+ "be allocated to the AffectedElement." )]
3729+ uint64 Quota;
3730+
3731+ [Description (
3732+ "Quota is the number of resource units currently "
3733+ "allocated to the AffectedElement." )]
3734+ uint64 QuotaUsed;
3735+
3736+ [Description (
3737+ "QuotaUnits specifies the type of unit used in the Quota "
3738+ "and QuotaUsed properties. The value shall be formatted "
3739+ "according to DSP0004 Appendix C1, where the base-unit is "
3740+ "\"byte\"), and there are no occurrences of "
3741+ "multiplied-base-unit and divided-base-unit." ),
3742+ IsPUnit]
3743+ string QuotaUnits = "byte";
3744+
3745+
3746+};
3747
3748=== modified file 'schema/Core/CIM_SettingAssociatedToCapabilities.mof'
3749--- schema/Core/CIM_SettingAssociatedToCapabilities.mof 2008-08-27 11:09:14 +0000
3750+++ schema/Core/CIM_SettingAssociatedToCapabilities.mof 2009-07-28 19:10:03 +0000
3751@@ -1,13 +1,4 @@
3752 // Copyright (c) 2005 DMTF. All rights reserved.
3753-// <change cr="CIMCoreCR00695.006" type ="new"> Addition of
3754-// class.</change>
3755-// <change cr="SysDevCR00822" type ="change">Remove Experimental
3756-// qualifier from class.</change>
3757-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
3758-// qualifier values to CIM Schema.</change>
3759-// ===================================================================
3760-// CIM_SettingAssociatedToCapabilities
3761-// ===================================================================
3762 [Association, Version ( "2.11.0" ),
3763 UMLPackagePath ( "CIM::System::FilesystemServices" ),
3764 Description (
3765
3766=== modified file 'schema/Core/CIM_SettingData.mof'
3767--- schema/Core/CIM_SettingData.mof 2008-08-27 11:09:14 +0000
3768+++ schema/Core/CIM_SettingData.mof 2009-07-28 19:10:03 +0000
3769@@ -1,16 +1,5 @@
3770-// Copyright (c) 2007 DMTF. All rights reserved.
3771-// <change cr="SysDevCR00728.000" type ="change">Update of
3772-// descriptions based on Tech Edit review.</
3773-// <change cr="DMTFCR01378.002" type ="change">Update of description to
3774-// support deprecation of CIM_Profile and
3775-// CIM_Configuration.</change>
3776-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
3777-// qualifier values to CIM Schema.</change>
3778-// <change cr="CIMCoreCR00937" type="add">Updated description.</change>
3779-// ==================================================================
3780-// CIM_SettingData
3781-// ==================================================================
3782- [Abstract, Version ( "2.16.0" ),
3783+// Copyright (c) 2008 DMTF. All rights reserved.
3784+ [Abstract, Version ( "2.19.0" ),
3785 UMLPackagePath ( "CIM::Core::Settings" ),
3786 Description (
3787 "CIM_SettingData is used to represent configuration and and "
3788@@ -49,7 +38,8 @@
3789 "SettingData objects using ConcreteComponent associations." )]
3790 class CIM_SettingData : CIM_ManagedElement {
3791
3792- [Key, Description (
3793+ [Key, Override ( "InstanceID" ),
3794+ Description (
3795 "Within the scope of the instantiating Namespace, "
3796 "InstanceID opaquely and uniquely identifies an instance "
3797 "of this class. To ensure uniqueness within the "
3798
3799=== added file 'schema/Core/CIM_SettingsDefineCapabilities.mof'
3800--- schema/Core/CIM_SettingsDefineCapabilities.mof 1970-01-01 00:00:00 +0000
3801+++ schema/Core/CIM_SettingsDefineCapabilities.mof 2009-07-28 19:10:35 +0000
3802@@ -0,0 +1,142 @@
3803+// Copyright (c) 2009 DMTF. All rights reserved.
3804+ [Association, Version ( "2.22.0" ),
3805+ UMLPackagePath ( "CIM::Core::Settings" ),
3806+ Description (
3807+ "This association indicates that the non-null, non-key set of "
3808+ "properties of the component SettingData instance specifies "
3809+ "some capabilities of the associated Capabilities instance. The "
3810+ "interpretation of the set of properties in the associated "
3811+ "SettingData is governed by the properties: PropertyPolicy and ValueRole.\n"
3812+ "For a particular Capabilities instance, the complete set of "
3813+ "Component SettingData instances, together with properties of "
3814+ "the Capabilities instance itself, defines the overall range of "
3815+ "supported capabilities.\n"
3816+ "PropertyPolicy determines whether the properties of the set "
3817+ "are interpreted independently or as a whole (i.e. correlated.)\n"
3818+ "ValueRole further qualifies the members of the set.\n"
3819+ "This association eliminates the need to define and maintain "
3820+ "corresponding property definitions and values in both a "
3821+ "Capabilities subclass and a SettingData subclass.\n"
3822+ "Typically these setting instances will be published along with "
3823+ "the associated Capabilities instance and will not be "
3824+ "modifiable by the client." )]
3825+class CIM_SettingsDefineCapabilities : CIM_Component {
3826+
3827+ [Aggregate, Override ( "GroupComponent" ),
3828+ Max ( 1 ),
3829+ Description ( "The Capabilities instance." )]
3830+ CIM_Capabilities REF GroupComponent;
3831+
3832+ [Override ( "PartComponent" ),
3833+ Description (
3834+ "A Setting used to define the associated Capabilities instance."
3835+ )]
3836+ CIM_SettingData REF PartComponent;
3837+
3838+ [Required, Description (
3839+ "PropertyPolicy defines whether or not the non-null, "
3840+ "non-key properties of the associated SettingData "
3841+ "instance are treated independently or as a correlated "
3842+ "set. For instance, an independent set of maximum "
3843+ "properties might be defined, when there is no "
3844+ "relationship between each property. On the other hand, "
3845+ "several correlated sets of maximum properties might need "
3846+ "to be defined when the maximum values of each are "
3847+ "dependent on some of the others." ),
3848+ ValueMap { "0", "1", ".." },
3849+ Values { "Independent", "Correlated", "DMTF Reserved" },
3850+ ModelCorrespondence {
3851+ "CIM_SettingsDefineCapabilities.ValueRole",
3852+ "CIM_SettingsDefineCapabilities.ValueRange" }]
3853+ uint16 PropertyPolicy = 0;
3854+
3855+ [Description (
3856+ "The ValueRole property indicates further semantics on "
3857+ "the interpretation of the non-null, non-key properties "
3858+ "of the Component SettingData.\n"
3859+ "\"Default\" indicates that property values of the "
3860+ "component SettingData instance will be used as default "
3861+ "values, when a new SettingData instance is created for "
3862+ "elements whose capabilities are defined by the "
3863+ "associated Capabilities instance.\n"
3864+ "Across instances of settingdata, for particular "
3865+ "properties having the same semantic purpose, at most one "
3866+ "such settingdata instance shall be specified as a default.\n"
3867+ "\"Optimal\" indicates that the SettingData instance "
3868+ "represents optimal setting values for elements "
3869+ "associated with the associated capabilities instance. "
3870+ "Multiple component SettingData instances may be declared "
3871+ "as optimal.\"Mean\" indicates that the non-null, "
3872+ "non-key, non-enumerated, non-boolean, numeric properties "
3873+ "of the associated SettingData instance represents an "
3874+ "average point along some dimension. For different "
3875+ "combinations of SettingData properties, multiple "
3876+ "component SettingData instances may be declared as "
3877+ "\"Mean\". \"Supported\" indicates that the non-null, "
3878+ "non-key properties of the Component SettingData instance "
3879+ "represents a set of supported property values that are "
3880+ "not otherwise qualified." ),
3881+ ValueMap { "0", "1", "2", "3", ".." },
3882+ Values { "Default", "Optimal", "Mean", "Supported",
3883+ "DMTF Reserved" },
3884+ ModelCorrespondence {
3885+ "CIM_SettingsDefineCapabilities.PropertyPolicy",
3886+ "CIM_SettingsDefineCapabilities.ValueRange" }]
3887+ uint16 ValueRole = 3;
3888+
3889+ [Description (
3890+ "The ValueRange property indicates further semantics on "
3891+ "the interpretation of all non-null, non-key properties "
3892+ "of the Component SettingData.\n"
3893+ "\"Point\" indicates that this SettingData instance "
3894+ "provides a single set of values.\n"
3895+ "\"Minimums\", \"Maximums\", and \"Increments\", are only "
3896+ "evaluated against non-null, non-key, non-enumerated, "
3897+ "non-boolean, numeric properties of the SettingData "
3898+ "instance. Each property of that set shall be "
3899+ "mathematically comparable to other instances of that property.\n"
3900+ "\"Minimums\" indicates that this SettingData instance "
3901+ "provides minimum values for evaluated properties. When "
3902+ "used with PropertyPolicy = \"Independent\", only one "
3903+ "such setting per particular SettingData instance shall "
3904+ "be specified for any Capabilities. Unless restricted by "
3905+ "a Maximums on the same set of properties, all values "
3906+ "that compare higher than the specified values are also "
3907+ "considered to be supported by the associated "
3908+ "capabilities instance. \n"
3909+ "\"Maximums\" indicates that this SettingData instance "
3910+ "provides maximum values for evaluated properties. When "
3911+ "used with PropertyPolicy = \"Independent\", only one "
3912+ "such setting per particular SettingData instance shall "
3913+ "be specified for any Capabilities. Unless restricted by "
3914+ "a Minimums on the same set of properties, all values "
3915+ "that compare lower than the specified values are also "
3916+ "considered to be supported by the associated "
3917+ "capabilities instance.\n"
3918+ "\"Increments\" indicates that this SettingData instance "
3919+ "provides increment values for evaluated properties. For "
3920+ "the associated Capabilities, if an evaluated property "
3921+ "currently has no corresponding minimums or maximums, "
3922+ "then the property has no affect. Otherwise, for each "
3923+ "evaluated property: its value x shall be between the "
3924+ "minimum and maximum, inclusively, and shall have the "
3925+ "property that both the result of maximum minus x and the "
3926+ "result of x minus minimum are each an integer multiple "
3927+ "of the increment. If either minimum or maximum is not "
3928+ "specified and the other is, then the missing value shall "
3929+ "be respectively assumed to be the lowest or highest "
3930+ "supported value for the property\'s data-type. "
3931+ "Additionally, if both a minimum and a maximum are "
3932+ "specified for an evaluated property, then the result of "
3933+ "maximum minus minimum shall be an integer multiple of "
3934+ "the increment." ),
3935+ ValueMap { "0", "1", "2", "3", ".." },
3936+ Values { "Point", "Minimums", "Maximums", "Increments",
3937+ "DMTF Reserved" },
3938+ ModelCorrespondence {
3939+ "CIM_SettingsDefineCapabilities.PropertyPolicy",
3940+ "CIM_SettingsDefineCapabilities.ValueRole" }]
3941+ uint16 ValueRange = 0;
3942+
3943+
3944+};
3945
3946=== added file 'schema/Core/CIM_SettingsDefineState.mof'
3947--- schema/Core/CIM_SettingsDefineState.mof 1970-01-01 00:00:00 +0000
3948+++ schema/Core/CIM_SettingsDefineState.mof 2009-07-28 19:10:35 +0000
3949@@ -0,0 +1,29 @@
3950+// Copyright (c) 2009 DMTF. All rights reserved.
3951+ [Association, Version ( "2.22.0" ),
3952+ UMLPackagePath ( "CIM::Core::Settings" ),
3953+ Description (
3954+ "SettingsDefineState is used to associate an instance of "
3955+ "SettingData with an instance of ManagedElement. This "
3956+ "association indicates that the SettingData instance provides "
3957+ "additional information about the Current State of the "
3958+ "associated ManagedElement. State is broadly defined to include "
3959+ "the configuration, status, capabilities, and other information "
3960+ "of an instance. \n"
3961+ "Use of the same instance of SettingData to represent more than "
3962+ "one of Current State (SettingsDefineState) and Desired State "
3963+ "(ElementSettingData) and Possible State "
3964+ "(SettingsDefineCapabilities) for a ManagedElement is not "
3965+ "recommended." )]
3966+class CIM_SettingsDefineState {
3967+
3968+ [Key, Description ( "The managed element." )]
3969+ CIM_ManagedElement REF ManagedElement;
3970+
3971+ [Key, Description (
3972+ "The SettingData object that provides additional "
3973+ "information about the current state and configuration of "
3974+ "the ManagedElement." )]
3975+ CIM_SettingData REF SettingData;
3976+
3977+
3978+};
3979
3980=== added file 'schema/Core/CIM_SnapshotOfVirtualSystem.mof'
3981--- schema/Core/CIM_SnapshotOfVirtualSystem.mof 1970-01-01 00:00:00 +0000
3982+++ schema/Core/CIM_SnapshotOfVirtualSystem.mof 2009-07-28 19:10:35 +0000
3983@@ -0,0 +1,27 @@
3984+// Copyright (c) 2009 DMTF. All rights reserved.
3985+ [Association, Version ( "2.22.0" ),
3986+ Description (
3987+ "The CIM_SnapshotOfVirtuaSystem association associates an "
3988+ "instance of the CIM_ComputerSystem class representing a "
3989+ "virtual system, and an instance of the "
3990+ "CIM_VirtualSystemSettingData class representing a snapshot "
3991+ "that was captured from the virtual system." )]
3992+class CIM_SnapshotOfVirtualSystem : CIM_Dependency {
3993+
3994+ [Override ( "Antecedent" ),
3995+ Min ( 0 ),
3996+ Max ( 1 ),
3997+ Description (
3998+ "Reference to the instance of the CIM_ComputerSystem "
3999+ "class representing a virtual system." )]
4000+ CIM_ComputerSystem REF Antecedent;
4001+
4002+ [Override ( "Dependent" ),
4003+ Description (
4004+ "Reference to the instance of the "
4005+ "CIM_VirtualSystemSettingData class representing a "
4006+ "snapshot that was captured from the virtual system." )]
4007+ CIM_VirtualSystemSettingData REF Dependent;
4008+
4009+
4010+};
4011
4012=== modified file 'schema/Core/CIM_SoftwareIdentity.mof'
4013--- schema/Core/CIM_SoftwareIdentity.mof 2008-08-27 11:09:14 +0000
4014+++ schema/Core/CIM_SoftwareIdentity.mof 2009-07-28 19:10:03 +0000
4015@@ -1,5 +1,8 @@
4016-// Copyright (c) 2008 DMTF. All rights reserved.
4017- [Version ( "2.18.0" ),
4018+// Copyright (c) 2009 DMTF. All rights reserved.
4019+ [Version ( "2.22.0" ),
4020+ ClassConstraint {
4021+ "inv:self.IsLargeBuildNumber=true implies self.BuildNumber = null and self.LargeBuildNumber <> null",
4022+ "inv:self.IsLargeBuildNumber=false implies self.LargeBuildNumber=null" },
4023 UMLPackagePath ( "CIM::Core::Software" ),
4024 Description (
4025 "SoftwareIdentity provides descriptive information about a "
4026@@ -41,7 +44,8 @@
4027 "detail or instrumentation to instantiate this association." )]
4028 class CIM_SoftwareIdentity : CIM_LogicalElement {
4029
4030- [Key, Description (
4031+ [Key, Override ( "InstanceID" ),
4032+ Description (
4033 "Within the scope of the instantiating Namespace, "
4034 "InstanceID opaquely and uniquely identifies an instance "
4035 "of this class. In order to ensure uniqueness within the "
4036@@ -97,10 +101,33 @@
4037 "indicated by a larger numeric value." )]
4038 uint16 RevisionNumber;
4039
4040- [Description ( "The build number of the software." )]
4041+ [Description ( "The build number of the software." ),
4042+ ModelCorrespondence {
4043+ "CIM_SoftwareIdentity.LargeBuildNumber",
4044+ "CIM_SoftwareIdentity.IsLargeBuildNumber" }]
4045 uint16 BuildNumber;
4046
4047 [Description (
4048+ "The build number of the software if IsLargeBuildNumber "
4049+ "is TRUE. TheLargeBuildNumber property should be used for "
4050+ "all future implementations." ),
4051+ ModelCorrespondence { "CIM_SoftwareIdentity.BuildNumber",
4052+ "CIM_SoftwareIdentity.IsLargeBuildNumber" }]
4053+ uint64 LargeBuildNumber;
4054+
4055+ [Description (
4056+ "The IsLargeBuildNumber property is used to indicate if "
4057+ "the BuildNumber of LargeBuildNumber property contains "
4058+ "the value of the software build. A value of TRUE shall "
4059+ "indicate that the build number is represented by the "
4060+ "LargeBuildNumber property. A value of FALSE shall "
4061+ "indicate that the build number is represented by the "
4062+ "BuildNumber property." ),
4063+ ModelCorrespondence { "CIM_SoftwareIdentityBuildNumber",
4064+ "CIM_SoftwareIdentity.LargeBuildNumber" }]
4065+ boolean IsLargeBuildNumber = false;
4066+
4067+ [Description (
4068 "A string representing the complete software version "
4069 "information - for example, \'12.1(3)T\'. This string and "
4070 "the numeric major/minor/revision/build properties are "
4071@@ -170,8 +197,18 @@
4072 )]
4073 string SerialNumber;
4074
4075- [Description ( "The date the software was released." )]
4076- datetime ReleaseDate;
4077+ [Description (
4078+ "An array of strings that describes the compatible "
4079+ "installer(s). The purpose of the array elements is to "
4080+ "establish compatibility between a SoftwareIdentity and a "
4081+ "SoftwareInstallationService that can install the "
4082+ "SoftwareIdentity by comparing the values of the array "
4083+ "elements of this property to the values of "
4084+ "SoftwareInstallationServiceCapabilities.SupportedTargetTypes[] "
4085+ "property\'s array elements." ),
4086+ ModelCorrespondence {
4087+ "CIM_SoftwareInstallationServiceCapabilities.SupportedTargetTypes" }]
4088+ string TargetTypes[];
4089
4090 [Description (
4091 "IdentityInfoValue captures additional information that "
4092@@ -224,6 +261,9 @@
4093 ModelCorrespondence { "CIM_SoftwareIdentity.IdentityInfoValue" }]
4094 string IdentityInfoType[];
4095
4096+ [Description ( "The date the software was released." )]
4097+ datetime ReleaseDate;
4098+
4099 [Description (
4100 "The IsEntity property is used to indicate whether the "
4101 "SoftwareIdentity corresponds to a discrete copy of the "
4102@@ -238,6 +278,87 @@
4103 boolean IsEntity = false;
4104
4105 [Description (
4106+ "The binary format type of the installation package of "
4107+ "the software. This property can be used to locate a "
4108+ "SoftwareInstallationService capable of installing this "
4109+ "software." ),
4110+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8",
4111+ "9..0x7FFF", "0x8000.." },
4112+ Values { "Unknown", "Other", "Not Applicable", "Linux RPM",
4113+ "HP-UX Depot", "Windows MSI", "Solaris Package",
4114+ "Macintosh Disk Image", "Debian linux Package",
4115+ "DMTF Reserved", "Vendor Reserved" },
4116+ ModelCorrespondence {
4117+ "CIM_SoftwareIdentity.OtherExtendedResource",
4118+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMajorVersion",
4119+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMinorVersion",
4120+ "CIM_SoftwareIdentity.MinExtendedResourceTypeRevisionNumber",
4121+ "CIM_SoftwareIdentity.MinExtendedResourceTypeBuildNumber",
4122+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4123+ uint16 ExtendedResourceType;
4124+
4125+ [Description (
4126+ "A string describing the binary format type of the "
4127+ "installation package of the software when the "
4128+ "ExtendedResourceType property has a value of 1 (Other)." ),
4129+ ModelCorrespondence {
4130+ "CIM_SoftwareIdentity.ExtendedResourceType",
4131+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMajorVersion",
4132+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMinorVersion",
4133+ "CIM_SoftwareIdentity.MinExtendedResourceTypeRevisionNumber",
4134+ "CIM_SoftwareIdentity.MinExtendedResourceTypeBuildNumber",
4135+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4136+ string OtherExtendedResourceTypeDescription;
4137+
4138+ [Description (
4139+ "This property represents the major number component of "
4140+ "the minimum version of the installer, represented by the "
4141+ "ExtendedResourceType property, that is required to "
4142+ "install this software." ),
4143+ ModelCorrespondence {
4144+ "CIM_SoftwareIdentity.ExtendedResourceType",
4145+ "CIM_SoftwareIdentity.OtherExtendedResourceTypeDescription",
4146+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]",
4147+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMajorVersions[]" }]
4148+ uint16 MinExtendedResourceTypeMajorVersion;
4149+
4150+ [Description (
4151+ "This property represents the minor number component of "
4152+ "the minimum version of the installer, represented by "
4153+ "theExtendedResourceType property, that is required to "
4154+ "install this software." ),
4155+ ModelCorrespondence {
4156+ "CIM_SoftwareIdentity.ExtendedResourceType",
4157+ "CIM_SoftwareIdentity.OtherExtendedResourceTypeDescription",
4158+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]",
4159+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMinorVersions[]" }]
4160+ uint16 MinExtendedResourceTypeMinorVersion;
4161+
4162+ [Description (
4163+ "This property represents the Revision number component "
4164+ "of the minimum version of the installer, represented by "
4165+ "theExtendedResourceType property, that is required to "
4166+ "install this software." ),
4167+ ModelCorrespondence {
4168+ "CIM_SoftwareIdentity.ExtendedResourceType",
4169+ "CIM_SoftwareIdentity.OtherExtendedResourceTypeDescription",
4170+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]",
4171+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesRevisionNumbers[]" }]
4172+ uint16 MinExtendedResourceTypeRevisionNumber;
4173+
4174+ [Description (
4175+ "This property represents the Build number component of "
4176+ "the minimum version of the installer, represented by "
4177+ "theExtendedResourceType property, that is required to "
4178+ "install this software." ),
4179+ ModelCorrespondence {
4180+ "CIM_SoftwareIdentity.ExtendedResourceType",
4181+ "CIM_SoftwareIdentity.OtherExtendedResourceTypeDescription",
4182+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]",
4183+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesBuildNumbers[]" }]
4184+ uint16 MinExtendedResourceTypeBuildNumber;
4185+
4186+ [Description (
4187 "The TargetOSTypes property specifies the target "
4188 "operating systems supported by the software. When the "
4189 "target operating system of the software is not listed in "
4190@@ -252,7 +373,10 @@
4191 "46", "47", "48", "49", "50", "51", "52", "53", "54",
4192 "55", "56", "57", "58", "59", "60", "61", "62", "63",
4193 "64", "65", "66", "67", "68", "69", "70", "71", "72",
4194- "73", "74", "75", "76", "77" },
4195+ "73", "74", "75", "76", "77", "78", "79", "80", "81",
4196+ "82", "83", "84", "85", "86", "87", "88", "89", "90",
4197+ "91", "92", "93", "94", "95", "96", "97", "98", "99",
4198+ "100", "101", "102", "103" },
4199 Values { "Unknown", "Other", "MACOS", "ATTUNIX", "DGUX",
4200 "DECNT", "Tru64 UNIX", "OpenVMS", "HPUX", "AIX",
4201 //10
4202@@ -282,7 +406,21 @@
4203 "Windows Vista", "Windows Vista 64-Bit",
4204 "Windows Embedded for Point of Service",
4205 "Microsoft Windows Server 2008",
4206- "Microsoft Windows Server 2008 64-Bit" },
4207+ "Microsoft Windows Server 2008 64-Bit", "FreeBSD 64-Bit",
4208+ "RedHat Enterprise Linux",
4209+ //80
4210+ "RedHat Enterprise Linux 64-Bit",
4211+ "Solaris 64-Bit", "SUSE", "SUSE 64-Bit", "SLES",
4212+ "SLES 64-Bit", "Novell OES", "Novell Linux Desktop",
4213+ "Sun Java Desktop System", "Mandriva",
4214+ //90
4215+ "Mandriva 64-Bit", "TurboLinux",
4216+ "TurboLinux 64-Bit", "Ubuntu", "Ubuntu 64-Bit", "Debian",
4217+ "Debian 64-Bit", "Linux 2.4.x", "Linux 2.4.x 64-Bit",
4218+ "Linux 2.6.x", //100
4219+ "Linux 2.6.x 64-Bit",
4220+ "Linux 64-Bit", "Other 64-Bit",
4221+ "Microsoft Windows Server 2008 R2" },
4222 ModelCorrespondence { "CIM_OperatingSystem.OSType" }]
4223 uint16 TargetOSTypes[];
4224
4225
4226=== added file 'schema/Core/CIM_SoftwareInstallationService.mof'
4227--- schema/Core/CIM_SoftwareInstallationService.mof 1970-01-01 00:00:00 +0000
4228+++ schema/Core/CIM_SoftwareInstallationService.mof 2009-07-28 19:10:35 +0000
4229@@ -0,0 +1,292 @@
4230+// Copyright (c) 2009 DMTF. All rights reserved.
4231+ [Version ( "2.22.0" ),
4232+ UMLPackagePath ( "CIM::Core::Software" ),
4233+ Description (
4234+ "A subclass of service which provides methods to install (or "
4235+ "update) Software Identities in ManagedElements." )]
4236+class CIM_SoftwareInstallationService : CIM_Service {
4237+
4238+
4239+ [Description (
4240+ "This method allows a client application to determine "
4241+ "whether a specific SoftwareIdentity can be installed (or "
4242+ "updated) on a ManagedElement. It also allows other "
4243+ "characteristics to be determined such as whether install "
4244+ "will require a reboot. In addition a client can check "
4245+ "whether the SoftwareIdentity can be added "
4246+ "simulataneously to a specified "
4247+ "SofwareIndentityCollection. A client MAY specify either "
4248+ "or both of the Collection and Target parameters. The "
4249+ "Collection parameter is only supported if "
4250+ "SoftwareInstallationServiceCapabilities.CanAddToCollection "
4251+ "is TRUE." ),
4252+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096",
4253+ "4097", "4098", "4099", "4100", "4101", "4102", "4103",
4254+ "4104", "4105", "4106", "4107", "4108", "4109",
4255+ "4110..32767", "32768..65535" },
4256+ Values { "Job Completed with No Error", "Not Supported",
4257+ "Unspecified Error", "Timeout", "Failed",
4258+ "Invalid Parameter", "Target In Use", "DMTF Reserved",
4259+ "Method Reserved", "Unsupported TargetType",
4260+ "Unattended/silent installation not supported",
4261+ "Downgrade/reinstall not supported", "Not enough memory",
4262+ "Not enough swap-space", "Unsupported version transition",
4263+ "Not enough disk space",
4264+ "Software and target operating system mismatch",
4265+ "Missing dependencies", "Not applicable to target",
4266+ "No supported path to image", "Cannot add to Collection",
4267+ "Asynchronous Job already in progress", "Method Reserved",
4268+ "Vendor Specific" }]
4269+ uint32 CheckSoftwareIdentity(
4270+ [IN, Description (
4271+ "Reference to the SoftwareIdentity to be checked." )]
4272+ CIM_SoftwareIdentity REF Source,
4273+ [IN, Description (
4274+ "Reference to the ManagedElement that the Software "
4275+ "Identity is going to be installed in (or updated)." )]
4276+ CIM_ManagedElement REF Target,
4277+ [IN, Description (
4278+ "Reference to the Collection to which the Software "
4279+ "Identity will be added." )]
4280+ CIM_Collection REF Collection,
4281+ [IN ( false ), OUT, Description (
4282+ "The parameter describes the characteristics of the "
4283+ "installation/update that will take place if the "
4284+ "Source Software Identity is installed: \n"
4285+ "Target automatic reset: The target element will "
4286+ "automatically reset once the installation is "
4287+ "complete. \n"
4288+ "System automatic reset: The containing system of "
4289+ "the target ManagedElement (normally a logical "
4290+ "device or the system itself) will automatically "
4291+ "reset/reboot once the installation is complete. \n"
4292+ "Separate target reset required: "
4293+ "EnabledLogicalElement.RequestStateChange MUST be "
4294+ "used to reset the target element after the "
4295+ "SoftwareIdentity is installed. \n"
4296+ "Separate system reset required: "
4297+ "EnabledLogicalElement.RequestStateChange MUST be "
4298+ "used to reset/reboot the containing system of the "
4299+ "target ManagedElement after the SoftwareIdentity "
4300+ "is installed. \n"
4301+ "Manual Reboot Required: The system MUST be "
4302+ "manually rebooted by the user. \n"
4303+ "No reboot required : No reboot is required after "
4304+ "installation. \n"
4305+ "User Intervention Recomended : It is recommended "
4306+ "that a user confirm installation of this "
4307+ "SoftwareIdentity. Inappropriate application MAY "
4308+ "have serious consequences. \n"
4309+ "MAY be added to specified collection : The "
4310+ "SoftwareIndentity MAY be added to specified "
4311+ "Collection." ),
4312+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "9",
4313+ "..", "0x7FFF..0xFFFF" },
4314+ Values { "Target automatic reset",
4315+ "System automatic reset",
4316+ "Separate target reset Required",
4317+ "Separate system reset Required",
4318+ "Manual Reboot Required", "No Reboot Required",
4319+ "User Intervention recommended",
4320+ "MAY be added to specified Collection",
4321+ "DMTF Reserved", "Vendor Specific" }]
4322+ uint16 InstallCharacteristics[]);
4323+
4324+ [Description (
4325+ "Start a job to install or update a SoftwareIdentity "
4326+ "(Source) on a ManagedElement (Target). \n"
4327+ "In addition the method can be used to add the "
4328+ "SoftwareIdentity simulataneously to a specified "
4329+ "SofwareIndentityCollection. A client MAY specify either "
4330+ "or both of the Collection and Target parameters. The "
4331+ "Collection parameter is only supported if "
4332+ "SoftwareInstallationServiceCapabilities.CanAddToCollection "
4333+ "is TRUE. \n"
4334+ "If 0 is returned, the function completed successfully "
4335+ "and no ConcreteJob instance was required. If 4096/0x1000 "
4336+ "is returned, a ConcreteJob will be started to perform "
4337+ "the install. The Job\'s reference will be returned in "
4338+ "the output parameter Job." ),
4339+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096",
4340+ "4097", "4098", "4099", "4100", "4101", "4102", "4103",
4341+ "4104", "4105", "4106", "4107", "4108", "4109..32767",
4342+ "32768..65535" },
4343+ Values { "Job Completed with No Error", "Not Supported",
4344+ "Unspecified Error", "Timeout", "Failed",
4345+ "Invalid Parameter", "Target In Use", "DMTF Reserved",
4346+ "Method Parameters Checked - Job Started",
4347+ "Unsupported TargetType",
4348+ "Unattended/silent installation not supported",
4349+ "Downgrade/reinstall not supported", "Not enough memory",
4350+ "Not enough swap-space", "Unsupported version transition",
4351+ "Not enough disk space",
4352+ "Software and target operating system mismatch",
4353+ "Missing dependencies", "Not applicable to target",
4354+ "No supported path to image", "Cannot add to Collection",
4355+ "Method Reserved", "Vendor Specific" }]
4356+ uint32 InstallFromSoftwareIdentity(
4357+ [IN ( false ), OUT, Description (
4358+ "Reference to the job (may be null if job completed)."
4359+ )]
4360+ CIM_ConcreteJob REF Job,
4361+ [IN, Description (
4362+ "Options to control the install process.\n"
4363+ "Defer target/system reset : do not automatically "
4364+ "reset the target/system.\n"
4365+ "Force installation : Force the installation of the "
4366+ "same or an older SoftwareIdentity. Install: "
4367+ "Perform an installation of this software on the "
4368+ "managed element.\n"
4369+ "Update: Perform an update of this software on the "
4370+ "managed element.\n"
4371+ "Repair: Perform a repair of the installation of "
4372+ "this software on the managed element by forcing "
4373+ "all the files required for installing the software "
4374+ "to be reinstalled.\n"
4375+ "Reboot: Reboot or reset the system immediately "
4376+ "after the install or update of this software, if "
4377+ "the install or the update requires a reboot or reset.\n"
4378+ "Password: Password will be specified as clear text "
4379+ "without any encryption for performing the install "
4380+ "or update.\n"
4381+ "Uninstall: Uninstall the software on the managed element.\n"
4382+ "Log: Create a log for the install or update of the software.\n"
4383+ "SilentMode: Perform the install or update without "
4384+ "displaying any user interface.\n"
4385+ "AdministrativeMode: Perform the install or update "
4386+ "of the software in the administrative mode. "
4387+ "ScheduleInstallAt: Indicates the time at which "
4388+ "theinstall or update of the software will occur." ),
4389+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "9",
4390+ "10", "11", "12", "13", "..", "32768..65535" },
4391+ Values { "Defer target/system reset",
4392+ "Force installation", "Install", "Update", "Repair",
4393+ "Reboot", "Password", "Uninstall", "Log",
4394+ "SilentMode", "AdministrativeMode",
4395+ "ScheduleInstallAt", "DMTF Reserved",
4396+ "Vendor Specific" },
4397+ ArrayType ( "Indexed" ),
4398+ ModelCorrespondence {
4399+ "CIM_SoftwareInstallationService.InstallOptionsValues[]",
4400+ "CIM_SoftwareInstallationServiceCapabilities.SupportedInstallOptions[]" }]
4401+ uint16 InstallOptions[],
4402+ [IN, Description (
4403+ "InstallOptionsValues is an array of strings "
4404+ "providing additional information to InstallOptions "
4405+ "for the method to install the software. Each entry "
4406+ "of this array is related to the entry in "
4407+ "InstallOptions that is located at the same index "
4408+ "providing additional information for "
4409+ "InstallOptions. \n"
4410+ "If the index in InstallOptions has the value "
4411+ "\"Password \" then a value at the corresponding "
4412+ "index of InstallOptionValues shall not be NULL. \n"
4413+ "If the index in InstallOptions has the value "
4414+ "\"ScheduleInstallAt\" then the value at the "
4415+ "corresponding index of InstallOptionValues shall "
4416+ "not be NULL and shall be in the datetime type "
4417+ "format. \n"
4418+ "If the index in InstallOptions has the value \"Log "
4419+ "\" then a value at the corresponding index of "
4420+ "InstallOptionValues may be NULL. \n"
4421+ "If the index in InstallOptions has the value "
4422+ "\"Defer target/system reset\", \"Force "
4423+ "installation\",\"Install\", \"Update\", \"Repair\" "
4424+ "or \"Reboot\" then a value at the corresponding "
4425+ "index of InstallOptionValues shall be NULL." ),
4426+ ArrayType ( "Indexed" ),
4427+ ModelCorrespondence {
4428+ "CIM_SoftwareInstallationService.InstallOptions[]" }]
4429+ string InstallOptionsValues[],
4430+ [IN, Description (
4431+ "Reference to the source of the install." )]
4432+ CIM_SoftwareIdentity REF Source,
4433+ [IN, Description (
4434+ "The installation target. If NULL then the "
4435+ "SOftwareIdentity will be added to Collection only. "
4436+ "The underlying implementation is expected to be "
4437+ "able to obtain any necessary metadata from the "
4438+ "Software Identity." )]
4439+ CIM_ManagedElement REF Target,
4440+ [IN, Description (
4441+ "Reference to the Collection to which the Software "
4442+ "Identity SHALL be added. If NULL then the SOftware "
4443+ "Identity will not be added to a Collection." )]
4444+ CIM_Collection REF Collection);
4445+
4446+ [Description (
4447+ "Start a job to install software from a specific URI in a "
4448+ "ManagedElement. \n"
4449+ "Note that this method is provided to support existing, "
4450+ "alternative download mechanisms (such as used for "
4451+ "firmware download). The \'normal\' mechanism will be to "
4452+ "use the InstallFromSoftwareIdentity method.\n"
4453+ "If 0 is returned, the function completed successfully "
4454+ "and no ConcreteJob instance was required. If 4096/0x1000 "
4455+ "is returned, a ConcreteJob will be started to to perform "
4456+ "the install. The Job\'s reference will be returned in "
4457+ "the output parameter Job." ),
4458+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096",
4459+ "4097", "4098", "4099", "4100", "4101", "4102", "4103",
4460+ "4104", "4105", "4106", "4107", "4108..32767",
4461+ "32768..65535" },
4462+ Values { "Job Completed with No Error", "Not Supported",
4463+ "Unspecified Error", "Timeout", "Failed",
4464+ "Invalid Parameter", "Target In Use", "DMTF Reserved",
4465+ "Method Parameters Checked - Job Started",
4466+ "Unsupported TargetType",
4467+ "Unattended/silent installation not supported",
4468+ "Downgrade/reinstall not supported", "Not enough memory",
4469+ "Not enough swap-space", "Unsupported version transition",
4470+ "Not enough disk space",
4471+ "Software and target operating system mismatch",
4472+ "Missing dependencies", "Not applicable to target",
4473+ "URI not accessible", "Method Reserved", "Vendor Specific" }]
4474+ uint32 InstallFromURI(
4475+ [IN ( false ), OUT, Description (
4476+ "Reference to the job (may be null if job completed)."
4477+ )]
4478+ CIM_ConcreteJob REF Job,
4479+ [IN, Description (
4480+ "A URI for the software based on RFC 2079." )]
4481+ string URI,
4482+ [IN, Description ( "The installation target." )]
4483+ CIM_ManagedElement REF Target,
4484+ [IN, Description (
4485+ "Options to control the install process. \n"
4486+ "See the InstallOptions parameter of the "
4487+ "SoftwareInstallationService.InstallFromSoftwareIdentity "
4488+ "method for the description of these values." ),
4489+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "9",
4490+ "10", "11", "12", "13", "..", "32768..65535" },
4491+ Values { "Defer target/system reset",
4492+ "Force installation", "Install", "Update", "Repair",
4493+ "Reboot", "Password", "Uninstall", "Log",
4494+ "SilentMode", "AdministrativeMode",
4495+ "ScheduleInstallAt", "DMTF Reserved",
4496+ "Vendor Specific" },
4497+ ArrayType ( "Indexed" ),
4498+ ModelCorrespondence {
4499+ "CIM_SoftwareInstallationService.InstallFromURI.InstallOptionsValues[]",
4500+ "CIM_SoftwareInstallationServiceCapabilities.SupportedInstallOptions[]" }]
4501+ uint16 InstallOptions[],
4502+ [IN, Description (
4503+ "InstallOptionsValues is an array of strings "
4504+ "providing additionalinformation to InstallOptions "
4505+ "for the method to install the software. Each entry "
4506+ "of this array is related to the entry in "
4507+ "InstallOptions that is located at the same index "
4508+ "providing additional information for "
4509+ "InstallOptions. \n"
4510+ "For further information on the use of "
4511+ "InstallOptionsValues parameter, see the "
4512+ "description of the InstallOptionsValues parameter "
4513+ "of the "
4514+ "SoftwareInstallationService.InstallFromSoftwareIdentity "
4515+ "method." ),
4516+ ArrayType ( "Indexed" ),
4517+ ModelCorrespondence {
4518+ "CIM_SoftwareInstallationService.InstallFromByteStream.InstallOptions[]" }]
4519+ string InstallOptionsValues[]);
4520+
4521+};
4522
4523=== added file 'schema/Core/CIM_SoftwareInstallationServiceCapabilities.mof'
4524--- schema/Core/CIM_SoftwareInstallationServiceCapabilities.mof 1970-01-01 00:00:00 +0000
4525+++ schema/Core/CIM_SoftwareInstallationServiceCapabilities.mof 2009-07-28 19:10:35 +0000
4526@@ -0,0 +1,178 @@
4527+// Copyright (c) 2009 DMTF. All rights reserved.
4528+ [Version ( "2.22.0" ),
4529+ UMLPackagePath ( "CIM::Core::Software" ),
4530+ Description (
4531+ "A subclass of capabilities that defines the capabilities of a "
4532+ "SoftwareInstallationService. A single instance of "
4533+ "SoftwareInstallationServiceCapabilities is associated with a "
4534+ "SoftwareInstallationService using ElementCapabilities." )]
4535+class CIM_SoftwareInstallationServiceCapabilities : CIM_Capabilities {
4536+
4537+ [Required, Description (
4538+ "Enumeration indicating what operations will be executed "
4539+ "as asynchronous jobs. If an operation is included in "
4540+ "both this and SupportedSynchronousActions then the "
4541+ "underlying implementation is indicating that it may or "
4542+ "may not create a job. If a Job is created, then the "
4543+ "methods in SoftwareInstallationService return a "
4544+ "reference to that Job as the Job parameter." ),
4545+ ValueMap { "2", "3", "4", "5" },
4546+ Values { "None supported", "Install From Software Identity",
4547+ "Install from ByteStream", "Install from URI" },
4548+ ModelCorrespondence {
4549+ "CIM_SoftwareInstallationServiceCapabilities.SupportedSynchronousActions" }]
4550+ uint16 SupportedAsynchronousActions[];
4551+
4552+ [Required, Description (
4553+ "Enumeration indicating what operations will be executed "
4554+ "without the creation of a job. If an operation is "
4555+ "included in both this and SupportedAsynchronousActions "
4556+ "then the underlying instrumentation is indicating that "
4557+ "it may or may not create a job." ),
4558+ ValueMap { "2", "3", "4", "5" },
4559+ Values { "None supported", "Install From Software Identity",
4560+ "Install from ByteStream", "Install from URI" },
4561+ ModelCorrespondence {
4562+ "CIM_SoftwareInstallationServiceCapabilities.SupportedAsynchronousActions" }]
4563+ uint16 SupportedSynchronousActions[];
4564+
4565+ [Required, Description (
4566+ "An array containing a list of "
4567+ "SoftwareIdentity.TargetType properties that this service "
4568+ "\'knows\' how to install. TargetType is an application "
4569+ "specific string which is invariant across version or "
4570+ "name changes of the SoftwareIdentity and so can be used "
4571+ "by a client to select Software Identities compatible "
4572+ "with this service. \n"
4573+ "If the service is generic (for example an OS installer), "
4574+ "this array will be empty." ),
4575+ ModelCorrespondence { "CIM_SoftwareIdentity.TargetType" }]
4576+ string SupportedTargetTypes[];
4577+
4578+ [Required, Description (
4579+ "An array containing a list of the binary format types "
4580+ "that this service \'knows\' how to install. The Values "
4581+ "for this property are the subset of "
4582+ "CIM_SoftwareIdentityResource.ExtendedResourceTypes that "
4583+ "apply to the \'Installer and Payload\', \'Installer\' "
4584+ "and \' Installability Checker\' ResourceTypes. For "
4585+ "example, an a Windows system, this property may be set "
4586+ "to \'4\' indicating \'Windows MSI\'. This property "
4587+ "should be set to \'2\' (Not Applicable) if this service "
4588+ "is not OS specific." ),
4589+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8",
4590+ "9..0x7FFF", "0x8000.." },
4591+ Values { "Unknown", "Other", "Not Applicable", "Linux RPM",
4592+ "HP-UX Depot", "Windows MSI", "Solaris Package",
4593+ "Macintosh Disk Image", "Debian linux Package",
4594+ "DMTF Reserved", "Vendor Reserved" },
4595+ ArrayType ( "Indexed" ),
4596+ ModelCorrespondence {
4597+ "CIM_SoftwareIdentity.ExtendedResourceType",
4598+ "CIM_SoftwareInstallationServiceCapabilities.OtherSupportedExtendedResourceTypeDescriptions[]",
4599+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMajorVersions[]",
4600+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMinorVersions[]",
4601+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesRevisionNumbers[]",
4602+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesbuildNumbers[]" }]
4603+ uint16 SupportedExtendedResourceTypes[];
4604+
4605+ [Required, Description (
4606+ "This property indicates whether "
4607+ "SoftwareInstallationService.InstallFromSoftwareIdentity "
4608+ "supports adding a SoftwareIdentity to a Collection." )]
4609+ boolean CanAddToCollection;
4610+
4611+ [Description (
4612+ "An enumeration indicating the specific install related "
4613+ "optionssupported by this service. Since this is an "
4614+ "array, multiple values may be specified. See the "
4615+ "InstallOptions parameter of "
4616+ "theSoftwareInstallationService.InstallFromSoftwareIdentity "
4617+ "method for the description of these values." ),
4618+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "9", "10",
4619+ "11", "12", "13", "..", "32768..65535" },
4620+ Values { "Defer target/system reset", "Force installation",
4621+ "Install", "Update", "Repair", "Reboot", "Password",
4622+ "Uninstall", "Log", "SilentMode", "AdministrativeMode",
4623+ "ScheduleInstallAt", "DMTF Reserved", "Vendor Specific" },
4624+ ModelCorrespondence {
4625+ "CIM_SoftwareInstallationService.InstallFromSoftwareIdentity" }]
4626+ uint16 SupportedInstallOptions[];
4627+
4628+ [Description (
4629+ "A string describing the binary format types that this "
4630+ "service \'knows\' how to install when the corresponding "
4631+ "SupportedExtendedResourceTypes array includes the value "
4632+ "1 (Other)." ),
4633+ ModelCorrespondence {
4634+ "CIM_SoftwareIdentity.ExtendedResourceType",
4635+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]",
4636+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMajorVersions[]",
4637+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesMinorVersions[]",
4638+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesRevisionNumbers[]",
4639+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypesbuildNumbers[]" }]
4640+ string OtherSupportedExtendedResourceTypeDescriptions[];
4641+
4642+ [Description (
4643+ "This property represents the major number component of "
4644+ "the installer version supported by the "
4645+ "SoftwareInstallationService.The installer format is "
4646+ "represented by the element at the same index in the "
4647+ "SupportedExtendedResourceTypes array." ),
4648+ ArrayType ( "Indexed" ),
4649+ ModelCorrespondence {
4650+ "CIM_SoftwareIdentity.ExtendedResourceType",
4651+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMajorVersion",
4652+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4653+ uint16 SupportedExtendedResourceTypesMajorVersions[];
4654+
4655+ [Description (
4656+ "This property represents the minor number component of "
4657+ "the installer version supported by the "
4658+ "SoftwareInstallationService.The installer format is "
4659+ "represented by the element at the same index in the "
4660+ "SupportedExtendedResourceTypes array." ),
4661+ ArrayType ( "Indexed" ),
4662+ ModelCorrespondence {
4663+ "CIM_SoftwareIdentity.ExtendedResourceType",
4664+ "CIM_SoftwareIdentity.MinExtendedResourceTypeMinorVersion",
4665+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4666+ uint16 SupportedExtendedResourceTypesMinorVersions[];
4667+
4668+ [Description (
4669+ "This property represents the revision number component "
4670+ "of the installer version supported by the "
4671+ "SoftwareInstallationService.The installer format is "
4672+ "represented by the element at the same index in the "
4673+ "SupportedExtendedResourceTypes array." ),
4674+ ArrayType ( "Indexed" ),
4675+ ModelCorrespondence {
4676+ "CIM_SoftwareIdentity.ExtendedResourceType",
4677+ "CIM_SoftwareIdentity.MinExtendedResourceTypeRevisionNumber",
4678+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4679+ uint16 SupportedExtendedResourceTypesRevisionNumbers[];
4680+
4681+ [Description (
4682+ "This property represents the build number component of "
4683+ "the installer version supported by the "
4684+ "SoftwareInstallationService.The installer format is "
4685+ "represented by the element at the same index in the "
4686+ "SupportedExtendedResourceTypes array." ),
4687+ ArrayType ( "Indexed" ),
4688+ ModelCorrespondence {
4689+ "CIM_SoftwareIdentity.ExtendedResourceType",
4690+ "CIM_SoftwareIdentity.MinExtendedResourceTypeBuildNumber",
4691+ "CIM_SoftwareInstallationServiceCapabilities.SupportedExtendedResourceTypes[]" }]
4692+ uint16 SupportedExtendedResourceTypesBuildNumbers[];
4693+
4694+ [Description (
4695+ "This property lists the URI schemes supported by the "
4696+ "SoftwareInstallationService." ),
4697+ ValueMap { "2", "3", "4", "5", "6", "7", "8", "..",
4698+ "0x8000..0xFFFF" },
4699+ Values { "data", "file", "ftp", "http", "https", "nfs",
4700+ "tftp", "DMTF Reserved", "Vendor Specific" }]
4701+ uint16 SupportedURISchemes[];
4702+
4703+
4704+};
4705
4706=== modified file 'schema/Core/CIM_Spared.mof'
4707--- schema/Core/CIM_Spared.mof 2008-08-27 11:09:14 +0000
4708+++ schema/Core/CIM_Spared.mof 2009-07-28 19:10:03 +0000
4709@@ -1,10 +1,4 @@
4710 // Copyright (c) 2005 DMTF. All rights reserved.
4711-// <change cr="SysDevCR00717.001" type ="add">Remove Experimental</change>
4712-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
4713-// qualifier values to CIM Schema.</change>
4714-// ==================================================================
4715-// CIM_Spared
4716-// ==================================================================
4717 [Association, Version ( "2.10.0" ),
4718 UMLPackagePath ( "CIM::Core::Redundancy" ),
4719 Description (
4720
4721=== modified file 'schema/Core/CIM_StatisticalData.mof'
4722--- schema/Core/CIM_StatisticalData.mof 2008-08-27 11:09:14 +0000
4723+++ schema/Core/CIM_StatisticalData.mof 2009-07-28 19:10:03 +0000
4724@@ -1,10 +1,5 @@
4725-// Copyright (c) 2005 DMTF. All rights reserved.
4726-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
4727-// qualifier values to CIM Schema.</change>
4728-// ==================================================================
4729-// CIM_StatisticalData
4730-// ==================================================================
4731- [Abstract, Version ( "2.8.0" ),
4732+// Copyright (c) 2008 DMTF. All rights reserved.
4733+ [Abstract, Version ( "2.19.0" ),
4734 UMLPackagePath ( "CIM::Core::Statistics" ),
4735 Description (
4736 "CIM_StatisticalData is a root class for any arbitrary "
4737@@ -16,7 +11,8 @@
4738 "CIM_StatisticalInformation." )]
4739 class CIM_StatisticalData : CIM_ManagedElement {
4740
4741- [Key, Description (
4742+ [Key, Override ( "InstanceID" ),
4743+ Description (
4744 "Within the scope of the instantiating Namespace, "
4745 "InstanceID opaquely and uniquely identifies an instance "
4746 "of this class. In order to ensure uniqueness within the "
4747
4748=== modified file 'schema/Core/CIM_StatisticsCollection.mof'
4749--- schema/Core/CIM_StatisticsCollection.mof 2008-08-27 11:09:14 +0000
4750+++ schema/Core/CIM_StatisticsCollection.mof 2009-07-28 19:10:03 +0000
4751@@ -1,11 +1,4 @@
4752 // Copyright (c) 2005 DMTF. All rights reserved.
4753-// <change cr="CIMCoreCR00820.003" type ="change">Remove Experimental
4754-// from class.</change>
4755-// <change cr="ArchCR00066.004" type="add">Add UmlPackagePath
4756-// qualifier values to CIM Schema.</change>
4757-// ==================================================================
4758-// CIM_StatisticsCollection
4759-// ==================================================================
4760 [Version ( "2.8.1000" ),
4761 UMLPackagePath ( "CIM::Core::Statistics" ),
4762 Description (
4763
4764=== added file 'schema/Core/CIM_StorageAllocationSettingData.mof'
4765--- schema/Core/CIM_StorageAllocationSettingData.mof 1970-01-01 00:00:00 +0000
4766+++ schema/Core/CIM_StorageAllocationSettingData.mof 2009-07-28 19:10:35 +0000
4767@@ -0,0 +1,244 @@
4768+// Copyright (c) 2009 DMTF. All rights reserved.
4769+ [Version ( "2.22.0" ),
4770+ UMLPackagePath ( "CIM::Core::Resource" ),
4771+ Description (
4772+ "The CIM_StorageAllocationSettingData class represents settings "
4773+ "specifically related to the allocation of virtual storage." )]
4774+class CIM_StorageAllocationSettingData : CIM_ResourceAllocationSettingData {
4775+
4776+ [Description (
4777+ "Size in bytes of the blocks that are presented to the "
4778+ "consumer as the result of this storage resource "
4779+ "allocation or storage resource allocation request. If "
4780+ "the block size is variable, then the maximum block size "
4781+ "in bytes should be specified. If the block size is "
4782+ "unknown or if a block concept does not apply, then the "
4783+ "value 1 shall be used.\n"
4784+ "NOTE: The use of 1 (and not 0) to indicate that the "
4785+ "blocksize is unknown still allows the use of the "
4786+ "VirtualQuantity property to convey the size in blocks of "
4787+ "size 1).\n"
4788+ "NOTE: This property is a copy of the "
4789+ "CIM_StorageExtent.BlockSize property. See the "
4790+ "description of the CIM_StorageExtent.BlockSize property "
4791+ "for details." ),
4792+ ModelCorrespondence { "CIM_StorageExtent.BlockSize" },
4793+ PUnit ( "byte" )]
4794+ uint64 VirtualResourceBlockSize;
4795+
4796+ [Override ( "VirtualQuantity" ),
4797+ Description (
4798+ "Number of blocks that are presented to the consumer. The "
4799+ "blocksize is specified by the value of the "
4800+ "VirtualResourceBlockSize property." ),
4801+ ModelCorrespondence { "CIM_StorageExtent.NumberOfBlocks",
4802+ "CIM_StorageAllocationSettingData.VirtualQuantityUnits" }]
4803+ uint64 VirtualQuantity;
4804+
4805+ [Override ( "VirtualQuantityUnits" ),
4806+ Description (
4807+ "This property specifies the units used by the "
4808+ "VirtualQuantity property. The value shall match "
4809+ "\"count(fixed size block)\" | \"byte\".\n"
4810+ "The default value \"count(fixed size block)\" assumes "
4811+ "that the implementation knows a fixed block size and "
4812+ "conveys the block size through the value of the "
4813+ "VirtualResourceBlockSize property. However, if the "
4814+ "VirtualResourceBlockSize property has a value \"1\", "
4815+ "this indicates an unknown or variable block size; in "
4816+ "this case the value of the VirtualQuantityUnit property "
4817+ "should be set to \"byte\", such that the value of the "
4818+ "VirtualQuantity property is measured directly in byte.\n"
4819+ "NOTE: The IsPUnit qualifier already formally restricts "
4820+ "the value of this property to be a unit as specified in "
4821+ "DMTF DSP0004:2.5.0, Annex C; in addition, the normative "
4822+ "text in the description of this property above further "
4823+ "constrains the value to match \"byte\" | \"count(fixed "
4824+ "size block)\"." ),
4825+ ModelCorrespondence {
4826+ "CIM_StorageAllocationSettingData.VirtualQuantity" },
4827+ IsPUnit]
4828+ string VirtualQuantityUnits = "count(fixed size block)";
4829+
4830+ [Description (
4831+ "Access describes whether the allocated storage extent is "
4832+ "1 (readable), 2 (writeable), or 3 (both).\n"
4833+ "NOTE: This property is a copy of the "
4834+ "CIM_StorageExtent.Access property, except deprecated "
4835+ "values. See the description of the "
4836+ "CIM_StorageExtent.Access property for details." ),
4837+ ValueMap { "0", "1", "2", "3", ".." },
4838+ Values { "Unknown", "Readable", "Writeable",
4839+ "Read/Write Supported", "DMTF Reserved" },
4840+ ModelCorrespondence { "CIM_StorageExtent.Access" }]
4841+ uint16 Access;
4842+
4843+ [Description (
4844+ "Size in bytes of the blocks that are allocated at the "
4845+ "host as the result of this storage resource allocation "
4846+ "or storage resource allocation request. If the block "
4847+ "size is variable, then the maximum block size in bytes "
4848+ "should be specified. If the block size is unknown or if "
4849+ "a block concept does not apply, then the value 1 shall "
4850+ "be used.\n"
4851+ "NOTE: This property is a copy of the "
4852+ "CIM_StorageExtent.BlockSize property. See the "
4853+ "description of the CIM_StorageExtent.BlockSize property "
4854+ "for details." ),
4855+ ModelCorrespondence { "CIM_StorageExtent.BlockSize" },
4856+ PUnit ( "byte" )]
4857+ uint64 HostResourceBlockSize;
4858+
4859+ [Override ( "Reservation" ),
4860+ Description (
4861+ "The amount of blocks that are guaranteed to be available "
4862+ "for this storage resource allocation at the host. The "
4863+ "blocksize is specified by the value of the "
4864+ "HostResourceBlockSize property." ),
4865+ ModelCorrespondence {
4866+ "CIM_StorageAllocationSettingData.HostResourceBlockSize" }]
4867+ uint64 Reservation;
4868+
4869+ [Override ( "Limit" ),
4870+ Description (
4871+ "The maximum amount of blocks that will be granted for "
4872+ "this storage resource allocation at the host. The "
4873+ "blocksize is specified by the value of the "
4874+ "HostResourceBlockSize property.Usually the value this "
4875+ "property would reflect a maximum size for the allocated "
4876+ "host extent that matches the size of the virtual storage "
4877+ "extent presented to the consumer. A value less than that "
4878+ "would indicate a situation where a sparsely populated "
4879+ "virtual storage extent is expected, where the fill rate "
4880+ "is limited by the value of the Limit property." ),
4881+ ModelCorrespondence {
4882+ "CIM_StorageAllocationSettingData.HostResourceBlockSize" }]
4883+ uint64 Limit;
4884+
4885+ [Description (
4886+ "The HostExtentStartingAddress property identifies the "
4887+ "starting address on the host storage extent identified "
4888+ "by the value of the HostExtentName property that is used "
4889+ "for the allocation of the virtual storage extent.\n"
4890+ "A value of NULL indicates that there is no direct "
4891+ "mapping of the virtual storage extent onto the "
4892+ "referenced host storage extent.\n"
4893+ "NOTE: This property is a copy of the "
4894+ "CIM_BasedOn.StartingAddess property. See the description "
4895+ "of CIM_BasedOn association for details." ),
4896+ ModelCorrespondence {
4897+ "CIM_StorageAllocationSettingData.HostResourceBlockSize",
4898+ "CIM_BasedOn.StartingAddress" }]
4899+ uint64 HostExtentStartingAddress;
4900+
4901+ [Description (
4902+ "A unique identifier for the host extent. The identified "
4903+ "host extent is used for the storage resource allocation.\n"
4904+ "NOTE: This property is a copy of the "
4905+ "CIM_StorageExtent.Name property. See the description of "
4906+ "CIM_StorageExtent.Name property for details." ),
4907+ ModelCorrespondence {
4908+ "CIM_StorageAllocationSettingData.HostExtentNameFormat",
4909+ "CIM_StorageAllocationSettingData.HostExtentNameNamespace",
4910+ "CIM_StorageExtent.Name" }]
4911+ string HostExtentName;
4912+
4913+ [Description (
4914+ "The HostExtentNameFormat property identifies the format "
4915+ "that is used for the value of the HostExtentName property.\n"
4916+ "NOTE: This property is a copy of the "
4917+ "CIM_StorageExtent.NameFormat property, excluding "
4918+ "deprecated values. See the description of "
4919+ "CIM_StorageExtent.NameFormat class for details.\n"
4920+ "7 = Serial Number/Vendor/Model (SNVM) SNVM is 3 strings "
4921+ "representing the vendor name, product name within the "
4922+ "vendor namespace, and the serial number within the model "
4923+ "namespace. Strings are delimited with a \'+\'. Spaces "
4924+ "may be included and are significant. The serial number "
4925+ "is the text representation of the serial number in "
4926+ "hexadecimal upper case. This represents the vendor and "
4927+ "model ID from SCSI Inquiry data; the vendor field MUST "
4928+ "be 8 characters wide and the product field MUST be 16 "
4929+ "characters wide. For example, \n"
4930+ "\'ACME____+SUPER DISK______+124437458\' (_ is a space "
4931+ "character) \n"
4932+ "9 = NAA as a generic format. See \n"
4933+ "http://standards.ieee.org/regauth/oui/tutorials/fibrecomp_id.html. "
4934+ "Formatted as 16 or 32 unseparated uppercase hex "
4935+ "characters (2 per binary byte). For example "
4936+ "\'21000020372D3C73\' \n"
4937+ "10 = EUI as a generic format (EUI64) See \n"
4938+ "http://standards.ieee.org/regauth/oui/tutorials/EUI64.html. \n"
4939+ "Formatted as 16 unseparated uppercase hex characters (2 "
4940+ "per binary byte) \n"
4941+ "11 = T10 vendor identifier format as returned by SCSI "
4942+ "Inquiry VPD page 83, identifier type 1. See T10 SPC-3 "
4943+ "specification. This is the 8-byte ASCII vendor ID from "
4944+ "the T10 registry followed by a vendor specific ASCII "
4945+ "identifier; spaces are permitted. For non SCSI volumes, "
4946+ "\'SNVM\' may be the most appropriate choice. 12 = OS "
4947+ "Device Name (for LogicalDisks). See LogicalDisk Name "
4948+ "description for details." ),
4949+ ValueMap { "0", "1", "7", "9", "10", "11", "12", ".." },
4950+ Values { "Unknown", "Other", "SNVM", "NAA", "EUI64",
4951+ "T10VID", "OS Device Name", "DMTF Reserved" },
4952+ ModelCorrespondence {
4953+ "CIM_StorageAllocationSettingData.HostExtentName",
4954+ "CIM_StorageAllocationSettingData.OtherHostExtentNameFormat",
4955+ "CIM_StorageExtent.NameFormat" }]
4956+ uint16 HostExtentNameFormat;
4957+
4958+ [Description (
4959+ "A string describing the format of the HostExtentName "
4960+ "property if the value of the HostExtentNameFormat "
4961+ "property is 1 (Other)." ),
4962+ ModelCorrespondence {
4963+ "CIM_StorageAllocationSettingData.HostExtentNameFormat" }]
4964+ string OtherHostExtentNameFormat;
4965+
4966+ [Description (
4967+ "If the host extent is a SCSI volume, then the preferred "
4968+ "source for SCSI volume names is SCSI VPD Page 83 responses.\n"
4969+ "NOTE: This property is a copy of the "
4970+ "CIM_StorageExtent.NameNamespace property. See the "
4971+ "description of CIM_StorageExtent.NameNamespace class for details.\n"
4972+ "Page 83 returns a list of identifiers for various device "
4973+ "elements. The metadata for each identifier includes an "
4974+ "Association field, identifiers with association of 0 "
4975+ "apply to volumes. Page 83 supports several namespaces "
4976+ "specified in the Type field in the identifier metadata. "
4977+ "See SCSI SPC-3 specification. \n"
4978+ "2 = VPD Page 83, Type 3 NAA (NameFormat SHOULD be NAA) \n"
4979+ "3 = VPD Page 83, Type 2 EUI64 (NameFormat EUI) \n"
4980+ "4 = VPD Page 83, Type 1 T10 Vendor Identification \n"
4981+ "(NameFormat T10) \n"
4982+ "Less preferred volume namespaces from other interfaces: \n"
4983+ "5 = VPD page 80, Serial number (NameFormat SHOULD be "
4984+ "Other) \n"
4985+ "6 = FC NodeWWN (NameFormat SHOULD be NAA or EUI) \n"
4986+ "7 = Serial Number/Vendor/Model (NameFormat SHOULD be "
4987+ "SNVM) cThe preferred namespace for LogigicalDisk names "
4988+ "is platform specific device namespace; see LogigicalDIsk "
4989+ "Description. \n"
4990+ "8 = OS Device Namespace." ),
4991+ ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", ".." },
4992+ Values { "Unknown", "Other", "VPD83Type3", "VPD83Type2",
4993+ "VPD83Type1", "VPD80", "NodeWWN", "SNVM",
4994+ "OS Device Namespace", "DMTF Reserved" },
4995+ ModelCorrespondence {
4996+ "CIM_StorageAllocationSettingData.HostExtentName",
4997+ "CIM_StorageAllocationSettingData.OtherHostExtentNameNamespace",
4998+ "CIM_StorageAllocationSettingData.HostExtentNameFormat",
4999+ "CIM_StorageExtent.Namespace" }]
5000+ uint16 HostExtentNameNamespace;
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: