modified indication filters

And moved software static filters to shared JobManager.

Indication filters now reflect the name of indication class, which is
instrumented by particular provider. This ensures, that cimom knows,
which provider to call and does not bother the others. So instead of
selecting indication instances from general class CIM_InstModification,
it will be LMI_SoftwareInstModification. This is a common pattern for
indication queries.

Avoided another shortcoming of sfcbmof parser:
  /* comment */ something useful is also ignored :-(

Static filters of JobManager made more generic for any provider
to use. Software jobmanager is now using them. This reduces redundation
of code.

1 files changed, 11 insertions, 13 deletions

diff --git a/mof/70_LMI_SoftwareIndicationFilters.mof b/mof/70_LMI_SoftwareIndicationFilters.mof
index e3af599..b79917d 100644
--- a/mof/70_LMI_SoftwareIndicationFilters.mof
+++ b/mof/70_LMI_SoftwareIndicationFilters.mof
@@ -28,7 +28,7 @@ instance of CIM_IndicationFilter {
     SystemCreationClassName = "CIM_ComputerSystem";
     SystemName = "kvm-fedora18";
     Name = "LMI:LMI_SoftwareInstallationJob:PercentUpdated";
-    Query = "SELECT * FROM CIM_InstModification WHERE "
+    Query = "SELECT * FROM LMI_SoftwareInstModification WHERE "
             "SourceInstance ISA LMI_SoftwareInstallationJob AND "
             "SourceInstance.CIM_ConcreteJob::PercentComplete <> "
             "PreviousInstance.CIM_ConcreteJob::PercentComplete";
@@ -47,12 +47,11 @@ instance of CIM_IndicationFilter {
     SystemName = "kvm-fedora18";
     Name = "LMI:LMI_SoftwareInstallationJob:Succeeded";
     QueryLanguage = "CIM:CQL";
-    Query = "SELECT * FROM CIM_InstModification WHERE "
+    Query = "SELECT * FROM LMI_SoftwareInstModification WHERE "
             "SourceInstance ISA LMI_SoftwareInstallationJob AND "
-            "SourceInstance.CIM_ConcreteJob::JobState"
-            " = 17"
-            /* This is not supported by sfcb:
-             * " = CIM_ConcreteJob.JobState#'Completed'" */;
+            "SourceInstance.CIM_ConcreteJob::JobState = 17";
+    /* This is not supported by sfcb:
+     * " = CIM_ConcreteJob.JobState#'Completed'" */
     SourceNamespace = "root/cimv2";
     SourceNamespaces = {"root/cimv2"};
 };
@@ -62,12 +61,11 @@ instance of CIM_IndicationFilter {
     SystemCreationClassName = "CIM_ComputerSystem";
     SystemName = "kvm-fedora18";
     Name = "LMI:LMI_SoftwareInstallationJob:Failed";
-    Query = "SELECT * FROM CIM_InstModification WHERE "
+    Query = "SELECT * FROM LMI_SoftwareInstModification WHERE "
             "SourceInstance ISA LMI_SoftwareInstallationJob AND "
-            "SourceInstance.CIM_ConcreteJob::JobState"
-            " = 10"
-            /* This is not supported by sfcb:
-             * "CIM_ConcreteJob.JobState#'Exception'" */;
+            "SourceInstance.CIM_ConcreteJob::JobState = 10";
+    /* This is not supported by sfcb:
+     * "CIM_ConcreteJob.JobState#'Exception'" */
     QueryLanguage = "CIM:CQL";
     Description = "Modification of Operational Status for a "
             "Concrete Job to 'Complete' and 'OK'.";
@@ -80,7 +78,7 @@ instance of CIM_IndicationFilter {
     SystemCreationClassName = "CIM_ComputerSystem";
     SystemName = "kvm-fedora18";
     Name = "LMI:LMI_SoftwareInstallationJob:Changed";
-    Query = "SELECT * FROM CIM_InstModification WHERE "
+    Query = "SELECT * FROM LMI_SoftwareInstModification WHERE "
             "SourceInstance ISA LMI_SoftwareInstallationJob AND "
             "SourceInstance.CIM_ConcreteJob::JobState <> "
             "PreviousInstance.CIM_ConcreteJob::JobState";
@@ -95,7 +93,7 @@ instance of CIM_IndicationFilter {
     SystemCreationClassName = "CIM_ComputerSystem";
     SystemName = "kvm-fedora18";
     Name = "LMI:LMI_SoftwareInstallationJob:Created";
-    Query = "SELECT * FROM CIM_InstCreation WHERE"
+    Query = "SELECT * FROM LMI_SoftwareInstCreation WHERE"
             " SourceInstance ISA LMI_SoftwareInstallationJob";
     QueryLanguage = "CIM:CQL";
     Description = "Creation of a ConcreteJob.";