update/delete methods done on YumInstalledPackage

enumerating YumPackage now yields all available packages
 - removed update, delete and check_integrity methods
 - added Install method
 - SoftwareElementState now equals to:
     1 ("Installable") - for not installed and available package
     2 ("Executable")  - for installed package

enumerating YumInstalledPackage now yields all installed packages
 - added update, delete and check_integrity methods

1 files changed, 63 insertions, 38 deletions

diff --git a/mof/LMI_Yum.mof b/mof/LMI_Yum.mof
index 5e24598..bdc2a9e 100644
--- a/mof/LMI_Yum.mof
+++ b/mof/LMI_Yum.mof
@@ -377,47 +377,15 @@ class LMI_YumPackage : CIM_SoftwareElement {
   uint64 Size;
 
     [ Description (
-        "Updates the package to latest version."
-        " When any of \"epoch\", \"version\" or \"release\" argument is given"
-        ", install only matching available package. Otherwise try"
-        " to update to newest package available."
-        " If the \"epoch\", \"version\" and \"release\" of package is"
-        " already installed, or no newer package is available,"
-        " \"Already newest\" value is returned."),
+        "Will install available package."),
       ValueMap { "0", "1", "2" },
-      Values { "Already newest", "Successful installation", "Failed" } ]
-  uint16 Update(
-      [ IN(true), Description (
-          "Specify particular epoch of package to update to."
-          " Update to newest, when empty.") ]
-    String Epoch,
-      [ IN(true), Description (
-          "Specify particular version of package to update to."
-          " Update to newest, when empty") ]
-    String Version,
-      [ IN(true), Description (
-          "Specify particular release of package to update to."
-          " Update to newest, when empty.") ]
-    String Release,
+      Values { "Already installed", "Successful installation", "Failed" } ]
+  uint32 Install(
       [ IN(false), OUT, Description (
           "The reference to newly installed package, if installation was"
-          " successful. Otherwise reference to current package.") ]
-    LMI_YumPackage REF Installed
-  );
-
-    [ Description (
-        "Verify existence and attributes of files installed from"
-        " RPM package. If all files installed exist and their attributes"
-        " matches, method returns \"Pass\". \"Not passed\" is returned when"
-        " arbitrary file differs in its attributes. And \"Error\" if"
-        " verification could not be done."),
-      ValueMap { "0", "1", "2" },
-      Values { "Pass", "Not passed", "Error" } ]
-  uint32 CheckIntegrity(
-      [ IN(false), OUT, Description (
-          "Array of references to LMI_YumFileCheck, that did not pass"
-          " verification.") ]
-    LMI_YumFileCheck REF Failed[]
+          " successful. Reference to current package if it is already"
+          " installed and Null otherwise.") ]
+    LMI_YumInstalledPackage REF Installed
   );
 
 };
@@ -568,6 +536,7 @@ class LMI_YumFileCheck : CIM_FileSpecification {
 // ===================================================================
 [ Association ]
 class LMI_YumInstalledPackage : CIM_InstalledSoftwareElement {
+
     [ Key, Description (
         "Reference to the installed RPM package.")]
   LMI_YumPackage REF Software;
@@ -577,5 +546,61 @@ class LMI_YumInstalledPackage : CIM_InstalledSoftwareElement {
         "Reference to the ComputerSystem hosting a particular"
         " RPM package.")]
   LMI_ComputerSystem REF System;
+
+    [ Description (
+        "Updates the package to latest version."
+        " When any of \"epoch\", \"version\" or \"release\" argument is given"
+        ", install only matching available package. Otherwise try"
+        " to update to newest package available."
+        " If the \"epoch\", \"version\" and \"release\" of package is"
+        " already installed, or no newer package is available,"
+        " \"Already newest\" value is returned."),
+      ValueMap { "0", "1", "2" },
+      Values { "Already newest", "Successful installation", "Failed" } ]
+  uint16 Update(
+      [ IN(true), Description (
+          "Specify particular epoch of package to update to."
+          " Update to newest, when empty.") ]
+    String Epoch,
+      [ IN(true), Description (
+          "Specify particular version of package to update to."
+          " Update to newest, when empty") ]
+    String Version,
+      [ IN(true), Description (
+          "Specify particular release of package to update to."
+          " Update to newest, when empty.") ]
+    String Release,
+      [ IN(false), OUT, Description (
+          "The reference to newly installed package, if installation was"
+          " successful. Otherwise reference to current package.") ]
+    LMI_YumInstalledPackage REF Installed
+  );
+
+    [ Description (
+        "Verify existence and attributes of files installed from"
+        " RPM package. If all files installed exist and their attributes"
+        " matches, method returns \"Pass\". \"Not passed\" is returned when"
+        " arbitrary file differs in its attributes. And \"Error\" if"
+        " verification could not be done."),
+      ValueMap { "0", "1", "2" },
+      Values { "Pass", "Not passed", "Error" } ]
+  uint32 CheckIntegrity(
+      [ IN(false), OUT, Description (
+          "Array of references to LMI_YumFileCheck, that did not pass"
+          " verification.") ]
+    LMI_YumFileCheck REF Failed[]
+  );
+
+};
+
+[ Association ]
+class LMI_YumPackageFile : CIM_SoftwareElementChecks {
+
+    [ Key, Aggregate, Min(1), Max(1),
+      Description ("The RPM package being checked")]
+  LMI_YumPackage REF Element;
+
+    [ Key, Weak, Description("The Check for the element.") ]
+  LMI_YumFileCheck REF Check;
 };