summaryrefslogtreecommitdiffstats
path: root/mof
diff options
context:
space:
mode:
authorJan Safranek <jsafrane@redhat.com>2013-09-27 15:33:46 +0200
committerJan Safranek <jsafrane@redhat.com>2013-09-30 10:57:38 +0200
commitbbcd40456f9e8ef8124816b1eb0ea7cd68806cf6 (patch)
treea0c2985fda0113b21f41b36ab0c3044ca2969d99 /mof
parent97dcfc0b8ef12ff22b0a756472c2e245ddc71b1d (diff)
downloadopenlmi-providers-bbcd40456f9e8ef8124816b1eb0ea7cd68806cf6.tar.gz
openlmi-providers-bbcd40456f9e8ef8124816b1eb0ea7cd68806cf6.tar.xz
openlmi-providers-bbcd40456f9e8ef8124816b1eb0ea7cd68806cf6.zip
Make Software MOF file parseable by openlmi-doc-class2rst
- don't use Linux_ classes - fix ValueMaps
Diffstat (limited to 'mof')
-rw-r--r--mof/60_LMI_Software.mof33
1 files changed, 16 insertions, 17 deletions
diff --git a/mof/60_LMI_Software.mof b/mof/60_LMI_Software.mof
index 1462479..4629094 100644
--- a/mof/60_LMI_Software.mof
+++ b/mof/60_LMI_Software.mof
@@ -255,7 +255,7 @@ class LMI_SoftwareIdentityResource : CIM_SoftwareIdentityResource {
class LMI_HostedSoftwareCollection : CIM_HostedCollection {
[Override("Antecedent")]
- Linux_ComputerSystem REF Antecedent;
+ CIM_ComputerSystem REF Antecedent;
[Override("Dependent")]
LMI_SystemSoftwareCollection REF Dependent;
@@ -280,7 +280,7 @@ class LMI_InstalledSoftwareIdentity : CIM_InstalledSoftwareIdentity {
LMI_SoftwareIdentity REF InstalledSoftware;
[Override("System")]
- Linux_ComputerSystem REF System;
+ CIM_ComputerSystem REF System;
};
@@ -299,7 +299,7 @@ class LMI_ResourceForSoftwareIdentity : CIM_SAPAvailableForElement {
class LMI_HostedSoftwareIdentityResource : CIM_HostedAccessPoint {
[Override("Antecedent")]
- Linux_ComputerSystem REF Antecedent;
+ CIM_ComputerSystem REF Antecedent;
[Override("Dependent")]
LMI_SoftwareIdentityResource REF Dependent;
@@ -330,7 +330,7 @@ class LMI_SoftwareJob : LMI_ConcreteJob {
[Implemented(true), Override("JobStatus")]
string JobStatus;
- [Implemented(true), Override("MethodName")]
+ [ImplemEnted(true), Override("MethodName")]
string MethodName;
[Implemented(true), Override("Priority")]
@@ -406,7 +406,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
uint32 CheckSoftwareIdentity(
[IN, Description (
"Reference to the SoftwareIdentity to be checked." )]
- LMI_SoftwareIdentity REF Source,
+ CIM_SoftwareIdentity REF Source,
[IN, Description (
"Reference to the ManagedElement that the Software "
"Identity is going to be installed in (or updated)." )]
@@ -414,7 +414,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
[IN, Description (
"Reference to the Collection to which the Software "
"Identity will be added." )]
- LMI_SystemSoftwareCollection REF Collection,
+ CIM_Collection REF Collection,
[IN ( false ), OUT, Description (
"The parameter describes the characteristics of the "
"installation/update that will take place if the "
@@ -463,7 +463,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
[IN ( false ), OUT, Description (
"Reference to the job (may be null if job completed)."
)]
- LMI_SoftwareInstallationJob REF Job,
+ CIM_ConcreteJob REF Job,
[IN, Description (
"Options to control the install process.\n"
"Defer target/system reset : do not automatically "
@@ -535,7 +535,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
string InstallOptionsValues[],
[IN, Description (
"Reference to the source of the install." )]
- LMI_SoftwareIdentity REF Source,
+ CIM_SoftwareIdentity REF Source,
[IN, Description (
"The installation target. If NULL then the "
"SOftwareIdentity will be added to Collection only. "
@@ -547,14 +547,14 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
"Reference to the Collection to which the Software "
"Identity SHALL be added. If NULL then the Software "
"Identity will not be added to a Collection." )]
- LMI_SystemSoftwareCollection REF Collection);
+ CIM_Collection REF Collection);
[Implemented(True), Override("InstallFromURI")]
uint32 InstallFromURI(
[IN ( false ), OUT, Description (
"Reference to the job (may be null if job completed)."
)]
- LMI_SoftwareInstallationJob REF Job,
+ CIM_ConcreteJob REF Job,
[IN, Description (
"A URI for the software based on RFC 2079." )]
string URI,
@@ -608,7 +608,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
"will contain all associated file checks, that did not pass. "
"In the latter case this property will be NULL."),
ValueMap { "0", "1", "2", "3", "4", "5", "6", "..", "4096"
- , "4097", "4098", "4099..32767"
+ , "4097", "4098..32767"
, "32768", "32769..65535" },
Values { "Job Completed with No Error", "Not Supported"
, "Unspecified Error", "Timeout", "Failed"
@@ -617,20 +617,19 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
, "Method Parameters Checked - Job Started"
, "Unsupported TargetType"
, "Method Reserved"
- // 32768
, "Software Identity Not Installed"
, "Vendor Specific" }]
uint32 VerifyInstalledIdentity(
[IN, Description(
"Reference to the installed SoftwareIdentity to be verified.")]
- LMI_SoftwareIdentity REF Source,
+ CIM_SoftwareIdentity REF Source,
[IN, Description(
"Reference to the ManagedElement that the Software "
"Identity is installed on." )]
CIM_ManagedElement REF Target,
[IN ( false ), OUT, Description(
"Reference to the job (may be null if job completed).")]
- LMI_SoftwareVerificationJob REF Job,
+ CIM_ConcreteJob REF Job,
[IN ( false ), OUT, Description(
"Array of file checks that did not pass verification."
" This is NULL in case that asynchronous job has been started.")]
@@ -757,7 +756,7 @@ class LMI_AssociatedSoftwareInstallationServiceCapabilities :
class LMI_HostedSoftwareInstallationService : CIM_HostedService {
[Override("Antecedent")]
- Linux_ComputerSystem REF Antecedent;
+ CIM_ComputerSystem REF Antecedent;
[Override("Dependent")]
LMI_SoftwareInstallationService REF Dependent;
@@ -861,7 +860,7 @@ class LMI_SoftwareIdentityFileCheck : CIM_FileSpecification {
" only on regular files."),
ValueMap { "0", "1", "2", "3"
, "4", "5", "6", "7"
- , "8", "9" },
+ , "8" },
Values { "Existence", "FileSize", "FileMode", "Checksum"
, "Device Number", "LinkTarget", "UserID", "GroupID"
, "Last Modification Time" }]
@@ -991,7 +990,7 @@ class LMI_SoftwareIdentityFileCheck : CIM_FileSpecification {
[IN, Description(
"Reference to ComputerSystem in whose context the "
"method is to be invoked.")]
- Linux_ComputerSystem REF TargetSystem);
+ CIM_ComputerSystem REF TargetSystem);
};