# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1238776732 25200 # Node ID 2bd3982a2285fbfb5287861cfecb1a70e0fe4b43 # Parent 0d6b3f8aa95de7a57576e1d686ec23190903081e Add DiskPoolRASD MOF definitions Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 0d6b3f8aa95d -r 2bd3982a2285 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Fri Apr 03 09:38:51 2009 -0700 +++ b/schema/ResourceAllocationSettingData.mof Fri Apr 03 09:38:52 2009 -0700 @@ -163,7 +163,7 @@ string BusType; }; -[Description ("Xen virtual pool settings"), +[Description ("Xen virtual network pool settings"), Provider("cmpi::Virt_RASD") ] class Xen_NetPoolResourceAllocationSettingData : Xen_ResourceAllocationSettingData @@ -174,7 +174,7 @@ string ForwardMode; }; -[Description ("KVM virtual pool settings"), +[Description ("KVM virtual network pool settings"), Provider("cmpi::Virt_RASD") ] class KVM_NetPoolResourceAllocationSettingData : KVM_ResourceAllocationSettingData @@ -185,7 +185,7 @@ string ForwardMode; }; -[Description ("LXC virtual pool settings"), +[Description ("LXC virtual network pool settings"), Provider("cmpi::Virt_RASD") ] class LXC_NetPoolResourceAllocationSettingData : LXC_ResourceAllocationSettingData @@ -195,3 +195,43 @@ string IPRangeEnd; string ForwardMode; }; + +[Description ("Xen virtual disk pool settings"), + Provider("cmpi::Virt_RASD") +] +class Xen_DiskPoolResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ + [Description ("Storage pool type"), + ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + Values {"Unknown", "Directory, File System, Network File System, " + "Disk, ISCSI, Logical"}] + uint16 Type; + string Path; +}; + +[Description ("KVM virtual disk pool settings"), + Provider("cmpi::Virt_RASD") +] +class KVM_DiskPoolResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ + [Description ("Storage pool type"), + ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + Values {"Unknown", "Directory, File System, Network File System, " + "Disk, ISCSI, Logical"}] + uint16 Type; + string Path; +}; + +[Description ("LXC virtual disk pool settings"), + Provider("cmpi::Virt_RASD") +] +class LXC_DiskPoolResourceAllocationSettingData : LXC_ResourceAllocationSettingData +{ + [Description ("Storage pool type"), + ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + Values {"Unknown", "Directory, File System, Network File System, " + "Disk, ISCSI, Logical"}] + uint16 Type; + string Path; +}; + diff -r 0d6b3f8aa95d -r 2bd3982a2285 src/Virt_RASD.c --- a/src/Virt_RASD.c Fri Apr 03 09:38:51 2009 -0700 +++ b/src/Virt_RASD.c Fri Apr 03 09:38:52 2009 -0700 @@ -524,7 +524,8 @@ if (base == NULL) goto out; - if (STREQ(base, "DiskResourceAllocationSettingData")) + if ((STREQ(base, "DiskResourceAllocationSettingData")) || + (STREQ(base, "DiskPoolResourceAllocationSettingData"))) *type = CIM_RES_TYPE_DISK; else if ((STREQ(base, "NetResourceAllocationSettingData")) || (STREQ(base, "NetPoolResourceAllocationSettingData")))