From: <mik...@us...> - 2008-08-19 19:40:45
|
Revision: 866 http://omc.svn.sourceforge.net/omc/?rev=866&view=rev Author: mike-brasher Date: 2008-08-19 19:40:52 +0000 (Tue, 19 Aug 2008) Log Message: ----------- Changed class prefix from "Linux_Power" to "Linux_PowerSupply". Modified Paths: -------------- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-19 19:40:52 UTC (rev 866) @@ -1,18 +1,18 @@ -class Linux_PowerRegisteredProfile : CIM_RegisteredProfile +class Linux_PowerSupplyRegisteredProfile : CIM_RegisteredProfile { }; [Association] -class Linux_PowerElementConformsToProfile : CIM_ElementConformsToProfile +class Linux_PowerSupplyElementConformsToProfile : CIM_ElementConformsToProfile { - [Key] Linux_PowerRegisteredProfile REF ConformantStandard; + [Key] Linux_PowerSupplyRegisteredProfile REF ConformantStandard; // [Key] Linux_PowerSupply REF ManagedElement; }; [Association] -class Linux_PowerReferencedProfile : CIM_ReferencedProfile +class Linux_PowerSupplyReferencedProfile : CIM_ReferencedProfile { [Key] CIM_RegisteredProfile REF Antecedent; - [Key] Linux_PowerRegisteredProfile REF Dependent; + [Key] Linux_PowerSupplyRegisteredProfile REF Dependent; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.mof 2008-08-19 19:40:52 UTC (rev 866) @@ -8,36 +8,36 @@ { }; -class Linux_PowerRedundancySet : CIM_RedundancySet +class Linux_PowerSupplyRedundancySet : CIM_RedundancySet { }; -class Linux_PowerHostedCollection : CIM_HostedCollection +class Linux_PowerSupplyHostedCollection : CIM_HostedCollection { [Key] Linux_ComputerSystem REF Antecedent; - [Key] Linux_PowerRedundancySet REF Dependent; + [Key] Linux_PowerSupplyRedundancySet REF Dependent; }; -class Linux_PowerIsSpare : CIM_IsSpare +class Linux_PowerSupplyIsSpare : CIM_IsSpare { - [Key] Linux_PowerRedundancySet REF Dependent; + [Key] Linux_PowerSupplyRedundancySet REF Dependent; [Key] Linux_PowerSupply REF Antecedent; }; -class Linux_PowerMemberOfCollection : CIM_MemberOfCollection +class Linux_PowerSupplyMemberOfCollection : CIM_MemberOfCollection { - [Key] Linux_PowerRedundancySet REF Collection; + [Key] Linux_PowerSupplyRedundancySet REF Collection; [Key] Linux_PowerSupply REF Member; }; -class Linux_PowerSystemDevice : CIM_SystemDevice +class Linux_PowerSupplySystemDevice : CIM_SystemDevice { [Key] Linux_ComputerSystem REF GroupComponent; [Key] Linux_PowerSupply REF PartComponent; }; -class Linux_PowerOwningCollectionElement : CIM_OwningCollectionElement +class Linux_PowerSupplyOwningCollectionElement : CIM_OwningCollectionElement { [Key] Linux_ComputerSystem REF OwningElement; - [Key] Linux_PowerRedundancySet REF OwnedElement; + [Key] Linux_PowerSupplyRedundancySet REF OwnedElement; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-19 19:40:52 UTC (rev 866) @@ -1,29 +1,29 @@ -[Linux_PowerElementConformsToProfile] - provider: Linux_PowerElementConformsToProfile +[Linux_PowerSupplyElementConformsToProfile] + provider: Linux_PowerSupplyElementConformsToProfile location: linux_powersupplyprovider type: instance association namespace: root/cimv2 root/interop # -[Linux_PowerHostedCollection] - provider: Linux_PowerHostedCollection +[Linux_PowerSupplyHostedCollection] + provider: Linux_PowerSupplyHostedCollection location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerIsSpare] - provider: Linux_PowerIsSpare +[Linux_PowerSupplyIsSpare] + provider: Linux_PowerSupplyIsSpare location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerMemberOfCollection] - provider: Linux_PowerMemberOfCollection +[Linux_PowerSupplyMemberOfCollection] + provider: Linux_PowerSupplyMemberOfCollection location: linux_powersupplyprovider type: instance association namespace: root/cimv2 # -[Linux_PowerOwningCollectionElement] - provider: Linux_PowerOwningCollectionElement +[Linux_PowerSupplyOwningCollectionElement] + provider: Linux_PowerSupplyOwningCollectionElement location: linux_powersupplyprovider type: instance association namespace: root/cimv2 @@ -34,26 +34,26 @@ type: instance method namespace: root/cimv2 # -[Linux_PowerRedundancySet] - provider: Linux_PowerRedundancySet +[Linux_PowerSupplyRedundancySet] + provider: Linux_PowerSupplyRedundancySet location: linux_powersupplyprovider type: instance method namespace: root/cimv2 # -[Linux_PowerReferencedProfile] - provider: Linux_PowerReferencedProfile +[Linux_PowerSupplyReferencedProfile] + provider: Linux_PowerSupplyReferencedProfile location: linux_powersupplyprovider type: instance association namespace: root/interop # -[Linux_PowerRegisteredProfile] - provider: Linux_PowerRegisteredProfile +[Linux_PowerSupplyRegisteredProfile] + provider: Linux_PowerSupplyRegisteredProfile location: linux_powersupplyprovider type: instance method namespace: root/interop # -[Linux_PowerSystemDevice] - provider: Linux_PowerSystemDevice +[Linux_PowerSupplySystemDevice] + provider: Linux_PowerSupplySystemDevice location: linux_powersupplyprovider type: instance association namespace: root/cimv2 Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-19 19:40:52 UTC (rev 866) @@ -1,10 +1,10 @@ -Linux_PowerElementConformsToProfile root/cimv2\ root/interop Linux_PowerElementConformsToProfile linux_powersupplyprovider instance association -Linux_PowerHostedCollection root/cimv2 Linux_PowerHostedCollection linux_powersupplyprovider instance association -Linux_PowerIsSpare root/cimv2 Linux_PowerIsSpare linux_powersupplyprovider instance association -Linux_PowerMemberOfCollection root/cimv2 Linux_PowerMemberOfCollection linux_powersupplyprovider instance association -Linux_PowerOwningCollectionElement root/cimv2 Linux_PowerOwningCollectionElement linux_powersupplyprovider instance association +Linux_PowerSupplyElementConformsToProfile root/cimv2\ root/interop Linux_PowerSupplyElementConformsToProfile linux_powersupplyprovider instance association +Linux_PowerSupplyHostedCollection root/cimv2 Linux_PowerSupplyHostedCollection linux_powersupplyprovider instance association +Linux_PowerSupplyIsSpare root/cimv2 Linux_PowerSupplyIsSpare linux_powersupplyprovider instance association +Linux_PowerSupplyMemberOfCollection root/cimv2 Linux_PowerSupplyMemberOfCollection linux_powersupplyprovider instance association +Linux_PowerSupplyOwningCollectionElement root/cimv2 Linux_PowerSupplyOwningCollectionElement linux_powersupplyprovider instance association Linux_PowerSupply root/cimv2 Linux_PowerSupply linux_powersupplyprovider instance method -Linux_PowerRedundancySet root/cimv2 Linux_PowerRedundancySet linux_powersupplyprovider instance method -Linux_PowerReferencedProfile root/interop Linux_PowerReferencedProfile linux_powersupplyprovider instance association -Linux_PowerRegisteredProfile root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method -Linux_PowerSystemDevice root/cimv2 Linux_PowerSystemDevice linux_powersupplyprovider instance association +Linux_PowerSupplyRedundancySet root/cimv2 Linux_PowerSupplyRedundancySet linux_powersupplyprovider instance method +Linux_PowerSupplyReferencedProfile root/interop Linux_PowerSupplyReferencedProfile linux_powersupplyprovider instance association +Linux_PowerSupplyRegisteredProfile root/interop Linux_PowerSupplyRegisteredProfile linux_powersupplyprovider instance method +Linux_PowerSupplySystemDevice root/cimv2 Linux_PowerSupplySystemDevice linux_powersupplyprovider instance association Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,25 +21,25 @@ **============================================================================== */ -/* classname=Linux_PowerElementConformsToProfile */ +/* classname=Linux_PowerSupplyElementConformsToProfile */ typedef struct _ElementConformsToProfileRef { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* CIM_ManagedElement */ - /* Linux_PowerElementConformsToProfile features */ + /* Linux_PowerSupplyElementConformsToProfile features */ } ElementConformsToProfileRef; static const unsigned char __ElementConformsToProfileRef_sig[] = { - 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50, - 0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f, - 0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e,0x64,0x61,0x72,0x64,0x00,0x4e, - 0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x00, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f, + 0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e, + 0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e, + 0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void ElementConformsToProfileRef_Init( @@ -194,25 +194,25 @@ **============================================================================== */ -/* classname=Linux_PowerElementConformsToProfile */ +/* classname=Linux_PowerSupplyElementConformsToProfile */ typedef struct _ElementConformsToProfile { KBase __base; /* CIM_ElementConformsToProfile features */ const KRef ConformantStandard; /* RegisteredProfile */ const KRef ManagedElement; /* CIM_ManagedElement */ - /* Linux_PowerElementConformsToProfile features */ + /* Linux_PowerSupplyElementConformsToProfile features */ } ElementConformsToProfile; static const unsigned char __ElementConformsToProfile_sig[] = { - 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x73,0x54,0x6f,0x50, - 0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x12,0x43,0x6f,0x6e,0x66,0x6f, - 0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e,0x64,0x61,0x72,0x64,0x00,0x4e, - 0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x00, + 0x29,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x43,0x6f,0x6e,0x66,0x6f, + 0x72,0x6d,0x73,0x54,0x6f,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e, + 0x12,0x43,0x6f,0x6e,0x66,0x6f,0x72,0x6d,0x61,0x6e,0x74,0x53,0x74,0x61,0x6e, + 0x64,0x61,0x72,0x64,0x00,0x4e,0x0e,0x4d,0x61,0x6e,0x61,0x67,0x65,0x64,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void ElementConformsToProfile_Init( @@ -385,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ElementConformsToProfile_ClassName "Linux_PowerElementConformsToProfile" +#define ElementConformsToProfile_ClassName "Linux_PowerSupplyElementConformsToProfile" #endif /* _konkrete_ElementConformsToProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -202,18 +202,18 @@ CMInstanceMIStub( ElementConformsToProfile, - Linux_PowerElementConformsToProfile, + Linux_PowerSupplyElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) CMAssociationMIStub( ElementConformsToProfile, - Linux_PowerElementConformsToProfile, + Linux_PowerSupplyElementConformsToProfile, _cb, ElementConformsToProfileInitialize()) KONKRET_REGISTRATION( "root/cimv2 root/interop", - "Linux_PowerElementConformsToProfile", - "Linux_PowerElementConformsToProfile", + "Linux_PowerSupplyElementConformsToProfile", + "Linux_PowerSupplyElementConformsToProfile", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollection.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerHostedCollection */ +/* classname=Linux_PowerSupplyHostedCollection */ typedef struct _HostedCollectionRef { KBase __base; @@ -30,16 +30,17 @@ const KRef Dependent; /* RedundancySet */ /* CIM_HostedDependency features */ /* CIM_HostedCollection features */ - /* Linux_PowerHostedCollection features */ + /* Linux_PowerSupplyHostedCollection features */ } HostedCollectionRef; static const unsigned char __HostedCollectionRef_sig[] = { - 0x1b,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x48,0x6f,0x73, - 0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02, - 0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09, - 0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x21,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x48,0x6f,0x73,0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, + 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, + 0x00, }; KINLINE void HostedCollectionRef_Init( @@ -194,7 +195,7 @@ **============================================================================== */ -/* classname=Linux_PowerHostedCollection */ +/* classname=Linux_PowerSupplyHostedCollection */ typedef struct _HostedCollection { KBase __base; @@ -203,16 +204,17 @@ const KRef Dependent; /* RedundancySet */ /* CIM_HostedDependency features */ /* CIM_HostedCollection features */ - /* Linux_PowerHostedCollection features */ + /* Linux_PowerSupplyHostedCollection features */ } HostedCollection; static const unsigned char __HostedCollection_sig[] = { - 0x1b,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x48,0x6f,0x73, - 0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02, - 0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09, - 0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x21,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x48,0x6f,0x73,0x74,0x65,0x64,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, + 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, + 0x00, }; KINLINE void HostedCollection_Init( @@ -385,6 +387,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define HostedCollection_ClassName "Linux_PowerHostedCollection" +#define HostedCollection_ClassName "Linux_PowerSupplyHostedCollection" #endif /* _konkrete_HostedCollection_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -228,18 +228,18 @@ CMInstanceMIStub( HostedCollection, - Linux_PowerHostedCollection, + Linux_PowerSupplyHostedCollection, _cb, HostedCollectionInitialize()) CMAssociationMIStub( HostedCollection, - Linux_PowerHostedCollection, + Linux_PowerSupplyHostedCollection, _cb, HostedCollectionInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerHostedCollection", - "Linux_PowerHostedCollection", + "Linux_PowerSupplyHostedCollection", + "Linux_PowerSupplyHostedCollection", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpare.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerIsSpare */ +/* classname=Linux_PowerSupplyIsSpare */ typedef struct _IsSpareRef { KBase __base; @@ -29,16 +29,16 @@ const KRef Antecedent; /* PowerSupply */ const KRef Dependent; /* RedundancySet */ /* CIM_IsSpare features */ - /* Linux_PowerIsSpare features */ + /* Linux_PowerSupplyIsSpare features */ } IsSpareRef; static const unsigned char __IsSpareRef_sig[] = { - 0x12,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x49,0x73,0x53, - 0x70,0x61,0x72,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, - 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, - 0x00, + 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x49,0x73,0x53,0x70,0x61,0x72,0x65,0x00,0x02,0x4e,0x0a,0x41, + 0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70, + 0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, }; KINLINE void IsSpareRef_Init( @@ -193,7 +193,7 @@ **============================================================================== */ -/* classname=Linux_PowerIsSpare */ +/* classname=Linux_PowerSupplyIsSpare */ typedef struct _IsSpare { KBase __base; @@ -203,18 +203,18 @@ /* CIM_IsSpare features */ const KUint16 SpareStatus; const KUint16 FailoverSupported; - /* Linux_PowerIsSpare features */ + /* Linux_PowerSupplyIsSpare features */ } IsSpare; static const unsigned char __IsSpare_sig[] = { - 0x12,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x49,0x73,0x53, - 0x70,0x61,0x72,0x65,0x00,0x04,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64, - 0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74, - 0x00,0x03,0x0b,0x53,0x70,0x61,0x72,0x65,0x53,0x74,0x61,0x74,0x75,0x73,0x00, - 0x03,0x11,0x46,0x61,0x69,0x6c,0x6f,0x76,0x65,0x72,0x53,0x75,0x70,0x70,0x6f, - 0x72,0x74,0x65,0x64,0x00, + 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x49,0x73,0x53,0x70,0x61,0x72,0x65,0x00,0x04,0x4e,0x0a,0x41, + 0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70, + 0x65,0x6e,0x64,0x65,0x6e,0x74,0x00,0x03,0x0b,0x53,0x70,0x61,0x72,0x65,0x53, + 0x74,0x61,0x74,0x75,0x73,0x00,0x03,0x11,0x46,0x61,0x69,0x6c,0x6f,0x76,0x65, + 0x72,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00, }; KINLINE void IsSpare_Init( @@ -494,6 +494,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define IsSpare_ClassName "Linux_PowerIsSpare" +#define IsSpare_ClassName "Linux_PowerSupplyIsSpare" #endif /* _konkrete_IsSpare_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -228,18 +228,18 @@ CMInstanceMIStub( IsSpare, - Linux_PowerIsSpare, + Linux_PowerSupplyIsSpare, _cb, IsSpareInitialize()) CMAssociationMIStub( IsSpare, - Linux_PowerIsSpare, + Linux_PowerSupplyIsSpare, _cb, IsSpareInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerIsSpare", - "Linux_PowerIsSpare", + "Linux_PowerSupplyIsSpare", + "Linux_PowerSupplyIsSpare", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollection.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,23 +21,23 @@ **============================================================================== */ -/* classname=Linux_PowerMemberOfCollection */ +/* classname=Linux_PowerSupplyMemberOfCollection */ typedef struct _MemberOfCollectionRef { KBase __base; /* CIM_MemberOfCollection features */ const KRef Collection; /* RedundancySet */ const KRef Member; /* PowerSupply */ - /* Linux_PowerMemberOfCollection features */ + /* Linux_PowerSupplyMemberOfCollection features */ } MemberOfCollectionRef; static const unsigned char __MemberOfCollectionRef_sig[] = { - 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4d,0x65,0x6d, - 0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e, - 0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00, - 0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, + 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4d,0x65,0x6d,0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c, + 0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65, + 0x63,0x74,0x69,0x6f,0x6e,0x00,0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, }; KINLINE void MemberOfCollectionRef_Init( @@ -192,23 +192,23 @@ **============================================================================== */ -/* classname=Linux_PowerMemberOfCollection */ +/* classname=Linux_PowerSupplyMemberOfCollection */ typedef struct _MemberOfCollection { KBase __base; /* CIM_MemberOfCollection features */ const KRef Collection; /* RedundancySet */ const KRef Member; /* PowerSupply */ - /* Linux_PowerMemberOfCollection features */ + /* Linux_PowerSupplyMemberOfCollection features */ } MemberOfCollection; static const unsigned char __MemberOfCollection_sig[] = { - 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4d,0x65,0x6d, - 0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e, - 0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x00, - 0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, + 0x23,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4d,0x65,0x6d,0x62,0x65,0x72,0x4f,0x66,0x43,0x6f,0x6c,0x6c, + 0x65,0x63,0x74,0x69,0x6f,0x6e,0x00,0x02,0x4e,0x0a,0x43,0x6f,0x6c,0x6c,0x65, + 0x63,0x74,0x69,0x6f,0x6e,0x00,0x4e,0x06,0x4d,0x65,0x6d,0x62,0x65,0x72,0x00, }; KINLINE void MemberOfCollection_Init( @@ -381,6 +381,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define MemberOfCollection_ClassName "Linux_PowerMemberOfCollection" +#define MemberOfCollection_ClassName "Linux_PowerSupplyMemberOfCollection" #endif /* _konkrete_MemberOfCollection_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -225,18 +225,18 @@ CMInstanceMIStub( MemberOfCollection, - Linux_PowerMemberOfCollection, + Linux_PowerSupplyMemberOfCollection, _cb, MemberOfCollectionInitialize()) CMAssociationMIStub( MemberOfCollection, - Linux_PowerMemberOfCollection, + Linux_PowerSupplyMemberOfCollection, _cb, MemberOfCollectionInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerMemberOfCollection", - "Linux_PowerMemberOfCollection", + "Linux_PowerSupplyMemberOfCollection", + "Linux_PowerSupplyMemberOfCollection", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElement.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,24 +21,24 @@ **============================================================================== */ -/* classname=Linux_PowerOwningCollectionElement */ +/* classname=Linux_PowerSupplyOwningCollectionElement */ typedef struct _OwningCollectionElementRef { KBase __base; /* CIM_OwningCollectionElement features */ const KRef OwningElement; /* ComputerSystem */ const KRef OwnedElement; /* RedundancySet */ - /* Linux_PowerOwningCollectionElement features */ + /* Linux_PowerSupplyOwningCollectionElement features */ } OwningCollectionElementRef; static const unsigned char __OwningCollectionElementRef_sig[] = { - 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4f,0x77,0x6e, - 0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x45,0x6c, - 0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d,0x4f,0x77,0x6e,0x69,0x6e,0x67, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x4f,0x77,0x6e,0x65,0x64, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, + 0x28,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4f,0x77,0x6e,0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d, + 0x4f,0x77,0x6e,0x69,0x6e,0x67,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e, + 0x0c,0x4f,0x77,0x6e,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void OwningCollectionElementRef_Init( @@ -193,24 +193,24 @@ **============================================================================== */ -/* classname=Linux_PowerOwningCollectionElement */ +/* classname=Linux_PowerSupplyOwningCollectionElement */ typedef struct _OwningCollectionElement { KBase __base; /* CIM_OwningCollectionElement features */ const KRef OwningElement; /* ComputerSystem */ const KRef OwnedElement; /* RedundancySet */ - /* Linux_PowerOwningCollectionElement features */ + /* Linux_PowerSupplyOwningCollectionElement features */ } OwningCollectionElement; static const unsigned char __OwningCollectionElement_sig[] = { - 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x4f,0x77,0x6e, - 0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63,0x74,0x69,0x6f,0x6e,0x45,0x6c, - 0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d,0x4f,0x77,0x6e,0x69,0x6e,0x67, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e,0x0c,0x4f,0x77,0x6e,0x65,0x64, - 0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, + 0x28,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x4f,0x77,0x6e,0x69,0x6e,0x67,0x43,0x6f,0x6c,0x6c,0x65,0x63, + 0x74,0x69,0x6f,0x6e,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x02,0x4e,0x0d, + 0x4f,0x77,0x6e,0x69,0x6e,0x67,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00,0x4e, + 0x0c,0x4f,0x77,0x6e,0x65,0x64,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x00, }; KINLINE void OwningCollectionElement_Init( @@ -383,6 +383,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define OwningCollectionElement_ClassName "Linux_PowerOwningCollectionElement" +#define OwningCollectionElement_ClassName "Linux_PowerSupplyOwningCollectionElement" #endif /* _konkrete_OwningCollectionElement_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -227,18 +227,18 @@ CMInstanceMIStub( OwningCollectionElement, - Linux_PowerOwningCollectionElement, + Linux_PowerSupplyOwningCollectionElement, _cb, OwningCollectionElementInitialize()) CMAssociationMIStub( OwningCollectionElement, - Linux_PowerOwningCollectionElement, + Linux_PowerSupplyOwningCollectionElement, _cb, OwningCollectionElementInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerOwningCollectionElement", - "Linux_PowerOwningCollectionElement", + "Linux_PowerSupplyOwningCollectionElement", + "Linux_PowerSupplyOwningCollectionElement", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySet.h 2008-08-19 19:40:52 UTC (rev 866) @@ -20,7 +20,7 @@ **============================================================================== */ -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySetRef { KBase __base; @@ -29,15 +29,16 @@ /* CIM_SystemSpecificCollection features */ const KString InstanceID; /* CIM_RedundancySet features */ - /* Linux_PowerRedundancySet features */ + /* Linux_PowerSupplyRedundancySet features */ } RedundancySetRef; static const unsigned char __RedundancySetRef_sig[] = { - 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x64, - 0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65,0x74,0x00,0x01,0x4c,0x0a,0x49, - 0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00, + 0x1e,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65, + 0x74,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44, + 0x00, }; KINLINE void RedundancySetRef_Init( @@ -146,7 +147,7 @@ **============================================================================== */ -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySet { KBase __base; @@ -166,28 +167,29 @@ const KStringA OtherTypeOfSet; const KUint16 LoadBalanceAlgorithm; const KString OtherLoadBalanceAlgorithm; - /* Linux_PowerRedundancySet features */ + /* Linux_PowerSupplyRedundancySet features */ } RedundancySet; static const unsigned char __RedundancySet_sig[] = { - 0x18,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x64, - 0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65,0x74,0x00,0x0c,0x0c,0x07,0x43, - 0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69, - 0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74, - 0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65, - 0x49,0x44,0x00,0x03,0x10,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79, - 0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x83,0x09,0x54,0x79,0x70,0x65,0x4f,0x66, - 0x53,0x65,0x74,0x00,0x05,0x0f,0x4d,0x69,0x6e,0x4e,0x75,0x6d,0x62,0x65,0x72, - 0x4e,0x65,0x65,0x64,0x65,0x64,0x00,0x05,0x12,0x4d,0x61,0x78,0x4e,0x75,0x6d, - 0x62,0x65,0x72,0x53,0x75,0x70,0x70,0x6f,0x72,0x74,0x65,0x64,0x00,0x0c,0x15, - 0x56,0x65,0x6e,0x64,0x6f,0x72,0x49,0x64,0x65,0x6e,0x74,0x69,0x66,0x79,0x69, - 0x6e,0x67,0x49,0x6e,0x66,0x6f,0x00,0x8c,0x0e,0x4f,0x74,0x68,0x65,0x72,0x54, - 0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00,0x03,0x14,0x4c,0x6f,0x61,0x64, - 0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f,0x72,0x69,0x74,0x68, - 0x6d,0x00,0x0c,0x19,0x4f,0x74,0x68,0x65,0x72,0x4c,0x6f,0x61,0x64,0x42,0x61, - 0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f,0x72,0x69,0x74,0x68,0x6d,0x00, + 0x1e,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x64,0x75,0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x65, + 0x74,0x00,0x0c,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b, + 0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45, + 0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e, + 0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x10,0x52,0x65,0x64,0x75, + 0x6e,0x64,0x61,0x6e,0x63,0x79,0x53,0x74,0x61,0x74,0x75,0x73,0x00,0x83,0x09, + 0x54,0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00,0x05,0x0f,0x4d,0x69,0x6e, + 0x4e,0x75,0x6d,0x62,0x65,0x72,0x4e,0x65,0x65,0x64,0x65,0x64,0x00,0x05,0x12, + 0x4d,0x61,0x78,0x4e,0x75,0x6d,0x62,0x65,0x72,0x53,0x75,0x70,0x70,0x6f,0x72, + 0x74,0x65,0x64,0x00,0x0c,0x15,0x56,0x65,0x6e,0x64,0x6f,0x72,0x49,0x64,0x65, + 0x6e,0x74,0x69,0x66,0x79,0x69,0x6e,0x67,0x49,0x6e,0x66,0x6f,0x00,0x8c,0x0e, + 0x4f,0x74,0x68,0x65,0x72,0x54,0x79,0x70,0x65,0x4f,0x66,0x53,0x65,0x74,0x00, + 0x03,0x14,0x4c,0x6f,0x61,0x64,0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c, + 0x67,0x6f,0x72,0x69,0x74,0x68,0x6d,0x00,0x0c,0x19,0x4f,0x74,0x68,0x65,0x72, + 0x4c,0x6f,0x61,0x64,0x42,0x61,0x6c,0x61,0x6e,0x63,0x65,0x41,0x6c,0x67,0x6f, + 0x72,0x69,0x74,0x68,0x6d,0x00, }; KINLINE void RedundancySet_Init( @@ -910,7 +912,7 @@ } } -/* classname=Linux_PowerRedundancySet */ +/* classname=Linux_PowerSupplyRedundancySet */ typedef struct _RedundancySet_Failover_Args { KBase __base; @@ -1040,6 +1042,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define RedundancySet_ClassName "Linux_PowerRedundancySet" +#define RedundancySet_ClassName "Linux_PowerSupplyRedundancySet" #endif /* _konkrete_RedundancySet_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RedundancySetProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -137,7 +137,7 @@ CMInstanceMIStub( RedundancySet, - Linux_PowerRedundancySet, + Linux_PowerSupplyRedundancySet, _cb, RedundancySetInitialize()) @@ -164,7 +164,7 @@ CMMethodMIStub( RedundancySet, - Linux_PowerRedundancySet, + Linux_PowerSupplyRedundancySet, _cb, RedundancySetInitialize()) @@ -185,6 +185,6 @@ KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerRedundancySet", - "Linux_PowerRedundancySet", + "Linux_PowerSupplyRedundancySet", + "Linux_PowerSupplyRedundancySet", "instance method"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerReferencedProfile */ +/* classname=Linux_PowerSupplyReferencedProfile */ typedef struct _ReferencedProfileRef { KBase __base; @@ -29,16 +29,17 @@ const KRef Antecedent; /* CIM_RegisteredProfile */ const KRef Dependent; /* RegisteredProfile */ /* CIM_ReferencedProfile features */ - /* Linux_PowerReferencedProfile features */ + /* Linux_PowerSupplyReferencedProfile features */ } ReferencedProfileRef; static const unsigned char __ReferencedProfileRef_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x66, - 0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e, - 0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x66,0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65, + 0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e, + 0x74,0x00, }; KINLINE void ReferencedProfileRef_Init( @@ -193,7 +194,7 @@ **============================================================================== */ -/* classname=Linux_PowerReferencedProfile */ +/* classname=Linux_PowerSupplyReferencedProfile */ typedef struct _ReferencedProfile { KBase __base; @@ -201,16 +202,17 @@ const KRef Antecedent; /* CIM_RegisteredProfile */ const KRef Dependent; /* RegisteredProfile */ /* CIM_ReferencedProfile features */ - /* Linux_PowerReferencedProfile features */ + /* Linux_PowerSupplyReferencedProfile features */ } ReferencedProfile; static const unsigned char __ReferencedProfile_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x66, - 0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65,0x64,0x65,0x6e,0x74,0x00,0x4e, - 0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e,0x74,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x66,0x65,0x72,0x65,0x6e,0x63,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x02,0x4e,0x0a,0x41,0x6e,0x74,0x65,0x63,0x65, + 0x64,0x65,0x6e,0x74,0x00,0x4e,0x09,0x44,0x65,0x70,0x65,0x6e,0x64,0x65,0x6e, + 0x74,0x00, }; KINLINE void ReferencedProfile_Init( @@ -383,6 +385,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define ReferencedProfile_ClassName "Linux_PowerReferencedProfile" +#define ReferencedProfile_ClassName "Linux_PowerSupplyReferencedProfile" #endif /* _konkrete_ReferencedProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -206,18 +206,18 @@ CMInstanceMIStub( ReferencedProfile, - Linux_PowerReferencedProfile, + Linux_PowerSupplyReferencedProfile, _cb, ReferencedProfileInitialize()) CMAssociationMIStub( ReferencedProfile, - Linux_PowerReferencedProfile, + Linux_PowerSupplyReferencedProfile, _cb, ReferencedProfileInitialize()) KONKRET_REGISTRATION( "root/interop", - "Linux_PowerReferencedProfile", - "Linux_PowerReferencedProfile", + "Linux_PowerSupplyReferencedProfile", + "Linux_PowerSupplyReferencedProfile", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfile.h 2008-08-19 19:40:52 UTC (rev 866) @@ -19,22 +19,23 @@ **============================================================================== */ -/* classname=Linux_PowerRegisteredProfile */ +/* classname=Linux_PowerSupplyRegisteredProfile */ typedef struct _RegisteredProfileRef { KBase __base; /* CIM_ManagedElement features */ /* CIM_RegisteredProfile features */ const KString InstanceID; - /* Linux_PowerRegisteredProfile features */ + /* Linux_PowerSupplyRegisteredProfile features */ } RegisteredProfileRef; static const unsigned char __RegisteredProfileRef_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x67, - 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x01,0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e, + 0x63,0x65,0x49,0x44,0x00, }; KINLINE void RegisteredProfileRef_Init( @@ -143,7 +144,7 @@ **============================================================================== */ -/* classname=Linux_PowerRegisteredProfile */ +/* classname=Linux_PowerSupplyRegisteredProfile */ typedef struct _RegisteredProfile { KBase __base; @@ -159,27 +160,27 @@ const KString RegisteredVersion; const KUint16A AdvertiseTypes; const KStringA AdvertiseTypeDescriptions; - /* Linux_PowerRegisteredProfile features */ + /* Linux_PowerSupplyRegisteredProfile features */ } RegisteredProfile; static const unsigned char __RegisteredProfile_sig[] = { - 0x1c,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x52,0x65,0x67, - 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72,0x6f,0x66,0x69,0x6c,0x65,0x00, - 0x0a,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x44,0x65, - 0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0b,0x45,0x6c,0x65, - 0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00,0x4c,0x0a,0x49,0x6e,0x73,0x74, - 0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x16,0x52,0x65,0x67,0x69,0x73,0x74, - 0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e,0x69,0x7a,0x61,0x74,0x69,0x6f, - 0x6e,0x00,0x0c,0x1b,0x4f,0x74,0x68,0x65,0x72,0x52,0x65,0x67,0x69,0x73,0x74, - 0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e,0x69,0x7a,0x61,0x74,0x69,0x6f, - 0x6e,0x00,0x0c,0x0e,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4e, - 0x61,0x6d,0x65,0x00,0x0c,0x11,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65, - 0x64,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x00,0x83,0x0e,0x41,0x64,0x76,0x65, - 0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65,0x73,0x00,0x8c,0x19,0x41,0x64, - 0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65,0x44,0x65,0x73,0x63, - 0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x73,0x00, + 0x22,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x50,0x72, + 0x6f,0x66,0x69,0x6c,0x65,0x00,0x0a,0x0c,0x07,0x43,0x61,0x70,0x74,0x69,0x6f, + 0x6e,0x00,0x0c,0x0b,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e, + 0x00,0x0c,0x0b,0x45,0x6c,0x65,0x6d,0x65,0x6e,0x74,0x4e,0x61,0x6d,0x65,0x00, + 0x4c,0x0a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65,0x49,0x44,0x00,0x03,0x16, + 0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e, + 0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x1b,0x4f,0x74,0x68,0x65,0x72, + 0x52,0x65,0x67,0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x4f,0x72,0x67,0x61,0x6e, + 0x69,0x7a,0x61,0x74,0x69,0x6f,0x6e,0x00,0x0c,0x0e,0x52,0x65,0x67,0x69,0x73, + 0x74,0x65,0x72,0x65,0x64,0x4e,0x61,0x6d,0x65,0x00,0x0c,0x11,0x52,0x65,0x67, + 0x69,0x73,0x74,0x65,0x72,0x65,0x64,0x56,0x65,0x72,0x73,0x69,0x6f,0x6e,0x00, + 0x83,0x0e,0x41,0x64,0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79,0x70,0x65, + 0x73,0x00,0x8c,0x19,0x41,0x64,0x76,0x65,0x72,0x74,0x69,0x73,0x65,0x54,0x79, + 0x70,0x65,0x44,0x65,0x73,0x63,0x72,0x69,0x70,0x74,0x69,0x6f,0x6e,0x73,0x00, }; KINLINE void RegisteredProfile_Init( @@ -882,6 +883,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define RegisteredProfile_ClassName "Linux_PowerRegisteredProfile" +#define RegisteredProfile_ClassName "Linux_PowerSupplyRegisteredProfile" #endif /* _konkrete_RegisteredProfile_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -100,7 +100,7 @@ CMInstanceMIStub( RegisteredProfile, - Linux_PowerRegisteredProfile, + Linux_PowerSupplyRegisteredProfile, _cb, RegisteredProfileInitialize()) @@ -127,12 +127,12 @@ CMMethodMIStub( RegisteredProfile, - Linux_PowerRegisteredProfile, + Linux_PowerSupplyRegisteredProfile, _cb, RegisteredProfileInitialize()) KONKRET_REGISTRATION( "root/interop", - "Linux_PowerRegisteredProfile", - "Linux_PowerRegisteredProfile", + "Linux_PowerSupplyRegisteredProfile", + "Linux_PowerSupplyRegisteredProfile", "instance method"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.c 2008-08-19 19:40:52 UTC (rev 866) @@ -65,7 +65,7 @@ struct RedundancyInfo info = { /* instanceID */ - "Linux_PowerRedundancySet:0", + "Linux_PowerSupplyRedundancySet:0", /* deviceID */ "Linux_PowerSupply:0", /* redundancyStatus */ @@ -96,7 +96,7 @@ struct RedundancyInfo info = { /* instanceID */ - "Linux_PowerRedundancySet:0", + "Linux_PowerSupplyRedundancySet:0", /* deviceID */ "Linux_PowerSupply:1", /* redundancyStatus */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-19 19:40:52 UTC (rev 866) @@ -87,31 +87,31 @@ struct RedundancyInfo { - /* Linux_PowerRedundancySet.InstanceID */ + /* Linux_PowerSupplyRedundancySet.InstanceID */ char instanceID[64]; - /* Linux_Power.DeviceID */ + /* Linux_PowerSupply.DeviceID */ char deviceID[64]; - /* Linux_PowerRedundancySet.RedundancyStatus */ + /* Linux_PowerSupplyRedundancySet.RedundancyStatus */ RedundancySet_RedundancyStatus_Enum redundancyStatus; - /* Linux_PowerRedundancySet.TypeOfSet */ + /* Linux_PowerSupplyRedundancySet.TypeOfSet */ RedundancySet_TypeOfSet_Enum typeOfSet[8]; - /* Linux_PowerRedundancySet.TypeOfSet size */ + /* Linux_PowerSupplyRedundancySet.TypeOfSet size */ size_t typeOfSetSize; - /* Linux_PowerRedundancySet.MinNumberNeeded */ + /* Linux_PowerSupplyRedundancySet.MinNumberNeeded */ unsigned int minNumberNeeded; /* Non-zero if fan given by deviceID is a spare */ CMPIBoolean isSpare; - /* Linux_PowerIsSpare.SpareStatus */ + /* Linux_PowerSupplyIsSpare.SpareStatus */ IsSpare_SpareStatus_Enum spareStatus; - /* Linux_PowerIsSpare.FailoverSupported */ + /* Linux_PowerSupplyIsSpare.FailoverSupported */ IsSpare_FailoverSupported_Enum failoverSupported; }; Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDevice.h 2008-08-19 19:40:52 UTC (rev 866) @@ -21,7 +21,7 @@ **============================================================================== */ -/* classname=Linux_PowerSystemDevice */ +/* classname=Linux_PowerSupplySystemDevice */ typedef struct _SystemDeviceRef { KBase __base; @@ -30,16 +30,17 @@ const KRef PartComponent; /* PowerSupply */ /* CIM_SystemComponent features */ /* CIM_SystemDevice features */ - /* Linux_PowerSystemDevice features */ + /* Linux_PowerSupplySystemDevice features */ } SystemDeviceRef; static const unsigned char __SystemDeviceRef_sig[] = { - 0x17,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x79,0x73, - 0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65,0x00,0x02,0x4e,0x0e,0x47,0x72, - 0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00,0x4e,0x0d, - 0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00, + 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x53,0x79,0x73,0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65, + 0x00,0x02,0x4e,0x0e,0x47,0x72,0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e, + 0x65,0x6e,0x74,0x00,0x4e,0x0d,0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f, + 0x6e,0x65,0x6e,0x74,0x00, }; KINLINE void SystemDeviceRef_Init( @@ -194,7 +195,7 @@ **============================================================================== */ -/* classname=Linux_PowerSystemDevice */ +/* classname=Linux_PowerSupplySystemDevice */ typedef struct _SystemDevice { KBase __base; @@ -203,16 +204,17 @@ const KRef PartComponent; /* PowerSupply */ /* CIM_SystemComponent features */ /* CIM_SystemDevice features */ - /* Linux_PowerSystemDevice features */ + /* Linux_PowerSupplySystemDevice features */ } SystemDevice; static const unsigned char __SystemDevice_sig[] = { - 0x17,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x79,0x73, - 0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65,0x00,0x02,0x4e,0x0e,0x47,0x72, - 0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00,0x4e,0x0d, - 0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f,0x6e,0x65,0x6e,0x74,0x00, + 0x1d,0x4c,0x69,0x6e,0x75,0x78,0x5f,0x50,0x6f,0x77,0x65,0x72,0x53,0x75,0x70, + 0x70,0x6c,0x79,0x53,0x79,0x73,0x74,0x65,0x6d,0x44,0x65,0x76,0x69,0x63,0x65, + 0x00,0x02,0x4e,0x0e,0x47,0x72,0x6f,0x75,0x70,0x43,0x6f,0x6d,0x70,0x6f,0x6e, + 0x65,0x6e,0x74,0x00,0x4e,0x0d,0x50,0x61,0x72,0x74,0x43,0x6f,0x6d,0x70,0x6f, + 0x6e,0x65,0x6e,0x74,0x00, }; KINLINE void SystemDevice_Init( @@ -385,6 +387,6 @@ KReturn(ERR_METHOD_NOT_FOUND); } -#define SystemDevice_ClassName "Linux_PowerSystemDevice" +#define SystemDevice_ClassName "Linux_PowerSupplySystemDevice" #endif /* _konkrete_SystemDevice_h */ Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c 2008-08-19 19:40:52 UTC (rev 866) @@ -203,18 +203,18 @@ CMInstanceMIStub( SystemDevice, - Linux_PowerSystemDevice, + Linux_PowerSupplySystemDevice, _cb, SystemDeviceInitialize()) CMAssociationMIStub( SystemDevice, - Linux_PowerSystemDevice, + Linux_PowerSupplySystemDevice, _cb, SystemDeviceInitialize()) KONKRET_REGISTRATION( "root/cimv2", - "Linux_PowerSystemDevice", - "Linux_PowerSystemDevice", + "Linux_PowerSupplySystemDevice", + "Linux_PowerSupplySystemDevice", "instance association"); Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon =================================================================== --- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon 2008-08-19 19:30:55 UTC (rev 865) +++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/linux-power-supply-profile.kon 2008-08-19 19:40:52 UTC (rev 866) @@ -6,12 +6,12 @@ ## Linux_ComputerSystem=ComputerSystem Linux_PowerSupply=PowerSupply! -Linux_PowerSystemDevice=SystemDevice! -Linux_PowerRegisteredProfile=RegisteredProfile! -Linux_PowerRedundancySet=RedundancySet! -Linux_PowerHostedCollection=HostedCollection! -Linux_PowerIsSpare=IsSpare! -Linux_PowerMemberOfCollection=MemberOfCollection! -Linux_PowerOwningCollectionElement=OwningCollectionElement! -Linux_PowerElementConformsToProfile=ElementConformsToProfile! -Linux_PowerReferencedProfile=ReferencedProfile! +Linux_PowerSupplySystemDevice=SystemDevice! +Linux_PowerSupplyRegisteredProfile=RegisteredProfile! +Linux_PowerSupplyRedundancySet=RedundancySet! +Linux_PowerSupplyHostedCollection=HostedCollection! +Linux_PowerSupplyIsSpare=IsSpare! +Linux_PowerSupplyMemberOfCollection=MemberOfCollection! +Linux_PowerSupplyOwningCollectionElement=OwningCollectionElement! +Linux_PowerSupplyElementConformsToProfile=ElementConformsToProfile! +Linux_PowerSupplyReferencedProfile=ReferencedProfile! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |