Hardware: added "Implemented(true)" qualifier for all supported properties

1 files changed, 900 insertions, 60 deletions

diff --git a/mof/60_LMI_Hardware.mof b/mof/60_LMI_Hardware.mof
index adef642..342f0e3 100644
--- a/mof/60_LMI_Hardware.mof
+++ b/mof/60_LMI_Hardware.mof
@@ -26,11 +26,11 @@
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_Processor") ]
 class LMI_Processor: CIM_Processor
 {
-    [ Description("System architecture.") ]
+    [ Implemented(true), Description("System architecture.") ]
     string Architecture;
 
     /* Added "Multi-Core" characteristic from dmidecode program. */
-    [ Override("Characteristics"),
+    [ Implemented(true), Override("Characteristics"),
     ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9..32567",
         "32568", "32569..65535" },
     Values { "Unknown", "DMTF Reserved", "64-bit Capable", "32-bit Capable",
@@ -41,7 +41,7 @@ class LMI_Processor: CIM_Processor
 
     /* Flag IDs and names are based on:
        linux-3.8/arch/x86/include/asm/cpufeature.h */
-    [ Description ("Flags supported by Processor. "
+    [ Implemented(true), Description ("Flags supported by Processor. "
         "(Available only for x86 architecture.)"),
     ValueMap {
         /* 0*32 */
@@ -115,60 +115,231 @@ class LMI_Processor: CIM_Processor
         "fsgsbase", "tsc_adjust", "bmi1", "hle", "avx2", "smep", "bmi2",
         "erms", "invpcid", "rtm", "rdseed", "adx", "smap" } ]
     uint16 Flags[];
+
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("Family") ]
+    uint16 Family;
+
+    [ Implemented(true), Override("OtherFamilyDescription") ]
+    string OtherFamilyDescription;
+
+    [ Implemented(true), Override("UpgradeMethod") ]
+    uint16 UpgradeMethod;
+
+    [ Implemented(true), Override("Role") ]
+    string Role;
+
+    [ Implemented(true), Override("EnabledProcessorCharacteristics") ]
+    uint16 EnabledProcessorCharacteristics[];
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("CPUStatus") ]
+    uint16 CPUStatus;
+
+    [ Implemented(true), Override("EnabledState") ]
+    uint16 EnabledState;
+
+    [ Implemented(true), Override("NumberOfEnabledCores") ]
+    uint16 NumberOfEnabledCores;
+
+    [ Implemented(true), Override("CurrentClockSpeed") ]
+    uint32 CurrentClockSpeed;
+
+    [ Implemented(true), Override("MaxClockSpeed") ]
+    uint32 MaxClockSpeed;
+
+    [ Implemented(true), Override("ExternalBusClockSpeed") ]
+    uint32 ExternalBusClockSpeed;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("UniqueID") ]
+    string UniqueID;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Stepping") ]
+    string Stepping;
+
+    [ Implemented(true), Override("DataWidth") ]
+    uint16 DataWidth;
+
+    [ Implemented(true), Override("AddressWidth") ]
+    uint16 AddressWidth;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorCapabilities") ]
 class LMI_ProcessorCapabilities: CIM_ProcessorCapabilities
 {
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("NumberOfProcessorCores") ]
+    uint16 NumberOfProcessorCores;
+
+    [ Implemented(true), Override("NumberOfHardwareThreads") ]
+    uint16 NumberOfHardwareThreads;
+
+    [ Implemented(true), Override("ElementNameEditSupported") ]
+    boolean ElementNameEditSupported;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorElementCapabilities"), Association ]
 class LMI_ProcessorElementCapabilities: CIM_ElementCapabilities
 {
-    [Override("ManagedElement")]
+    [ Override("ManagedElement") ]
     LMI_Processor REF ManagedElement;
 
-    [Override("Capabilities")]
+    [ Override("Capabilities") ]
     LMI_ProcessorCapabilities REF Capabilities;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorCacheMemory") ]
 class LMI_ProcessorCacheMemory: CIM_Memory
 {
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("BlockSize") ]
+    uint64 BlockSize;
+
+    [ Implemented(true), Override("Volatile") ]
+    boolean Volatile;
+
+    [ Implemented(true), Override("Access") ]
+    uint16 Access;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("IsCompressed") ]
+    boolean IsCompressed;
+
+    [ Implemented(true), Override("Purpose") ]
+    string Purpose;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("NumberOfBlocks") ]
+    uint64 NumberOfBlocks;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("EnabledState") ]
+    uint16 EnabledState;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_AssociatedProcessorCacheMemory"), Association ]
 class LMI_AssociatedProcessorCacheMemory: CIM_AssociatedCacheMemory
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_ProcessorCacheMemory REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     LMI_Processor REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorChip") ]
 class LMI_ProcessorChip: CIM_Chip
 {
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("Model") ]
+    string Model;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("PartNumber") ]
+    string PartNumber;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorChipRealizes"), Association ]
 class LMI_ProcessorChipRealizes: CIM_Realizes
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_ProcessorChip REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     LMI_Processor REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorSystemDevice"), Association ]
 class LMI_ProcessorSystemDevice: CIM_SystemDevice
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     CIM_ComputerSystem REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_Processor REF PartComponent;
 };
 
@@ -179,50 +350,160 @@ class LMI_ProcessorSystemDevice: CIM_SystemDevice
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_Memory") ]
 class LMI_Memory: CIM_Memory
 {
-    [ Description("Indicates whether memory has NUMA layout.") ]
+    [ Implemented(true), Description("Indicates whether memory has NUMA layout.") ]
     boolean HasNUMA;
 
-    [ Description("Standard memory page size in kB."),
+    [ Implemented(true), Description("Standard memory page size in kB."),
       Units("Kilobytes"), PUnit("kilobyte")]
     uint32 StandardMemoryPageSize;
 
-    [ Description("All supported huge memory page sizes in currently "
-        "running kernel in kB."),
+    [ Implemented(true), Description("All supported huge memory page sizes in "
+        "currently running kernel in kB."),
       Units("Kilobytes"), PUnit("kilobyte")]
     uint32 SupportedHugeMemoryPageSizes[];
 
-    [ Description ("Current state of the transparent huge memory pages. The "
-        "state can be \"Unsupported\", what means that the feature is not "
-        "available on the system, \"Never\" when the feature is disabled, "
-        "\"Madvise\" when huge pages are used only in marked memory area or "
-        "\"Always\" when this feature is used all the time. "),
+    [ Implemented(true), Description ("Current state of the transparent huge "
+        "memory pages. The state can be \"Unsupported\", what means that the "
+        "feature is not available on the system, \"Never\" when the feature is "
+        "disabled, \"Madvise\" when huge pages are used only in marked memory "
+        "area or \"Always\" when this feature is used all the time. "),
     ValueMap { "0", "1", "2", "3" },
     Values { "Unsupported", "Never", "Madvise", "Always" } ]
     uint16 TransparentHugeMemoryPageStatus;
+
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("BlockSize") ]
+    uint64 BlockSize;
+
+    [ Implemented(true), Override("Volatile") ]
+    boolean Volatile;
+
+    [ Implemented(true), Override("Access") ]
+    uint16 Access;
+
+    [ Implemented(true), Override("EnabledState") ]
+    uint16 EnabledState;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("IsCompressed") ]
+    boolean IsCompressed;
+
+    [ Implemented(true), Override("Purpose") ]
+    string Purpose;
+
+    [ Implemented(true), Override("NumberOfBlocks") ]
+    uint64 NumberOfBlocks;
+
+    [ Implemented(true), Override("ConsumableBlocks") ]
+    uint64 ConsumableBlocks;
+
+    [ Implemented(true), Override("StartingAddress") ]
+    uint64 StartingAddress;
+
+    [ Implemented(true), Override("EndingAddress") ]
+    uint64 EndingAddress;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PhysicalMemory") ]
 class LMI_PhysicalMemory: CIM_PhysicalMemory
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("Capacity") ]
+    uint64 Capacity;
+
+    [ Implemented(true), Override("FormFactor") ]
+    uint16 FormFactor;
+
+    [ Implemented(true), Override("MemoryType") ]
+    uint16 MemoryType;
+
+    [ Implemented(true), Override("Speed") ]
+    uint32 Speed;
+
+    [ Implemented(true), Override("BankLabel") ]
+    string BankLabel;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("PartNumber") ]
+    string PartNumber;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("ConfiguredMemoryClockSpeed") ]
+    uint32 ConfiguredMemoryClockSpeed;
+
+    [ Implemented(true), Override("TotalWidth") ]
+    uint16 TotalWidth;
+
+    [ Implemented(true), Override("DataWidth") ]
+    uint16 DataWidth;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PhysicalMemoryRealizes"), Association ]
 class LMI_PhysicalMemoryRealizes: CIM_Realizes
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_PhysicalMemory REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     LMI_Memory REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_MemorySystemDevice"), Association ]
 class LMI_MemorySystemDevice: CIM_SystemDevice
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     CIM_ComputerSystem REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_Memory REF PartComponent;
 };
 
@@ -233,121 +514,370 @@ class LMI_MemorySystemDevice: CIM_SystemDevice
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_Chassis") ]
 class LMI_Chassis: CIM_Chassis
 {
-    [ Description("Product name.") ]
+    [ Implemented(true), Description("Product name.") ]
     string ProductName;
 
-    [ Description("UUID.") ]
+    [ Implemented(true), Description("UUID.") ]
     string UUID;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("PackageType") ]
+    uint16 PackageType;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("ChassisPackageType") ]
+    uint16 ChassisPackageType;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("SKU") ]
+    string SKU;
+
+    [ Implemented(true), Override("Version") ]
+    string Version;
+
+    [ Implemented(true), Override("LockPresent") ]
+    boolean LockPresent;
+
+    [ Implemented(true), Override("Model") ]
+    string Model;
+
+    [ Implemented(true), Override("NumberOfPowerCords") ]
+    uint16 NumberOfPowerCords;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_Baseboard") ]
 class LMI_Baseboard: CIM_Card
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("PackageType") ]
+    uint16 PackageType;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("HostingBoard") ]
+    boolean HostingBoard;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("Model") ]
+    string Model;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("Version") ]
+    string Version;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_BaseboardContainer"), Association ]
 class LMI_BaseboardContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_Baseboard REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ProcessorChipContainer"), Association ]
 class LMI_ProcessorChipContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_ProcessorChip REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_ChassisComputerSystemPackage"), Association ]
 class LMI_ChassisComputerSystemPackage: CIM_ComputerSystemPackage
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_Chassis REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     CIM_ComputerSystem REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_MemorySlot") ]
 class LMI_MemorySlot: CIM_Slot
 {
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("ConnectorLayout") ]
+    uint16 ConnectorLayout;
+
+    [ Implemented(true), Override("ConnectorGender") ]
+    uint16 ConnectorGender;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("Number") ]
+    uint16 Number;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_MemorySlotContainer"), Association ]
 class LMI_MemorySlotContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_MemorySlot REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_MemoryPhysicalPackage") ]
 class LMI_MemoryPhysicalPackage: CIM_PhysicalPackage
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("PackageType") ]
+    uint16 PackageType;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("PartNumber") ]
+    string PartNumber;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_MemoryPhysicalPackageInConnector"), Association ]
 class LMI_MemoryPhysicalPackageInConnector: CIM_PackageInConnector
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_MemorySlot REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     LMI_MemoryPhysicalPackage REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PhysicalMemoryContainer"), Association ]
 class LMI_PhysicalMemoryContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_MemoryPhysicalPackage REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_PhysicalMemory REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PortPhysicalConnector") ]
 class LMI_PortPhysicalConnector: CIM_PhysicalConnector
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("ConnectorLayout") ]
+    uint16 ConnectorLayout;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("ConnectorDescription") ]
+    string ConnectorDescription;
+
+    [ Implemented(true), Override("ConnectorGender") ]
+    uint16 ConnectorGender;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PortPhysicalConnectorContainer"), Association ]
 class LMI_PortPhysicalConnectorContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_PortPhysicalConnector REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_SystemSlot") ]
 class LMI_SystemSlot: CIM_Slot
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("ConnectorGender") ]
+    uint16 ConnectorGender;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("Number") ]
+    uint16 Number;
+
+    [ Implemented(true), Override("ConnectorLayout") ]
+    uint16 ConnectorLayout;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("ConnectorDescription") ]
+    string ConnectorDescription;
+
+    [ Implemented(true), Override("MaxDataWidth") ]
+    uint16 MaxDataWidth;
+
+    [ Implemented(true), Override("MaxLinkWidth") ]
+    uint16 MaxLinkWidth;
+
+    [ Implemented(true), Override("SupportsHotPlug") ]
+    boolean SupportsHotPlug;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_SystemSlotContainer"), Association ]
 class LMI_SystemSlotContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_SystemSlot REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PointingDevice") ]
 class LMI_PointingDevice: CIM_PointingDevice
 {
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("NumberOfButtons") ]
+    uint8 NumberOfButtons;
+
+    [ Implemented(true), Override("PointingType") ]
+    uint16 PointingType;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
 };
 
 /******************************************************************************
@@ -357,40 +887,110 @@ class LMI_PointingDevice: CIM_PointingDevice
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_Battery") ]
 class LMI_Battery: CIM_Battery
 {
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("Chemistry") ]
+    uint16 Chemistry;
+
+    [ Implemented(true), Override("DesignCapacity") ]
+    uint32 DesignCapacity;
+
+    [ Implemented(true), Override("DesignVoltage") ]
+    uint64 DesignVoltage;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_BatteryPhysicalPackage") ]
 class LMI_BatteryPhysicalPackage: CIM_PhysicalPackage
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("PackageType") ]
+    uint16 PackageType;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("Version") ]
+    string Version;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("ManufactureDate") ]
+    datetime ManufactureDate;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PhysicalBatteryRealizes"), Association ]
 class LMI_PhysicalBatteryRealizes: CIM_Realizes
 {
-    [Override("Antecedent")]
+    [ Override("Antecedent") ]
     LMI_BatteryPhysicalPackage REF Antecedent;
 
-    [Override("Dependent")]
+    [ Override("Dependent") ]
     LMI_Battery REF Dependent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PhysicalBatteryContainer"), Association ]
 class LMI_PhysicalBatteryContainer: CIM_Container
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     LMI_Chassis REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_BatteryPhysicalPackage REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_BatterySystemDevice"), Association ]
 class LMI_BatterySystemDevice: CIM_SystemDevice
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     CIM_ComputerSystem REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_Battery REF PartComponent;
 };
 
@@ -401,52 +1001,259 @@ class LMI_BatterySystemDevice: CIM_SystemDevice
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PCIDevice") ]
 class LMI_PCIDevice: CIM_PCIDevice
 {
-    [ Description("Name of the vendor") ]
+    [ Implemented(true), Description("Name of the vendor") ]
     string VendorName;
 
-    [ Description("Name of the device") ]
+    [ Implemented(true), Description("Name of the device") ]
     string PCIDeviceName;
 
-    [ Description("Name of the subsystem vendor") ]
+    [ Implemented(true), Description("Name of the subsystem vendor") ]
     string SubsystemVendorName;
 
-    [ Description("Name of the subsystem") ]
+    [ Implemented(true), Description("Name of the subsystem") ]
     string SubsystemName;
+
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("BusNumber") ]
+    uint8 BusNumber;
+
+    [ Implemented(true), Override("DeviceNumber") ]
+    uint8 DeviceNumber;
+
+    [ Implemented(true), Override("FunctionNumber") ]
+    uint8 FunctionNumber;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("VendorID") ]
+    uint16 VendorID;
+
+    [ Implemented(true), Override("PCIDeviceID") ]
+    uint16 PCIDeviceID;
+
+    [ Implemented(true), Override("SubsystemVendorID") ]
+    uint16 SubsystemVendorID;
+
+    [ Implemented(true), Override("SubsystemID") ]
+    uint16 SubsystemID;
+
+    [ Implemented(true), Override("RevisionID") ]
+    uint8 RevisionID;
+
+    [ Implemented(true), Override("CacheLineSize") ]
+    uint8 CacheLineSize;
+
+    [ Implemented(true), Override("CommandRegister") ]
+    uint16 CommandRegister;
+
+    [ Implemented(true), Override("ClassCode") ]
+    uint8 ClassCode;
+
+    [ Implemented(true), Override("DeviceSelectTiming") ]
+    uint16 DeviceSelectTiming;
+
+    [ Implemented(true), Override("ExpansionROMBaseAddress") ]
+    uint32 ExpansionROMBaseAddress;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("InterruptPin") ]
+    uint16 InterruptPin;
+
+    [ Implemented(true), Override("LatencyTimer") ]
+    uint8 LatencyTimer;
+
+    [ Implemented(true), Override("BaseAddress64") ]
+    uint64 BaseAddress64[];
+
+    [ Implemented(true), Override("BaseAddress") ]
+    uint32 BaseAddress[];
+
+    [ Implemented(true), Override("Capabilities") ]
+    uint16 Capabilities[];
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PCIDeviceSystemDevice"), Association ]
 class LMI_PCIDeviceSystemDevice: CIM_SystemDevice
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     CIM_ComputerSystem REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_PCIDevice REF PartComponent;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PCIBridge") ]
 class LMI_PCIBridge: CIM_PCIBridge
 {
-    [ Description("Name of the vendor") ]
+    [ Implemented(true), Description("Name of the vendor") ]
     string VendorName;
 
-    [ Description("Name of the device") ]
+    [ Implemented(true), Description("Name of the device") ]
     string PCIDeviceName;
 
-    [ Description("Name of the subsystem vendor") ]
+    [ Implemented(true), Description("Name of the subsystem vendor") ]
     string SubsystemVendorName;
 
-    [ Description("Name of the subsystem") ]
+    [ Implemented(true), Description("Name of the subsystem") ]
     string SubsystemName;
+
+    [ Implemented(true), Override("SystemCreationClassName") ]
+    string SystemCreationClassName;
+
+    [ Implemented(true), Override("SystemName") ]
+    string SystemName;
+
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("DeviceID") ]
+    string DeviceID;
+
+    [ Implemented(true), Override("BusNumber") ]
+    uint8 BusNumber;
+
+    [ Implemented(true), Override("DeviceNumber") ]
+    uint8 DeviceNumber;
+
+    [ Implemented(true), Override("FunctionNumber") ]
+    uint8 FunctionNumber;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("VendorID") ]
+    uint16 VendorID;
+
+    [ Implemented(true), Override("PCIDeviceID") ]
+    uint16 PCIDeviceID;
+
+    [ Implemented(true), Override("SubsystemVendorID") ]
+    uint16 SubsystemVendorID;
+
+    [ Implemented(true), Override("SubsystemID") ]
+    uint16 SubsystemID;
+
+    [ Implemented(true), Override("BridgeType") ]
+    uint16 BridgeType;
+
+    [ Implemented(true), Override("RevisionID") ]
+    uint8 RevisionID;
+
+    [ Implemented(true), Override("CacheLineSize") ]
+    uint8 CacheLineSize;
+
+    [ Implemented(true), Override("CommandRegister") ]
+    uint16 CommandRegister;
+
+    [ Implemented(true), Override("SubordinateBusNumber") ]
+    uint8 SubordinateBusNumber;
+
+    [ Implemented(true), Override("SecondayBusNumber") ]
+    uint8 SecondayBusNumber;
+
+    [ Implemented(true), Override("PrimaryBusNumber") ]
+    uint8 PrimaryBusNumber;
+
+    [ Implemented(true), Override("ClassCode") ]
+    uint8 ClassCode;
+
+    [ Implemented(true), Override("DeviceSelectTiming") ]
+    uint16 DeviceSelectTiming;
+
+    [ Implemented(true), Override("SecondaryStatusRegister") ]
+    uint16 SecondaryStatusRegister;
+
+    [ Implemented(true), Override("SecondaryBusDeviceSelectTiming") ]
+    uint16 SecondaryBusDeviceSelectTiming;
+
+    [ Implemented(true), Override("ExpansionROMBaseAddress") ]
+    uint32 ExpansionROMBaseAddress;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
+
+    [ Implemented(true), Override("InterruptPin") ]
+    uint16 InterruptPin;
+
+    [ Implemented(true), Override("LatencyTimer") ]
+    uint8 LatencyTimer;
+
+    [ Implemented(true), Override("SecondaryLatencyTimer") ]
+    uint8 SecondaryLatencyTimer;
+
+    [ Implemented(true), Override("BaseAddress64") ]
+    uint64 BaseAddress64[];
+
+    [ Implemented(true), Override("BaseAddress") ]
+    uint32 BaseAddress[];
+
+    [ Implemented(true), Override("Capabilities") ]
+    uint16 Capabilities[];
+
+    [ Implemented(true), Override("IOBaseUpper16") ]
+    uint16 IOBaseUpper16;
+
+    [ Implemented(true), Override("IOLimitUpper16") ]
+    uint16 IOLimitUpper16;
+
+    [ Implemented(true), Override("IOBase") ]
+    uint8 IOBase;
+
+    [ Implemented(true), Override("IOLimit") ]
+    uint8 IOLimit;
+
+    [ Implemented(true), Override("MemoryBase") ]
+    uint16 MemoryBase;
+
+    [ Implemented(true), Override("MemoryLimit") ]
+    uint16 MemoryLimit;
+
+    [ Implemented(true), Override("PrefetchBaseUpper32") ]
+    uint32 PrefetchBaseUpper32;
+
+    [ Implemented(true), Override("PrefetchLimitUpper32") ]
+    uint32 PrefetchLimitUpper32;
+
+    [ Implemented(true), Override("PrefetchMemoryBase") ]
+    uint16 PrefetchMemoryBase;
+
+    [ Implemented(true), Override("PrefetchMemoryLimit") ]
+    uint16 PrefetchMemoryLimit;
 };
 
 [ Version("0.2.0"), Provider("cmpi:cmpiLMI_PCIBridgeSystemDevice"), Association ]
 class LMI_PCIBridgeSystemDevice: CIM_SystemDevice
 {
-    [Override("GroupComponent")]
+    [ Override("GroupComponent") ]
     CIM_ComputerSystem REF GroupComponent;
 
-    [Override("PartComponent")]
+    [ Override("PartComponent") ]
     LMI_PCIBridge REF PartComponent;
 };
 
@@ -457,4 +1264,37 @@ class LMI_PCIBridgeSystemDevice: CIM_SystemDevice
 [ Version("0.5.0"), Provider("cmpi:cmpiLMI_DiskPhysicalPackage") ]
 class LMI_DiskPhysicalPackage: CIM_PhysicalPackage
 {
+    [ Implemented(true), Override("CreationClassName") ]
+    string CreationClassName;
+
+    [ Implemented(true), Override("PackageType") ]
+    uint16 PackageType;
+
+    [ Implemented(true), Override("Tag") ]
+    string Tag;
+
+    [ Implemented(true), Override("Manufacturer") ]
+    string Manufacturer;
+
+    [ Implemented(true), Override("Model") ]
+    string Model;
+
+    [ Implemented(true), Override("SerialNumber") ]
+    string SerialNumber;
+
+    [ Implemented(true), Override("Caption") ]
+    string Caption;
+
+    [ Implemented(true), Override("Description") ]
+    string Description;
+
+    [ Implemented(true), Override("ElementName") ]
+    string ElementName;
+
+    [ Implemented(true), Override("Name") ]
+    string Name;
+
+    [ Implemented(true), Override("InstanceID") ]
+    string InstanceID;
 };
+