# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1206390931 25200 # Node ID 560f30acf513ef3738aa0265c3a9c65841c53393 # Parent c8c0e264c75cccccb40ff0de1cfdfc7a14c3d65a Add LXC support to schema There are definitely some bits that need to be revisited here, but this at least gives us an LXC class for everything. Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r c8c0e264c75c -r 560f30acf513 schema/AllocationCapabilities.mof --- a/schema/AllocationCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/AllocationCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -10,3 +10,8 @@ class KVM_AllocationCapabilities : CIM_A { }; +[Provider("cmpi::Virt_AllocationCapabilities")] +class LXC_AllocationCapabilities : CIM_AllocationCapabilities +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/AllocationCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_AllocationCapabilities root/virt Virt_AllocationCapabilities Virt_AllocationCapabilities instance KVM_AllocationCapabilities root/virt Virt_AllocationCapabilities Virt_AllocationCapabilities instance +LXC_AllocationCapabilities root/virt Virt_AllocationCapabilities Virt_AllocationCapabilities instance diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystem.mof --- a/schema/ComputerSystem.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystem.mof Mon Mar 24 13:35:31 2008 -0700 @@ -26,3 +26,16 @@ class KVM_ComputerSystem : CIM_ComputerS }; +[Description ( + "A class derived from CIM_ComputerSystem to represent " + "the LXC virtual machines running on the system."), + Provider("cmpi::Virt_ComputerSystem") +] +class LXC_ComputerSystem : CIM_ComputerSystem +{ + + [Description("UUID assigned to this virtual machine.")] + string UUID; + +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystem.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance method KVM_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance method +LXC_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance method diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystemIndication.mof --- a/schema/ComputerSystemIndication.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystemIndication.mof Mon Mar 24 13:35:31 2008 -0700 @@ -41,3 +41,24 @@ class KVM_ComputerSystemModifiedIndicati class KVM_ComputerSystemModifiedIndication : CIM_InstModification { }; + +[Description ("LXC_ComputerSystem created"), + Provider("cmpi::Virt_ComputerSystemIndication") +] +class LXC_ComputerSystemCreatedIndication : CIM_InstCreation +{ +}; + +[Description ("LXC_ComputerSystem deleted"), + Provider("cmpi::Virt_ComputerSystemIndication") +] +class LXC_ComputerSystemDeletedIndication : CIM_InstDeletion +{ +}; + +[Description ("LXC_ComputerSystem modified"), + Provider("cmpi::Virt_ComputerSystemIndication") +] +class LXC_ComputerSystemModifiedIndication : CIM_InstModification +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystemIndication.registration Mon Mar 24 13:35:31 2008 -0700 @@ -6,3 +6,4 @@ KVM_ComputerSystemCreatedIndication root KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method KVM_ComputerSystemModifiedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +LXC_ComputerSystemModifiedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystemMigrationIndication.mof --- a/schema/ComputerSystemMigrationIndication.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystemMigrationIndication.mof Mon Mar 24 13:35:31 2008 -0700 @@ -12,6 +12,14 @@ class Xen_ComputerSystemMigrationJobCrea Provider("cmpi::Virt_ComputerSystemMigrationIndication") ] class KVM_ComputerSystemMigrationJobCreatedIndication : CIM_InstCreation +{ + uint32 RaiseIndication([IN] CIM_InstCreation REF TheIndication); +}; + +[Description ("LXC_ComputerSystem migration status"), + Provider("cmpi::Virt_ComputerSystemMigrationIndication") +] +class LXC_ComputerSystemMigrationJobCreatedIndication : CIM_InstCreation { uint32 RaiseIndication([IN] CIM_InstCreation REF TheIndication); }; @@ -32,6 +40,14 @@ class KVM_ComputerSystemMigrationJobModi uint32 RaiseIndication([IN] CIM_InstModification REF TheIndication); }; +[Description ("LXC_ComputerSystem migration status"), + Provider("cmpi::Virt_ComputerSystemMigrationIndication") +] +class LXC_ComputerSystemMigrationJobModifiedIndication : CIM_InstModification +{ + uint32 RaiseIndication([IN] CIM_InstModification REF TheIndication); +}; + [Description ("Xen_ComputerSystem migration status"), Provider("cmpi::Virt_ComputerSystemMigrationIndication") ] @@ -47,3 +63,11 @@ class KVM_ComputerSystemMigrationJobDele { uint32 RaiseIndication([IN] CIM_InstDeletion REF TheIndication); }; + +[Description ("LXC_ComputerSystem migration status"), + Provider("cmpi::Virt_ComputerSystemMigrationIndication") +] +class LXC_ComputerSystemMigrationJobDeletedIndication : CIM_InstDeletion +{ + uint32 RaiseIndication([IN] CIM_InstDeletion REF TheIndication); +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ComputerSystemMigrationIndication.registration --- a/schema/ComputerSystemMigrationIndication.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ComputerSystemMigrationIndication.registration Mon Mar 24 13:35:31 2008 -0700 @@ -6,3 +6,4 @@ KVM_ComputerSystemMigrationJobCreatedInd KVM_ComputerSystemMigrationJobCreatedIndication root/virt Virt_ComputerSystemMigrationIndicationProvider Virt_ComputerSystemMigrationIndication indication method KVM_ComputerSystemMigrationJobModifiedIndication root/virt Virt_ComputerSystemMigrationIndicationProvider Virt_ComputerSystemMigrationIndication indication method KVM_ComputerSystemMigrationJobDeletedIndication root/virt Virt_ComputerSystemMigrationIndicationProvider Virt_ComputerSystemMigrationIndication indication method +LXC_ComputerSystemMigrationJobDeletedIndication root/virt Virt_ComputerSystemMigrationIndicationProvider Virt_ComputerSystemMigrationIndication indication method diff -r c8c0e264c75c -r 560f30acf513 schema/DiskPool.mof --- a/schema/DiskPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/DiskPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -10,3 +10,8 @@ class KVM_DiskPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] +class LXC_DiskPool : CIM_ResourcePool +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/DiskPool.registration --- a/schema/DiskPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/DiskPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance KVM_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r c8c0e264c75c -r 560f30acf513 schema/ElementAllocatedFromPool.mof --- a/schema/ElementAllocatedFromPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementAllocatedFromPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -13,3 +13,10 @@ class KVM_ElementAllocatedFromPool : CIM class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { }; + +[Association, + Provider("cmpi::Virt_ElementAllocatedFromPool") +] +class LXC_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementAllocatedFromPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool Virt_ElementAllocatedFromPool association KVM_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool Virt_ElementAllocatedFromPool association +LXC_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool Virt_ElementAllocatedFromPool association diff -r c8c0e264c75c -r 560f30acf513 schema/ElementCapabilities.mof --- a/schema/ElementCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,12 @@ class KVM_ElementCapabilities : CIM_Elem { }; +[Association, + Description ( + "A class to associate a ManagedElement with its Capabilities."), + Provider("cmpi::Virt_ElementCapabilities") +] +class LXC_ElementCapabilities : CIM_ElementCapabilities +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/ElementCapabilities.registration --- a/schema/ElementCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities association KVM_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities association +LXC_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities association diff -r c8c0e264c75c -r 560f30acf513 schema/ElementConformsToProfile.mof --- a/schema/ElementConformsToProfile.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementConformsToProfile.mof Mon Mar 24 13:35:31 2008 -0700 @@ -26,3 +26,15 @@ class KVM_ElementConformsToProfile : CIM }; +[Association, + Description ( + "A class to associate a ManagedElement with its RegisteredProfile."), + Provider("cmpi::Virt_ElementConformsToProfile") +] +class LXC_ElementConformsToProfile : CIM_ElementConformsToProfile +{ + + [Override ("ConformantStandard")] + LXC_RegisteredProfile REF ConformantStandard; + +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementConformsToProfile.registration Mon Mar 24 13:35:31 2008 -0700 @@ -4,3 +4,4 @@ Xen_ElementConformsToProfile root/intero Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfile Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile association +LXC_ElementConformsToProfile root/interop Virt_ElementConformsToProfile Virt_ElementConformsToProfile association diff -r c8c0e264c75c -r 560f30acf513 schema/ElementSettingData.mof --- a/schema/ElementSettingData.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementSettingData.mof Mon Mar 24 13:35:31 2008 -0700 @@ -13,3 +13,10 @@ class KVM_ElementSettingData : CIM_Eleme class KVM_ElementSettingData : CIM_ElementSettingData { }; + +[Association, + Provider("cmpi::Virt_ElementSettingData") +] +class LXC_ElementSettingData : CIM_ElementSettingData +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ElementSettingData.registration --- a/schema/ElementSettingData.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ElementSettingData.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData association KVM_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData association +LXC_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData association diff -r c8c0e264c75c -r 560f30acf513 schema/EnabledLogicalElementCapabilities.mof --- a/schema/EnabledLogicalElementCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/EnabledLogicalElementCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_EnabledLogicalElementCapabilit { }; +[Description ( + "A class derived from CIM_Capabilities to represent " + "the changes that can be made to a started LXC virtual system"), + Provider("cmpi::Virt_EnabledLogicalElementCapabilities") +] +class LXC_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/EnabledLogicalElementCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities Virt_EnabledLogicalElementCapabilities instance KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities Virt_EnabledLogicalElementCapabilities instance +LXC_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities Virt_EnabledLogicalElementCapabilities instance diff -r c8c0e264c75c -r 560f30acf513 schema/HostSystem.mof --- a/schema/HostSystem.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostSystem.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_HostSystem : CIM_ComputerSyste { }; +[Description ( + "A class derived from CIM_ComputerSystem to represent " + "the LXC host system."), + Provider("cmpi::Virt_HostSystem") +] +class LXC_HostSystem : CIM_ComputerSystem +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/HostSystem.registration --- a/schema/HostSystem.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostSystem.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance KVM_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance +LXC_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance diff -r c8c0e264c75c -r 560f30acf513 schema/HostedDependency.mof --- a/schema/HostedDependency.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedDependency.mof Mon Mar 24 13:35:31 2008 -0700 @@ -19,3 +19,13 @@ class KVM_HostedDependency : CIM_HostedD class KVM_HostedDependency : CIM_HostedDependency { }; + +[Association, + Description ( + "HostedDependency defines a ManagedElement in the context of " + "another ManagedElement in which it resides."), + Provider("cmpi::Virt_HostedDependency") +] +class LXC_HostedDependency : CIM_HostedDependency +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/HostedDependency.registration --- a/schema/HostedDependency.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedDependency.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association KVM_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association +LXC_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association diff -r c8c0e264c75c -r 560f30acf513 schema/HostedResourcePool.mof --- a/schema/HostedResourcePool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedResourcePool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -16,4 +16,13 @@ class Xen_HostedResourcePool : CIM_Hoste ] class KVM_HostedResourcePool : CIM_HostedResourcePool { -}; \ No newline at end of file +}; + +[Association, + Description ( + "Associates a host system to its resource pools"), + Provider("cmpi::Virt_HostedResourcePool") +] +class LXC_HostedResourcePool : CIM_HostedResourcePool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedResourcePool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association -KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association \ No newline at end of file +KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool associationLXC_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association diff -r c8c0e264c75c -r 560f30acf513 schema/HostedService.mof --- a/schema/HostedService.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedService.mof Mon Mar 24 13:35:31 2008 -0700 @@ -13,3 +13,10 @@ class KVM_HostedService : CIM_HostedServ class KVM_HostedService : CIM_HostedService { }; + +[Association, + Provider("cmpi::Virt_HostedService") +] +class LXC_HostedService : CIM_HostedService +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/HostedService.registration --- a/schema/HostedService.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/HostedService.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedService root/virt Virt_HostedService Virt_HostedService association KVM_HostedService root/virt Virt_HostedService Virt_HostedService association +LXC_HostedService root/virt Virt_HostedService Virt_HostedService association diff -r c8c0e264c75c -r 560f30acf513 schema/LogicalDisk.mof --- a/schema/LogicalDisk.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/LogicalDisk.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,12 @@ class KVM_LogicalDisk : CIM_LogicalDisk { }; +[Description ( + "A class derived from CIM_LogicalDisk to represent " + "the KVM virtual disks on the system."), + Provider("cmpi::Virt_Device") +] +class LXC_LogicalDisk : CIM_LogicalDisk +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/LogicalDisk.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_LogicalDisk root/virt Virt_Device Virt_Device instance KVM_LogicalDisk root/virt Virt_Device Virt_Device instance +LXC_LogicalDisk root/virt Virt_Device Virt_Device instance diff -r c8c0e264c75c -r 560f30acf513 schema/Memory.mof --- a/schema/Memory.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/Memory.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_Memory : CIM_Memory { }; +[Description ( + "A class derived from CIM_Memory to represent " + "the KVM virtual memory."), + Provider("cmpi::Virt_Device") +] +class LXC_Memory : CIM_Memory +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/Memory.registration --- a/schema/Memory.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/Memory.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_Memory root/virt Virt_Device Virt_Device instance KVM_Memory root/virt Virt_Device Virt_Device instance +LXC_Memory root/virt Virt_Device Virt_Device instance diff -r c8c0e264c75c -r 560f30acf513 schema/MemoryPool.mof --- a/schema/MemoryPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/MemoryPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -10,3 +10,7 @@ class KVM_MemoryPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] +class LXC_MemoryPool : CIM_ResourcePool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/MemoryPool.registration --- a/schema/MemoryPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/MemoryPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance KVM_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r c8c0e264c75c -r 560f30acf513 schema/NetPool.mof --- a/schema/NetPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/NetPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -10,3 +10,7 @@ class KVM_NetworkPool : CIM_ResourcePool { }; +[Provider("cmpi::Virt_DevicePool")] +class LXC_NetworkPool : CIM_ResourcePool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/NetPool.registration --- a/schema/NetPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/NetPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance -KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance \ No newline at end of file +KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instanceLXC_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r c8c0e264c75c -r 560f30acf513 schema/NetworkPort.mof --- a/schema/NetworkPort.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/NetworkPort.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_NetworkPort : CIM_NetworkPort { }; +[Description ( + "A class derived from CIM_NetworkPort to represent " + "the LXC virtual network interfaces on the system."), + Provider("cmpi::Virt_Device") +] +class LXC_NetworkPort : CIM_NetworkPort +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/NetworkPort.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_NetworkPort root/virt Virt_Device Virt_Device instance KVM_NetworkPort root/virt Virt_Device Virt_Device instance +LXC_NetworkPort root/virt Virt_Device Virt_Device instance diff -r c8c0e264c75c -r 560f30acf513 schema/Processor.mof --- a/schema/Processor.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/Processor.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_Processor : CIM_Processor { }; +[Description ( + "A class derived from CIM_Processor to represent " + "the LXC virtual processors."), + Provider("cmpi::Virt_Device") +] +class LXC_Processor : CIM_Processor +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/Processor.registration --- a/schema/Processor.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/Processor.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_Processor root/virt Virt_Device Virt_Device instance KVM_Processor root/virt Virt_Device Virt_Device instance +LXC_Processor root/virt Virt_Device Virt_Device instance diff -r c8c0e264c75c -r 560f30acf513 schema/ProcessorPool.mof --- a/schema/ProcessorPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ProcessorPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -10,3 +10,7 @@ class KVM_ProcessorPool : CIM_ResourcePo { }; +[Provider("cmpi::Virt_DevicePool")] +class LXC_ProcessorPool : CIM_ResourcePool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ProcessorPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance KVM_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r c8c0e264c75c -r 560f30acf513 schema/ReferencedProfile.mof --- a/schema/ReferencedProfile.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ReferencedProfile.mof Mon Mar 24 13:35:31 2008 -0700 @@ -32,3 +32,18 @@ class KVM_ReferencedProfile : CIM_Refere }; +[Association, + Description ( + "Associates a RegisteredProfile with its scoping RegisteredProfile."), + Provider("cmpi::Virt_ReferencedProfile") +] +class LXC_ReferencedProfile : CIM_ReferencedProfile +{ + + [Override ("Antecedent")] + LXC_RegisteredProfile REF Antecedent; + + [Override ("Dependent")] + LXC_RegisteredProfile REF Dependent; + +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ReferencedProfile.registration --- a/schema/ReferencedProfile.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ReferencedProfile.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ReferencedProfile root/interop Virt_ReferencedProfile Virt_ReferencedProfile association KVM_ReferencedProfile root/interop Virt_ReferencedProfile Virt_ReferencedProfile association +LXC_ReferencedProfile root/interop Virt_ReferencedProfile Virt_ReferencedProfile association diff -r c8c0e264c75c -r 560f30acf513 schema/RegisteredProfile.mof --- a/schema/RegisteredProfile.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/RegisteredProfile.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,12 @@ class KVM_RegisteredProfile : CIM_Regist { }; +[Description ( + "A class derived from CIM_RegisteredProfile to represent " + "an advertised conformant profile."), + Provider("cmpi::Virt_RegisteredProfile") +] +class LXC_RegisteredProfile : CIM_RegisteredProfile +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/RegisteredProfile.registration --- a/schema/RegisteredProfile.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/RegisteredProfile.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile instance KVM_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile instance +LXC_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile instance diff -r c8c0e264c75c -r 560f30acf513 schema/ResourceAllocationFromPool.mof --- a/schema/ResourceAllocationFromPool.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourceAllocationFromPool.mof Mon Mar 24 13:35:31 2008 -0700 @@ -13,3 +13,10 @@ class KVM_ResourceAllocationFromPool : C class KVM_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool { }; + +[Association, + Provider("cmpi::Virt_ResourceAllocationFromPool") +] +class LXC_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourceAllocationFromPool.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association \ No newline at end of file +KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool associationLXC_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association diff -r c8c0e264c75c -r 560f30acf513 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourceAllocationSettingData.mof Mon Mar 24 13:35:31 2008 -0700 @@ -5,6 +5,10 @@ class Xen_ResourceAllocationSettingData }; class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData +{ +}; + +class LXC_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { }; @@ -30,6 +34,13 @@ class KVM_DiskResourceAllocationSettingD }; +[Description ("LXC virtual disk configuration"), + Provider("cmpi::Virt_RASD") +] +class LXC_DiskResourceAllocationSettingData : LXC_ResourceAllocationSettingData +{ +}; + [Description ("Xen virtual network configuration"), Provider("cmpi::Virt_RASD") ] @@ -52,6 +63,13 @@ class KVM_NetResourceAllocationSettingDa }; +[Description ("LXC virtual network configuration"), + Provider("cmpi::Virt_RASD") +] +class LXC_NetResourceAllocationSettingData : LXC_ResourceAllocationSettingData +{ +}; + [Description ("Xen virtual processor"), Provider("cmpi::Virt_RASD") ] @@ -63,6 +81,13 @@ class Xen_ProcResourceAllocationSettingD Provider("cmpi::Virt_RASD") ] class KVM_ProcResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ +}; + +[Description ("LXC virtual processor"), + Provider("cmpi::Virt_RASD") +] +class LXC_ProcResourceAllocationSettingData : LXC_ResourceAllocationSettingData { }; @@ -79,3 +104,10 @@ class KVM_MemResourceAllocationSettingDa class KVM_MemResourceAllocationSettingData : KVM_ResourceAllocationSettingData { }; + +[Description ("LXC virtual memory"), + Provider("cmpi::Virt_RASD") +] +class LXC_MemResourceAllocationSettingData : LXC_ResourceAllocationSettingData +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourceAllocationSettingData.registration Mon Mar 24 13:35:31 2008 -0700 @@ -8,3 +8,4 @@ KVM_NetResourceAllocationSettingData roo KVM_NetResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance KVM_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance KVM_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance +LXC_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance diff -r c8c0e264c75c -r 560f30acf513 schema/ResourcePoolConfigurationCapabilities.mof --- a/schema/ResourcePoolConfigurationCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourcePoolConfigurationCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -9,3 +9,8 @@ class KVM_ResourcePoolConfigurationCapab class KVM_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities { }; + +[Provider("cmpi::Virt_ResourcePoolConfigurationCapabilities")] +class LXC_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instanceLXC_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance diff -r c8c0e264c75c -r 560f30acf513 schema/ResourcePoolConfigurationService.mof --- a/schema/ResourcePoolConfigurationService.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourcePoolConfigurationService.mof Mon Mar 24 13:35:31 2008 -0700 @@ -9,3 +9,8 @@ class KVM_ResourcePoolConfigurationServi class KVM_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService { }; + +[Provider("cmpi::Virt_ResourcePoolConfigurationService")] +class LXC_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/ResourcePoolConfigurationService.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method -KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method \ No newline at end of file +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance methodLXC_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method diff -r c8c0e264c75c -r 560f30acf513 schema/SettingsDefineCapabilities.mof --- a/schema/SettingsDefineCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SettingsDefineCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -14,3 +14,10 @@ class KVM_SettingsDefineCapabilities : C { }; +[Association, + Provider("cmpi::Virt_SettingsDefineCapabilities") +] +class LXC_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities +{ +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SettingsDefineCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities Virt_SettingsDefineCapabilities association KVM_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities Virt_SettingsDefineCapabilities association +LXC_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities Virt_SettingsDefineCapabilities association diff -r c8c0e264c75c -r 560f30acf513 schema/SettingsDefineState.mof --- a/schema/SettingsDefineState.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SettingsDefineState.mof Mon Mar 24 13:35:31 2008 -0700 @@ -12,4 +12,11 @@ class Xen_SettingsDefineState : CIM_Sett ] class KVM_SettingsDefineState : CIM_SettingsDefineState { -}; \ No newline at end of file +}; + +[Association, + Provider("cmpi::Virt_SettingsDefineState") +] +class LXC_SettingsDefineState : CIM_SettingsDefineState +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SettingsDefineState.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState association KVM_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState association +LXC_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState association diff -r c8c0e264c75c -r 560f30acf513 schema/SystemDevice.mof --- a/schema/SystemDevice.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SystemDevice.mof Mon Mar 24 13:35:31 2008 -0700 @@ -32,3 +32,18 @@ class KVM_SystemDevice : CIM_SystemDevic }; +[Association, + Description ( + "A class to associate a LXC_ComputerSystem with its devices." ), + Provider("cmpi::Virt_SystemDevice") +] +class LXC_SystemDevice : CIM_SystemDevice +{ + + [Override ( "GroupComponent" )] + LXC_ComputerSystem REF GroupComponent; + + [Override ( "PartComponent" )] + CIM_LogicalDevice REF PartComponent; + +}; diff -r c8c0e264c75c -r 560f30acf513 schema/SystemDevice.registration --- a/schema/SystemDevice.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/SystemDevice.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association KVM_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association +LXC_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationCapabilities.mof --- a/schema/VSMigrationCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -17,3 +17,7 @@ class Xen_VirtualSystemMigrationCapabili [Provider("cmpi::Virt_VSMigrationCapabilities")] class KVM_VirtualSystemMigrationCapabilities : CIM_VirtualSystemMigrationCapabilities { }; + +[Provider("cmpi::Virt_VSMigrationCapabilities")] +class LXC_VirtualSystemMigrationCapabilities : CIM_VirtualSystemMigrationCapabilities { +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationCapabilities.registration --- a/schema/VSMigrationCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance -KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance \ No newline at end of file +KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instanceLXC_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationService.mof --- a/schema/VSMigrationService.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationService.mof Mon Mar 24 13:35:31 2008 -0700 @@ -76,3 +76,7 @@ class KVM_VirtualSystemMigrationService class KVM_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService { }; +[Provider("cmpi::Virt_VSMigrationService")] +class LXC_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService { +}; + diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationService.registration --- a/schema/VSMigrationService.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationService.registration Mon Mar 24 13:35:31 2008 -0700 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method -KVM_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method \ No newline at end of file +KVM_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance methodLXC_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationSettingData.mof --- a/schema/VSMigrationSettingData.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationSettingData.mof Mon Mar 24 13:35:31 2008 -0700 @@ -21,3 +21,11 @@ class KVM_VirtualSystemMigrationSettingD uint16 TransportType; string CheckParameters[]; }; + +[Provider("cmpi::Virt_VSMigrationSettingData")] +class LXC_VirtualSystemMigrationSettingData : CIM_VirtualSystemMigrationSettingData { + [ ValueMap {"0","1","2","3","4","5","6"}, + Values { "Unknown", "Other", "SSH", "TLS", "TLS Strict", "TCP", "UNIX" }] + uint16 TransportType; + string CheckParameters[]; +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VSMigrationSettingData.registration --- a/schema/VSMigrationSettingData.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSMigrationSettingData.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemMigrationSettingData root/virt Virt_VSMigrationSettingData Virt_VSMigrationSettingData instance KVM_VirtualSystemMigrationSettingData root/virt Virt_VSMigrationSettingData Virt_VSMigrationSettingData instance +LXC_VirtualSystemMigrationSettingData root/virt Virt_VSMigrationSettingData Virt_VSMigrationSettingData instance diff -r c8c0e264c75c -r 560f30acf513 schema/VSSD.mof --- a/schema/VSSD.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSSD.mof Mon Mar 24 13:35:31 2008 -0700 @@ -34,3 +34,16 @@ class KVM_VirtualSystemSettingData : CIM string BootDevice; }; + +[Description ( + "A class derived from CIM_VirtualSystemSettingData to represent " + "the config of LXC containers running on the system."), + Provider("cmpi::Virt_VSSD") +] +class LXC_VirtualSystemSettingData : CIM_VirtualSystemSettingData +{ + + [Description ("Path to the init process for the container")] + string InitPath; + +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VSSD.registration --- a/schema/VSSD.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSSD.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance KVM_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance +LXC_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance diff -r c8c0e264c75c -r 560f30acf513 schema/VSSDComponent.mof --- a/schema/VSSDComponent.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSSDComponent.mof Mon Mar 24 13:35:31 2008 -0700 @@ -13,3 +13,10 @@ class KVM_VirtualSystemSettingDataCompon class KVM_VirtualSystemSettingDataComponent : CIM_Component { }; + +[Association, + Provider("cmpi::Virt_VSSDComponent") +] +class LXC_VirtualSystemSettingDataComponent : CIM_Component +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VSSDComponent.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent association KVM_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent association +LXC_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent association diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemManagementCapabilities.mof --- a/schema/VirtualSystemManagementCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemManagementCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -18,3 +18,11 @@ class KVM_VirtualSystemManagementCapabil { }; +[Description ( + "A class derived from CIM_Capabilities to represent " + "the management capabilities of a LXC virtual system."), + Provider("cmpi::Virt_VirtualSystemManagementCapabilities") +] +class LXC_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemManagementCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities instance KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities instance +LXC_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities instance diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemManagementService.mof --- a/schema/VirtualSystemManagementService.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemManagementService.mof Mon Mar 24 13:35:31 2008 -0700 @@ -9,3 +9,8 @@ class KVM_VirtualSystemManagementService class KVM_VirtualSystemManagementService : CIM_VirtualSystemManagementService { }; + +[Provider("cmpi::Virt_VirtualSystemManagementService")] +class LXC_VirtualSystemManagementService : CIM_VirtualSystemManagementService +{ +}; diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemManagementService.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance KVM_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +LXC_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemSnapshotService.mof --- a/schema/VirtualSystemSnapshotService.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemSnapshotService.mof Mon Mar 24 13:35:31 2008 -0700 @@ -5,3 +5,4 @@ "32769: Memory-only, terminal (domain is offline after op)")] class Xen_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; class KVM_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; +class LXC_VirtualSystemSnapshotService : CIM_VirtualSystemSnapshotService { }; diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemSnapshotService.registration --- a/schema/VirtualSystemSnapshotService.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemSnapshotService.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSnapshotService root/virt Virt_VirtualSystemSnapshotService Virt_VirtualSystemSnapshotService method instance KVM_VirtualSystemSnapshotService root/virt Virt_VirtualSystemSnapshotService Virt_VirtualSystemSnapshotService method instance +LXC_VirtualSystemSnapshotService root/virt Virt_VirtualSystemSnapshotService Virt_VirtualSystemSnapshotService method instance diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemSnapshotServiceCapabilities.mof --- a/schema/VirtualSystemSnapshotServiceCapabilities.mof Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemSnapshotServiceCapabilities.mof Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ class Xen_VirtualSystemSnapshotServiceCapabilities : CIM_VirtualSystemSnapshotServiceCapabilities {}; class KVM_VirtualSystemSnapshotServiceCapabilities : CIM_VirtualSystemSnapshotServiceCapabilities {}; +class LXC_VirtualSystemSnapshotServiceCapabilities : CIM_VirtualSystemSnapshotServiceCapabilities {}; diff -r c8c0e264c75c -r 560f30acf513 schema/VirtualSystemSnapshotServiceCapabilities.registration --- a/schema/VirtualSystemSnapshotServiceCapabilities.registration Thu Mar 20 10:47:48 2008 -0700 +++ b/schema/VirtualSystemSnapshotServiceCapabilities.registration Mon Mar 24 13:35:31 2008 -0700 @@ -2,3 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSnapshotServiceCapabilities root/virt Virt_VirtualSystemSnapshotServiceCapabilities Virt_VirtualSystemSnapshotServiceCapabilities instance KVM_VirtualSystemSnapshotServiceCapabilities root/virt Virt_VirtualSystemSnapshotServiceCapabilities Virt_VirtualSystemSnapshotServiceCapabilities instance +LXC_VirtualSystemSnapshotServiceCapabilities root/virt Virt_VirtualSystemSnapshotServiceCapabilities Virt_VirtualSystemSnapshotServiceCapabilities instance

# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1206390944 25200 # Node ID be1948c5fb0eb677fd45b177012b49674bee3da5 # Parent 560f30acf513ef3738aa0265c3a9c65841c53393 Add LXC support to misc_utils functions Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r 560f30acf513 -r be1948c5fb0e libxkutil/misc_util.c --- a/libxkutil/misc_util.c Mon Mar 24 13:35:31 2008 -0700 +++ b/libxkutil/misc_util.c Mon Mar 24 13:35:44 2008 -0700 @@ -46,6 +46,8 @@ static const char *cn_to_uri(const char return "xen"; else if (STARTS_WITH(classname, "KVM")) return "qemu:///system"; + else if (STARTS_WITH(classname, "LXC")) + return "lxc:///system"; else return NULL; } @@ -200,6 +202,8 @@ const char *pfx_from_conn(virConnectPtr pfx = "Xen"; else if (STARTS_WITH(uri, "qemu")) pfx = "KVM"; + else if (STARTS_WITH(uri, "lxc")) + pfx = "LXC"; free(uri);