[openlmi-networking] Fix CQL in indication filters

[Radek Novacek]

commit 4776df5cd1dd2d84ac44c1397ad57ead11c2fa3f
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Sep 10 12:20:35 2013 +0200

    Fix CQL in indication filters

 ...orking-0.1.1-fix-cql-in-indicationfilters.patch |   35 ++++++++++++++++++++
 openlmi-networking.spec                            |    8 ++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/openlmi-networking-0.1.1-fix-cql-in-indicationfilters.patch b/openlmi-networking-0.1.1-fix-cql-in-indicationfilters.patch
new file mode 100644
index 0000000..54b5699
--- /dev/null
+++ b/openlmi-networking-0.1.1-fix-cql-in-indicationfilters.patch
@@ -0,0 +1,35 @@
+commit fb927fbeebd68aa6bf72941e4b53213fd55412f1
+Author: Radek Novacek <rnovacek at redhat.com>
+Date:   Tue Sep 10 10:53:13 2013 +0200
+
+    Fix nonfunctional CQL syntax in IndicationFilters
+    
+    Pegasus doesn't like some CQL constructs, replaced them with similar
+    (but simpler) ones.
+
+diff --git a/mof/70_LMI_NetworkingIndicationFilters.mof b/mof/70_LMI_NetworkingIndicationFilters.mof
+index e0608df..f106b7c 100644
+--- a/mof/70_LMI_NetworkingIndicationFilters.mof
++++ b/mof/70_LMI_NetworkingIndicationFilters.mof
+@@ -58,9 +58,8 @@ instance of CIM_IndicationFilter {
+     SystemName = "HOSTNAME";
+     Name = "LMI:LMI_NetworkJob:Failed";
+     Query = "SELECT * FROM LMI_NetworkInstModification WHERE "
+-            "SourceInstance ISA LMI_NetworkJob AND ANY "
+-            "SourceInstance.CIM_ConcreteJob::OperationalStatus[*] = 17 AND ANY "
+-            "SourceInstance.CIM_ConcreteJob::OperationalStatus[*] = 6";
++            "SourceInstance ISA LMI_NetworkJob AND "
++            "SourceInstance.CIM_ConcreteJob::JobState = 10";
+     QueryLanguage = "CIM:CQL";
+     Description = "Modification of Operational Status for a "
+             "Concrete Job to 'Completed' and 'Error'.";
+@@ -76,8 +75,7 @@ instance of CIM_IndicationFilter {
+     QueryLanguage = "CIM:CQL";
+     Query = "SELECT * FROM LMI_NetworkInstModification WHERE "
+             "SourceInstance ISA LMI_NetworkJob AND "
+-            "SourceInstance.CIM_ConcreteJob::OperationalStatus[*] = 17 AND ANY "
+-            "SourceInstance.CIM_ConcreteJob::OperationalStatus[*] = 2";
++            "SourceInstance.CIM_ConcreteJob::JobState = 7";
+     Description = "Modification of Operational Status for a "
+             "Concrete Job to 'Completed' and 'OK'.";
+     SourceNamespace = "root/cimv2";
diff --git a/openlmi-networking.spec b/openlmi-networking.spec
index 4f26ad5..7deb150 100644
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@ -2,12 +2,13 @@
 
 Name:           openlmi-networking
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CIM providers for network management
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
+Patch0:         openlmi-networking-0.1.1-fix-cql-in-indicationfilters.patch
 
 # Upstream name has been changed from cura-networking to openlmi-networking
 Provides:       cura-networking%{?_isa} = %{version}-%{release}
@@ -39,6 +40,8 @@ Common Information Model (CIM).
 
 %prep
 %setup -q
+# Fix CQL in indication filters
+%patch0 -p1
 
 
 %build
@@ -108,6 +111,9 @@ fi >> %logfile 2>&1
 
 
 %changelog
+* Tue Sep 10 2013 Radek Novacek <rnovacek at redhat.com> 0.1.1-2
+- Fix CQL in indication filters
+
 * Thu Aug 08 2013 Radek Novacek <rnovacek at redhat.com> 0.1.1-1
 - Version 0.1.1
 - Log registration to the log file