added new providers

providers added:
 * LMI_AffectedSoftwareJobElement
 * LMI_AssociatedSoftwareJobMethodResult
 * LMI_OwningSoftwareJobElement
 * LMI_SoftwareMethodResult

subclassed job classes defined in LMI_Jobs.mof

2 files changed, 54 insertions, 38 deletions

diff --git a/mof/LMI_Software.mof b/mof/LMI_Software.mof
index f964ec4..6538f18 100644
--- a/mof/LMI_Software.mof
+++ b/mof/LMI_Software.mof
@@ -547,7 +547,7 @@ class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
 
 };
 
-class LMI_SoftwareInstallationJob : CIM_ConcreteJob {
+class LMI_SoftwareInstallationJob : LMI_ConcreteJob {
 
   [Implemented(true), Override("InstanceID")]
   string InstanceID;
@@ -558,65 +558,56 @@ class LMI_SoftwareInstallationJob : CIM_ConcreteJob {
   [Implemented(true), Override("CommunicationStatus")]
   uint16 CommunicationStatus;
 
-  [Implemented(true), Override("DeleteOnCompletion")]
-  boolean DeleteOnCompletion;
-
   [Implemented(true), Override("Description")]
   string Description;
 
-  [Implemented(true), Override("ElapsedTime")]
-  datetime ElapsedTime;
-  
-  [Implemented(true), Override("ElementName")]
-  string ElementName;
-
   [Implemented(true), Override("ErrorCode")]
   uint16 ErrorCode;
 
-  [Implemented(true), Override("ErrorDescription")]
-  string ErrorDescription;
-
-  [Implemented(true), Override("JobState")]
-  uint16 JobState;
-
   [Implemented(true), Override("JobStatus")]
   string JobStatus;
 
   [Implemented(true), Override("MethodName")]
   string MethodName;
 
-  [Implemented(true), Override("Name")]
-  string Name;
-
-  [Implemented(true), Override("OperationalStatus")]
-  uint16 OperationalStatus[];
-
-  [Implemented(true), Override("Owner")]
-  string Owner;
-
-  [Implemented(true), Override("PercentComplete")]
-  uint16 PercentComplete;
-
   [Implemented(true), Override("Priority")]
   uint32 Priority;
 
   [Implemented(true), Override("RecoveryAction")]
   uint16 RecoveryAction;
 
-  [Implemented(true), Override("StartTime")]
-  datetime StartTime;
+};
 
-  [Implemented(true), Override("StatusDescriptions")]
-  string StatusDescriptions[];
+class LMI_SoftwareMethodResult : LMI_MethodResult {
+};
 
-  [Implemented(true), Override("TimeBeforeRemoval")]
-  datetime TimeBeforeRemoval;
+[Association]
+class LMI_AssociatedSoftwareJobMethodResult : LMI_AssociatedJobMethodResult {
 
-  [Implemented(true), Override("TimeOfLastStateChange")]
-  datetime TimeOfLastStateChange;
+  [Override("Job")]
+  LMI_SoftwareInstallationJob REF Job;
+
+  [Override("JobParameters")]
+  LMI_SoftwareMethodResult REF JobParameters;
+
+};
+
+[Association]
+class LMI_OwningSoftwareJobElement : LMI_OwningJobElement {
+  
+  [Override("OwningElement")]
+  LMI_SoftwareInstallationService REF OwningElement;
+
+  [Override("OwnedElement")]
+  LMI_SoftwareInstallationJob REF OwnedElement;
+
+};
+
+[Association]
+class LMI_AffectedSoftwareJobElement : LMI_AffectedJobElement {
 
-  [Implemented(true), Override("TimeSubmitted")]
-  datetime TimeSubmitted;
+  [Override("AffectingElement")]
+  LMI_SoftwareInstallationJob REF AffectingElement;
 
 };
 
diff --git a/mof/LMI_Software.reg b/mof/LMI_Software.reg
index 66cd50f..1c98fab 100644
--- a/mof/LMI_Software.reg
+++ b/mof/LMI_Software.reg
@@ -57,3 +57,28 @@
    location: pyCmpiProvider
    type: instance method
    namespace: root/cimv2
+
+[LMI_SoftwareMethodResult]
+   provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py
+   location: pyCmpiProvider
+   type: instance
+   namespace: root/cimv2
+
+[LMI_AssociatedSoftwareJobMethodResult]
+   provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py
+   location: pyCmpiProvider
+   type: instance association
+   namespace: root/cimv2
+
+[LMI_OwningSoftwareJobElement]
+   provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py
+   location: pyCmpiProvider
+   type: instance association
+   namespace: root/cimv2
+
+[LMI_AffectedSoftwareJobElement]
+   provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py
+   location: pyCmpiProvider
+   type: instance association
+   namespace: root/cimv2
+