# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1237338803 25200 # Node ID ed393e68e8997a324651fa923e36307bae80e0ce # Parent c9ad0f077d3882423b438340d3b557c398d4c582 (#2) Add RASDs to use when defining Network Pools Updates: -Don't remove the build target for Virt_ResourcePoolConfigurationCapabilities.c Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r c9ad0f077d38 -r ed393e68e899 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Tue Mar 17 18:13:23 2009 -0700 +++ b/schema/ResourceAllocationSettingData.mof Tue Mar 17 18:13:23 2009 -0700 @@ -163,3 +163,35 @@ string BusType; }; +[Description ("Xen virtual pool settings"), + Provider("cmpi::Virt_RASD") +] +class Xen_NetPoolResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ + string Netmask; + string IPRangeStart; + string IPRangeEnd; + string ForwardMode; +}; + +[Description ("KVM virtual pool settings"), + Provider("cmpi::Virt_RASD") +] +class KVM_NetPoolResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ + string Netmask; + string IPRangeStart; + string IPRangeEnd; + string ForwardMode; +}; + +[Description ("LXC virtual pool settings"), + Provider("cmpi::Virt_RASD") +] +class LXC_NetPoolResourceAllocationSettingData : LXC_ResourceAllocationSettingData +{ + string Netmask; + string IPRangeStart; + string IPRangeEnd; + string ForwardMode; +}; diff -r c9ad0f077d38 -r ed393e68e899 src/Makefile.am --- a/src/Makefile.am Tue Mar 17 18:13:23 2009 -0700 +++ b/src/Makefile.am Tue Mar 17 18:13:23 2009 -0700 @@ -157,9 +157,11 @@ libVirt_RASD_la_SOURCES = Virt_RASD.c libVirt_RASD_la_LIBADD = -lVirt_Device -libVirt_ResourcePoolConfigurationService_la_DEPENDENCIES = libVirt_HostSystem.la +libVirt_ResourcePoolConfigurationService_la_DEPENDENCIES = libVirt_HostSystem.la libVirt_DevicePool.la libVirt_RASD.la libVirt_ResourcePoolConfigurationService_la_SOURCES = Virt_ResourcePoolConfigurationService.c -libVirt_ResourcePoolConfigurationService_la_LIBADD = -lVirt_HostSystem +libVirt_ResourcePoolConfigurationService_la_LIBADD = -lVirt_HostSystem \ + -lVirt_DevicePool \ + -lVirt_RASD libVirt_ResourcePoolConfigurationCapabilities_la_SOURCES = Virt_ResourcePoolConfigurationCapabilities.c diff -r c9ad0f077d38 -r ed393e68e899 src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Mar 17 18:13:23 2009 -0700 +++ b/src/Virt_RASD.c Tue Mar 17 18:13:23 2009 -0700 @@ -526,7 +526,8 @@ if (STREQ(base, "DiskResourceAllocationSettingData")) *type = CIM_RES_TYPE_DISK; - else if (STREQ(base, "NetResourceAllocationSettingData")) + else if ((STREQ(base, "NetResourceAllocationSettingData")) || + (STREQ(base, "NetPoolResourceAllocationSettingData"))) *type = CIM_RES_TYPE_NET; else if (STREQ(base, "ProcResourceAllocationSettingData")) *type = CIM_RES_TYPE_PROC;