made software mof file more organized

just added few comments and grouped various classes under them

1 files changed, 91 insertions, 74 deletions

diff --git a/mof/60_LMI_Software.mof b/mof/60_LMI_Software.mof
index 9f2f2ce..12b4f9d 100644
--- a/mof/60_LMI_Software.mof
+++ b/mof/60_LMI_Software.mof
@@ -21,6 +21,9 @@
 #pragma locale ("en_US")
 //#pragma namespace ("root/cimv2")
 
+/* ****************************************************************************
+ * Central class of Software Inventory and Update profiles
+ */
 class LMI_SoftwareIdentity : CIM_SoftwareIdentity {
 
     [Implemented(true), Override("InstanceID"), Description(
@@ -78,6 +81,9 @@ class LMI_SoftwareIdentity : CIM_SoftwareIdentity {
 
 };
 
+/******************************************************************************
+ * Software inventory classes
+ */
 class LMI_SystemSoftwareCollection : CIM_SystemSpecificCollection {
 
     [Implemented(true), Override("InstanceID")]
@@ -88,39 +94,6 @@ class LMI_SystemSoftwareCollection : CIM_SystemSpecificCollection {
 
 };
 
-[Association]
-class LMI_HostedSoftwareCollection : CIM_HostedCollection {
-
-  [Override("Antecedent")]
-  Linux_ComputerSystem REF Antecedent;
-
-  [Override("Dependent")]
-  LMI_SystemSoftwareCollection REF Dependent;
-
-};
-
-[Association]
-class LMI_MemberOfSoftwareCollection : CIM_MemberOfCollection {
-
-  [Override("Collection")]
-  LMI_SystemSoftwareCollection REF Collection;
-
-  [Override("Member")]
-  LMI_SoftwareIdentity REF Member;
-
-};
-
-[Association]
-class LMI_InstalledSoftwareIdentity : CIM_InstalledSoftwareIdentity {
-
-  [Override("InstalledSoftware")]
-  LMI_SoftwareIdentity REF InstalledSoftware;
-
-  [Override("System")]
-  Linux_ComputerSystem REF System;
-
-};
-
 class LMI_SoftwareIdentityResource : CIM_SoftwareIdentityResource {
 
   [Implemented(true), Override("CreationClassName")]
@@ -272,6 +245,42 @@ class LMI_SoftwareIdentityResource : CIM_SoftwareIdentityResource {
 
 };
 
+/******************************************************************************
+ * Software inventory associations
+ */
+[Association]
+class LMI_HostedSoftwareCollection : CIM_HostedCollection {
+
+  [Override("Antecedent")]
+  Linux_ComputerSystem REF Antecedent;
+
+  [Override("Dependent")]
+  LMI_SystemSoftwareCollection REF Dependent;
+
+};
+
+[Association]
+class LMI_MemberOfSoftwareCollection : CIM_MemberOfCollection {
+
+  [Override("Collection")]
+  LMI_SystemSoftwareCollection REF Collection;
+
+  [Override("Member")]
+  LMI_SoftwareIdentity REF Member;
+
+};
+
+[Association]
+class LMI_InstalledSoftwareIdentity : CIM_InstalledSoftwareIdentity {
+
+  [Override("InstalledSoftware")]
+  LMI_SoftwareIdentity REF InstalledSoftware;
+
+  [Override("System")]
+  Linux_ComputerSystem REF System;
+
+};
+
 [Association]
 class LMI_ResourceForSoftwareIdentity : CIM_SAPAvailableForElement {
 
@@ -294,6 +303,9 @@ class LMI_HostedSoftwareIdentityResource : CIM_HostedAccessPoint {
 
 };
 
+/******************************************************************************
+ * Software update profile classes
+ */
 class LMI_SoftwareInstallationService : CIM_SoftwareInstallationService {
 
   [Implemented(true), Override("CreationClassName")]
@@ -576,47 +588,6 @@ class LMI_SoftwareInstallationServiceCapabilities :
 
 };
 
-[Association]
-class LMI_AssociatedSoftwareInstallationServiceCapabilities :
-        CIM_ElementCapabilities {
-
-  [Override("Capabilities")]
-  LMI_SoftwareInstallationServiceCapabilities REF Capabilities;
-
-  [Override("ManagedElement")]
-  LMI_SoftwareInstallationService REF ManagedElement;
-
-  [Implemented(true), Override("Characteristics")]
-  uint16 Characteristics[];
-
-};
-
-[Association]
-class LMI_HostedSoftwareInstallationService : CIM_HostedService {
-
-  [Override("Antecedent")]
-  Linux_ComputerSystem REF Antecedent;
-
-  [Override("Dependent")]
-  LMI_SoftwareInstallationService REF Dependent;
-
-};
-
-[Association]
-class LMI_SoftwareInstallationServiceAffectsElement :
-        CIM_ServiceAffectsElement {
-
-  [Override("AffectingElement")]
-  LMI_SoftwareInstallationService REF AffectingElement;
-
-  [Implemented(true), Override("ElementEffects")]
-  uint16 ElementEffects[];
-
-  [Implemented(true), Override("OtherElementEffectsDescriptions")]
-  string OtherElementEffectsDescriptions[];
-
-};
-
 class LMI_SoftwareInstallationJob : LMI_ConcreteJob {
 
   [Implemented(true), Override("InstanceID")]
@@ -651,6 +622,9 @@ class LMI_SoftwareInstallationJob : LMI_ConcreteJob {
 class LMI_SoftwareMethodResult : LMI_MethodResult {
 };
 
+/******************************************************************************
+ * Software update associations
+ */
 [Association]
 class LMI_AssociatedSoftwareJobMethodResult : LMI_AssociatedJobMethodResult {
 
@@ -681,6 +655,49 @@ class LMI_AffectedSoftwareJobElement : LMI_AffectedJobElement {
 
 };
 
+[Association]
+class LMI_AssociatedSoftwareInstallationServiceCapabilities :
+        CIM_ElementCapabilities {
+
+  [Override("Capabilities")]
+  LMI_SoftwareInstallationServiceCapabilities REF Capabilities;
+
+  [Override("ManagedElement")]
+  LMI_SoftwareInstallationService REF ManagedElement;
+
+  [Implemented(true), Override("Characteristics")]
+  uint16 Characteristics[];
+
+};
+
+[Association]
+class LMI_HostedSoftwareInstallationService : CIM_HostedService {
+
+  [Override("Antecedent")]
+  Linux_ComputerSystem REF Antecedent;
+
+  [Override("Dependent")]
+  LMI_SoftwareInstallationService REF Dependent;
+
+};
+
+[Association]
+class LMI_SoftwareInstallationServiceAffectsElement :
+        CIM_ServiceAffectsElement {
+
+  [Override("AffectingElement")]
+  LMI_SoftwareInstallationService REF AffectingElement;
+
+  [Implemented(true), Override("ElementEffects")]
+  uint16 ElementEffects[];
+
+  [Implemented(true), Override("OtherElementEffectsDescriptions")]
+  string OtherElementEffectsDescriptions[];
+
+};
+
+/******************************************************************************
+ * Software update indications
 [Indication]
 class LMI_SoftwareInstCreation : CIM_InstCreation {
 };