[Libvirt-cim] [PATCH 3 of 4] Add RASDs to use when defining Network Pools

[Kaitlin Rupert]

# HG changeset patch
# User Kaitlin Rupert <karupert at us.ibm.com>
# Date 1237338803 25200
# Node ID f288f7d8f63cbc710f0c4c207771fdf3bb6985bb
# Parent  a0858ba3fe8dcd82c695e1c28938bab3210da705
Add RASDs to use when defining Network Pools

Signed-off-by: Kaitlin Rupert <karupert at us.ibm.com>

diff -r a0858ba3fe8d -r f288f7d8f63c 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 a0858ba3fe8d -r f288f7d8f63c 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,11 +157,13 @@
 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_ResourcePoolConfigurationCapabilities_la_SOURCES = Virt_ResourcePoolConfigurationCapabilities.c
+libVirt_ResourcePoolConfigurationService_la_LIBADD = -lVirt_HostSystem \
+                                                     -lVirt_DevicePool \
+                                                     -lVirt_RASD
 
 libVirt_VSSDComponent_la_DEPENDENCIES = libVirt_VSSD.la libVirt_RASD.la
 libVirt_VSSDComponent_la_SOURCES = Virt_VSSDComponent.c
diff -r a0858ba3fe8d -r f288f7d8f63c 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;