6:19 a.m.
updated schema and provider registration scripts
added "Provider" qualifier to each provider's mof
fixed provider and module naming
6:19 a.m.
New subject: [PATCH 01 of 29] Added installation support for openWbem
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198059372 -3600
# Node ID cc317a7ef54789a792c264b0906b348e6f29a8a4
# Parent 133cbb1df893f2d031cba3534c88936bce69da78
Added installation support for openWbem
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 133cbb1df893 -r cc317a7ef547 base_schema/install_base_schema.sh.in
--- a/base_schema/install_base_schema.sh.in Wed Dec 19 11:16:08 2007 +0100
+++ b/base_schema/install_base_schema.sh.in Wed Dec 19 11:16:12 2007 +0100
@@ -3,6 +3,7 @@ DATA="$1"
DATA="$1"
NS=@CIM_VIRT_NS@
CIMOM=@CIMSERVER@
+SCHEMA_VERSION="2.16"
TMPDIR=$(mktemp -d /tmp/cim_schema.XXXXX)
@@ -44,6 +45,17 @@ detect_sfcb_dir() {
done
}
+detect_openwbem_dir() {
+ dirs="/usr/share/mof"
+
+ for d in $dirs; do
+ if [ -d "$d" ]; then
+ echo $d
+ return
+ fi
+ done
+}
+
install_schema_pegasus() {
local repo=$(detect_peg_repo)
@@ -76,6 +88,26 @@ install_schema_sfcb() {
sfcbrepos -f
}
+install_schema_openwbem() {
+ local dir=$(detect_openwbem_dir)
+ local schema_dir=$dir/cimv$SCHEMA_VERSION
+
+ mkdir $schema_dir
+ if [ -d "$schema_dir" ]; then
+ echo "Unable to determine openwbem schema directory"
+ return
+ fi
+
+ cp ${TMPDIR}/cimv???.mof ${TMPDIR}/CIM_Schema.mof
+ cp -ra ${TMPDIR}/* $schema_dir
+
+ owcreatenamespace -u http://localhost/ -n root/virt
+ owmofc -u http://localhost/cimom -n root/virt $schema_dir/CIM_Schema.mof
+
+ owcreatenamespace -u http://localhost/ -n root/interop
+ owmofc -u http://localhost/cimom -n root/interop $schema_dir/cimv???-interop.mof
+}
+
if [ -z "$1" ]; then
echo "Usage: $0 [source_dir]"
exit 1
@@ -91,6 +123,9 @@ case "$CIMOM" in
pegasus)
(install_schema_pegasus) >>$DEBUG 2>&1
;;
+ openwbem)
+ (install_schema_openwbem) >>$DEBUG 2>&1
+ ;;
*)
echo ERROR: Unknown CIMOM: $CIMOM
;;
diff -r 133cbb1df893 -r cc317a7ef547 provider-register.sh
--- a/provider-register.sh Wed Dec 19 11:16:08 2007 +0100
+++ b/provider-register.sh Wed Dec 19 11:16:12 2007 +0100
@@ -477,7 +477,7 @@ openwbem_transform()
then
for _f in $moffiles
do
- sed "s/Provider *( *\"cmpi:/Provider(\"cmpi::/g" < $_f >>
$OUTFILE
+ cat $_f >> $OUTFILE
done
fi
}
@@ -497,6 +497,9 @@ openwbem_repository()
openwbem_install()
{
+ namespace=$1
+ shift
+
CIMMOF=`which owmofc 2> /dev/null`
if test $? != 0
then
@@ -531,7 +534,7 @@ openwbem_install()
if openwbem_transform $_REGFILENAME $*
then
chatter Registering providers with $state owcimomd
- $CIMMOF $_REGFILENAME > /dev/null
+ $CIMMOF -u http://localhost/cimom -n $namespace $_REGFILENAME > /dev/null
else
echo "Failed to build OpenWBEM registration MOF." >&2
return 1
@@ -540,6 +543,9 @@ openwbem_install()
openwbem_uninstall()
{
+ namespace=$1
+ shift
+
CIMMOF=`which owmofc 2> /dev/null`
if test $? != 0
then
@@ -728,7 +734,7 @@ then
case $cimserver in
pegasus) pegasus_install $namespace $mofs ":" $regs;;
sfcb) sfcb_install $namespace $mofs ":" $regs;;
- openwbem) openwbem_install $mofs ;;
+ openwbem) openwbem_install $namespace $mofs ;;
sniacimom) echo sniacimom not yet supported && exit 1 ;;
**) echo "Invalid CIM Server Type " $cimserver && exit 1;;
esac
@@ -736,7 +742,7 @@ else
case $cimserver in
pegasus) pegasus_uninstall $namespace $mofs ":" $regs;;
sfcb) sfcb_uninstall $namespace $mofs ":" $regs;;
- openwbem) openwbem_uninstall $mofs ;;
+ openwbem) openwbem_uninstall $namespace $mofs ;;
sniacimom) echo sniacimom not yet supported && exit 1 ;;
**) echo "Invalid CIM Server Type " $cimserver && exit 1;;
esac
6:19 a.m.
New subject: [PATCH 02 of 29] HostSystem: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064138 -3600
# Node ID 560ee76080af4fb553d98c19d1ddf8ff2d6c6f91
# Parent cc317a7ef54789a792c264b0906b348e6f29a8a4
HostSystem: OpenWbem support
- rename provider from HostSystemProvider to HostSystem
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r cc317a7ef547 -r 560ee76080af schema/HostSystem.mof
--- a/schema/HostSystem.mof Wed Dec 19 11:16:12 2007 +0100
+++ b/schema/HostSystem.mof Wed Dec 19 12:35:38 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_ComputerSystem to represent "
- "the Xen host system.")
+ "the Xen host system."),
+ Provider("cmpi::Virt_HostSystem")
]
class Xen_HostSystem : CIM_ComputerSystem
{
@@ -10,7 +11,8 @@ class Xen_HostSystem : CIM_ComputerSyste
[Description (
"A class derived from CIM_ComputerSystem to represent "
- "the KVM host system.")
+ "the KVM host system."),
+ Provider("cmpi::Virt_HostSystem")
]
class KVM_HostSystem : CIM_ComputerSystem
{
diff -r cc317a7ef547 -r 560ee76080af schema/HostSystem.registration
--- a/schema/HostSystem.registration Wed Dec 19 11:16:12 2007 +0100
+++ b/schema/HostSystem.registration Wed Dec 19 12:35:38 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance
-KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance
+Xen_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance
+KVM_HostSystem root/virt Virt_HostSystem Virt_HostSystem instance
diff -r cc317a7ef547 -r 560ee76080af src/Virt_HostSystem.c
--- a/src/Virt_HostSystem.c Wed Dec 19 11:16:12 2007 +0100
+++ b/src/Virt_HostSystem.c Wed Dec 19 12:35:38 2007 +0100
@@ -173,7 +173,10 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_HostSystemProvider, _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_HostSystem,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:19 a.m.
New subject: [PATCH 03 of 29] ComputerSystem: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064140 -3600
# Node ID 209814f0021e473055e0355f8078511f3de6beb7
# Parent 560ee76080af4fb553d98c19d1ddf8ff2d6c6f91
ComputerSystem: OpenWbem support
- rename provider from ComputerSystemProvider to ComputerSystem
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 560ee76080af -r 209814f0021e schema/ComputerSystem.mof
--- a/schema/ComputerSystem.mof Wed Dec 19 12:35:38 2007 +0100
+++ b/schema/ComputerSystem.mof Wed Dec 19 12:35:40 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_ComputerSystem to represent "
- "the Xen virtual machines/domains running on the system.")
+ "the Xen virtual machines/domains running on the system."),
+ Provider("cmpi::Virt_ComputerSystem")
]
class Xen_ComputerSystem : CIM_ComputerSystem
{
@@ -14,7 +15,8 @@ class Xen_ComputerSystem : CIM_ComputerS
[Description (
"A class derived from CIM_ComputerSystem to represent "
- "the KVM virtual machines running on the system.")
+ "the KVM virtual machines running on the system."),
+ Provider("cmpi::Virt_ComputerSystem")
]
class KVM_ComputerSystem : CIM_ComputerSystem
{
diff -r 560ee76080af -r 209814f0021e schema/ComputerSystem.registration
--- a/schema/ComputerSystem.registration Wed Dec 19 12:35:38 2007 +0100
+++ b/schema/ComputerSystem.registration Wed Dec 19 12:35:40 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance
method
-KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance
+Xen_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance method
+KVM_ComputerSystem root/virt Virt_ComputerSystem Virt_ComputerSystem instance
diff -r 560ee76080af -r 209814f0021e src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c Wed Dec 19 12:35:38 2007 +0100
+++ b/src/Virt_ComputerSystem.c Wed Dec 19 12:35:40 2007 +0100
@@ -680,7 +680,10 @@ static CMPIStatus state_change(CMPIMetho
return s;
}
-STD_InstanceMIStub(, Virt_ComputerSystemProvider, _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_ComputerSystem,
+ _BROKER,
+ libvirt_cim_init());
static struct method_handler RequestStateChange = {
.name = "RequestStateChange",
@@ -697,7 +700,7 @@ static struct method_handler *my_handler
};
STDIM_MethodMIStub(,
- Virt_ComputerSystemProvider,
+ Virt_ComputerSystem,
_BROKER,
libvirt_cim_init(),
my_handlers);
6:19 a.m.
New subject: [PATCH 04 of 29] HostedDependency: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064141 -3600
# Node ID b508d48c1a8559ae9eed9278a4f9cfc02bf09a3b
# Parent 209814f0021e473055e0355f8078511f3de6beb7
HostedDependency: OpenWbem support
- rename provider from HostedDependencyProvider to HostedDependency
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 209814f0021e -r b508d48c1a85 schema/HostedDependency.mof
--- a/schema/HostedDependency.mof Wed Dec 19 12:35:40 2007 +0100
+++ b/schema/HostedDependency.mof Wed Dec 19 12:35:41 2007 +0100
@@ -3,7 +3,8 @@
[Association,
Description (
"HostedDependency defines a ManagedElement in the context of "
- "another ManagedElement in which it resides.")
+ "another ManagedElement in which it resides."),
+ Provider("cmpi::Virt_HostedDependency")
]
class Xen_HostedDependency : CIM_HostedDependency
{
@@ -12,7 +13,8 @@ class Xen_HostedDependency : CIM_HostedD
[Association,
Description (
"HostedDependency defines a ManagedElement in the context of "
- "another ManagedElement in which it resides.")
+ "another ManagedElement in which it resides."),
+ Provider("cmpi::Virt_HostedDependency")
]
class KVM_HostedDependency : CIM_HostedDependency
{
diff -r 209814f0021e -r b508d48c1a85 schema/HostedDependency.registration
--- a/schema/HostedDependency.registration Wed Dec 19 12:35:40 2007 +0100
+++ b/schema/HostedDependency.registration Wed Dec 19 12:35:41 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency
association
-KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency
association
+Xen_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association
+KVM_HostedDependency root/virt Virt_HostedDependency Virt_HostedDependency association
diff -r 209814f0021e -r b508d48c1a85 src/Virt_HostedDependency.c
--- a/src/Virt_HostedDependency.c Wed Dec 19 12:35:40 2007 +0100
+++ b/src/Virt_HostedDependency.c Wed Dec 19 12:35:41 2007 +0100
@@ -134,7 +134,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_HostedDependencyProvider, _BROKER, libvirt_cim_init(),
handlers);
+STDA_AssocMIStub(,
+ Virt_HostedDependency,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:19 a.m.
New subject: [PATCH 05 of 29] AllocationCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064142 -3600
# Node ID 98cfb1a1d84a63aca65cd1a04fac1d5e25b87cf9
# Parent b508d48c1a8559ae9eed9278a4f9cfc02bf09a3b
AllocationCapabilities: OpenWbem support
- rename provider from AllocationCapabilitiesProvider to AllocationCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r b508d48c1a85 -r 98cfb1a1d84a schema/AllocationCapabilities.mof
--- a/schema/AllocationCapabilities.mof Wed Dec 19 12:35:41 2007 +0100
+++ b/schema/AllocationCapabilities.mof Wed Dec 19 12:35:42 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_AllocationCapabilities")]
class Xen_AllocationCapabilities : CIM_AllocationCapabilities
{
};
+[Provider("cmpi::Virt_AllocationCapabilities")]
class KVM_AllocationCapabilities : CIM_AllocationCapabilities
{
};
diff -r b508d48c1a85 -r 98cfb1a1d84a schema/AllocationCapabilities.registration
--- a/schema/AllocationCapabilities.registration Wed Dec 19 12:35:41 2007 +0100
+++ b/schema/AllocationCapabilities.registration Wed Dec 19 12:35:42 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider
Virt_AllocationCapabilities instance
-KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider
Virt_AllocationCapabilities instance
+Xen_AllocationCapabilities root/virt Virt_AllocationCapabilities
Virt_AllocationCapabilities instance
+KVM_AllocationCapabilities root/virt Virt_AllocationCapabilities
Virt_AllocationCapabilities instance
diff -r b508d48c1a85 -r 98cfb1a1d84a src/Virt_AllocationCapabilities.c
--- a/src/Virt_AllocationCapabilities.c Wed Dec 19 12:35:41 2007 +0100
+++ b/src/Virt_AllocationCapabilities.c Wed Dec 19 12:35:42 2007 +0100
@@ -211,7 +211,9 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_AllocationCapabilitiesProvider, _BROKER,
+STD_InstanceMIStub(,
+ Virt_AllocationCapabilities,
+ _BROKER,
libvirt_cim_init());
/*
6:19 a.m.
New subject: [PATCH 06 of 29] DiskPool, MemoryPool, NetPool, ProcessorPool: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064682 -3600
# Node ID b5932d3a178fad406a082a619d5ad0770b0b5952
# Parent 98cfb1a1d84a63aca65cd1a04fac1d5e25b87cf9
DiskPool, MemoryPool, NetPool, ProcessorPool: OpenWbem support
- rename provider from DevicePoolProvider to DevicePool
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 98cfb1a1d84a -r b5932d3a178f schema/DiskPool.mof
--- a/schema/DiskPool.mof Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/DiskPool.mof Wed Dec 19 12:44:42 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_DevicePool")]
class Xen_DiskPool : CIM_ResourcePool
{
};
+[Provider("cmpi::Virt_DevicePool")]
class KVM_DiskPool : CIM_ResourcePool
{
};
diff -r 98cfb1a1d84a -r b5932d3a178f schema/DiskPool.registration
--- a/schema/DiskPool.registration Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/DiskPool.registration Wed Dec 19 12:44:42 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
-KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
+Xen_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance
+KVM_DiskPool root/virt Virt_DevicePool Virt_DevicePool instance
diff -r 98cfb1a1d84a -r b5932d3a178f schema/MemoryPool.mof
--- a/schema/MemoryPool.mof Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/MemoryPool.mof Wed Dec 19 12:44:42 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_DevicePool")]
class Xen_MemoryPool : CIM_ResourcePool
{
};
+[Provider("cmpi::Virt_DevicePool")]
class KVM_MemoryPool : CIM_ResourcePool
{
};
diff -r 98cfb1a1d84a -r b5932d3a178f schema/MemoryPool.registration
--- a/schema/MemoryPool.registration Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/MemoryPool.registration Wed Dec 19 12:44:42 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
-KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
+Xen_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance
+KVM_MemoryPool root/virt Virt_DevicePool Virt_DevicePool instance
diff -r 98cfb1a1d84a -r b5932d3a178f schema/NetPool.mof
--- a/schema/NetPool.mof Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/NetPool.mof Wed Dec 19 12:44:42 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_DevicePool")]
class Xen_NetworkPool : CIM_ResourcePool
{
};
+[Provider("cmpi::Virt_DevicePool")]
class KVM_NetworkPool : CIM_ResourcePool
{
};
diff -r 98cfb1a1d84a -r b5932d3a178f schema/NetPool.registration
--- a/schema/NetPool.registration Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/NetPool.registration Wed Dec 19 12:44:42 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
-KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
\ No newline at end of file
+Xen_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance
+KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance
\ No newline at end of file
diff -r 98cfb1a1d84a -r b5932d3a178f schema/ProcessorPool.mof
--- a/schema/ProcessorPool.mof Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/ProcessorPool.mof Wed Dec 19 12:44:42 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_DevicePool")]
class Xen_ProcessorPool : CIM_ResourcePool
{
};
+[Provider("cmpi::Virt_DevicePool")]
class KVM_ProcessorPool : CIM_ResourcePool
{
};
diff -r 98cfb1a1d84a -r b5932d3a178f schema/ProcessorPool.registration
--- a/schema/ProcessorPool.registration Wed Dec 19 12:35:42 2007 +0100
+++ b/schema/ProcessorPool.registration Wed Dec 19 12:44:42 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
-KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance
+Xen_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance
+KVM_ProcessorPool root/virt Virt_DevicePool Virt_DevicePool instance
diff -r 98cfb1a1d84a -r b5932d3a178f src/Virt_DevicePool.c
--- a/src/Virt_DevicePool.c Wed Dec 19 12:35:42 2007 +0100
+++ b/src/Virt_DevicePool.c Wed Dec 19 12:44:42 2007 +0100
@@ -774,7 +774,10 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_DevicePoolProvider, _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_DevicePool,
+ _BROKER,
+ libvirt_cim_init());
/*
6:19 a.m.
New subject: [PATCH 07 of 29] LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064992 -3600
# Node ID 8d747cfb847e372b06300dc1abf0e0e2d9653518
# Parent b5932d3a178fad406a082a619d5ad0770b0b5952
LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support
- rename provider from DeviceProvider to Device
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r b5932d3a178f -r 8d747cfb847e schema/LogicalDisk.mof
--- a/schema/LogicalDisk.mof Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/LogicalDisk.mof Wed Dec 19 12:49:52 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_LogicalDisk to represent "
- "the Xen virtual disks on the system.")
+ "the Xen virtual disks on the system."),
+ Provider("cmpi::Virt_Device")
]
class Xen_LogicalDisk : CIM_LogicalDisk
{
@@ -10,7 +11,8 @@ class Xen_LogicalDisk : CIM_LogicalDisk
[Description (
"A class derived from CIM_LogicalDisk to represent "
- "the KVM virtual disks on the system.")
+ "the KVM virtual disks on the system."),
+ Provider("cmpi::Virt_Device")
]
class KVM_LogicalDisk : CIM_LogicalDisk
{
diff -r b5932d3a178f -r 8d747cfb847e schema/LogicalDisk.registration
--- a/schema/LogicalDisk.registration Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/LogicalDisk.registration Wed Dec 19 12:49:52 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance
-KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance
+Xen_LogicalDisk root/virt Virt_Device Virt_Device instance
+KVM_LogicalDisk root/virt Virt_Device Virt_Device instance
diff -r b5932d3a178f -r 8d747cfb847e schema/Memory.mof
--- a/schema/Memory.mof Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/Memory.mof Wed Dec 19 12:49:52 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_Memory to represent "
- "the Xen virtual memory.")
+ "the Xen virtual memory."),
+ Provider("cmpi::Virt_Device")
]
class Xen_Memory : CIM_Memory
{
@@ -10,7 +11,8 @@ class Xen_Memory : CIM_Memory
[Description (
"A class derived from CIM_Memory to represent "
- "the KVM virtual memory.")
+ "the KVM virtual memory."),
+ Provider("cmpi::Virt_Device")
]
class KVM_Memory : CIM_Memory
{
diff -r b5932d3a178f -r 8d747cfb847e schema/Memory.registration
--- a/schema/Memory.registration Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/Memory.registration Wed Dec 19 12:49:52 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance
-KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance
+Xen_Memory root/virt Virt_Device Virt_Device instance
+KVM_Memory root/virt Virt_Device Virt_Device instance
diff -r b5932d3a178f -r 8d747cfb847e schema/NetworkPort.mof
--- a/schema/NetworkPort.mof Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/NetworkPort.mof Wed Dec 19 12:49:52 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_NetworkPort to represent "
- "the Xen virtual network interfaces on the system.")
+ "the Xen virtual network interfaces on the system."),
+ Provider("cmpi::Virt_Device")
]
class Xen_NetworkPort : CIM_NetworkPort
{
@@ -10,7 +11,8 @@ class Xen_NetworkPort : CIM_NetworkPort
[Description (
"A class derived from CIM_NetworkPort to represent "
- "the KVM virtual network interfaces on the system.")
+ "the KVM virtual network interfaces on the system."),
+ Provider("cmpi::Virt_Device")
]
class KVM_NetworkPort : CIM_NetworkPort
{
diff -r b5932d3a178f -r 8d747cfb847e schema/NetworkPort.registration
--- a/schema/NetworkPort.registration Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/NetworkPort.registration Wed Dec 19 12:49:52 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance
-KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance
+Xen_NetworkPort root/virt Virt_Device Virt_Device instance
+KVM_NetworkPort root/virt Virt_Device Virt_Device instance
diff -r b5932d3a178f -r 8d747cfb847e schema/Processor.mof
--- a/schema/Processor.mof Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/Processor.mof Wed Dec 19 12:49:52 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_Processor to represent "
- "the Xen virtual processors.")
+ "the Xen virtual processors."),
+ Provider("cmpi::Virt_Device")
]
class Xen_Processor : CIM_Processor
{
@@ -10,7 +11,8 @@ class Xen_Processor : CIM_Processor
[Description (
"A class derived from CIM_Processor to represent "
- "the KVM virtual processors.")
+ "the KVM virtual processors."),
+ Provider("cmpi::Virt_Device")
]
class KVM_Processor : CIM_Processor
{
diff -r b5932d3a178f -r 8d747cfb847e schema/Processor.registration
--- a/schema/Processor.registration Wed Dec 19 12:44:42 2007 +0100
+++ b/schema/Processor.registration Wed Dec 19 12:49:52 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance
-KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance
+Xen_Processor root/virt Virt_Device Virt_Device instance
+KVM_Processor root/virt Virt_Device Virt_Device instance
1:58 p.m.
New subject: [PATCH 07 of 29] LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support
Heidi Eckhart wrote:
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198064992 -3600
# Node ID 8d747cfb847e372b06300dc1abf0e0e2d9653518
# Parent b5932d3a178fad406a082a619d5ad0770b0b5952
LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support
- rename provider from DeviceProvider to Device
That's not true ... I forgot this step :(. Will fix and resend the patch
set.
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
--
Regards
Heidi Eckhart
Software Engineer
Linux Technology Center - Open Hypervisor
heidieck(a)linux.vnet.ibm.com
**************************************************
IBM Deutschland Entwicklung GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschaeftsfuehrung: Herbert Kircher
Sitz der Gesellschaft: Boeblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
6:19 a.m.
New subject: [PATCH 08 of 29] ElementAllocatedFromPool: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065181 -3600
# Node ID f621585dee1100d9f3f516c0e74cc982e570919d
# Parent 8d747cfb847e372b06300dc1abf0e0e2d9653518
ElementAllocatedFromPool: OpenWbem support
- rename provider from ElementAllocatedFromPoolProvider to ElementAllocatedFromPool
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 8d747cfb847e -r f621585dee11 schema/ElementAllocatedFromPool.mof
--- a/schema/ElementAllocatedFromPool.mof Wed Dec 19 12:49:52 2007 +0100
+++ b/schema/ElementAllocatedFromPool.mof Wed Dec 19 12:53:01 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_ElementAllocatedFromPool")
+]
class Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_ElementAllocatedFromPool")
+]
class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool
{
};
diff -r 8d747cfb847e -r f621585dee11 schema/ElementAllocatedFromPool.registration
--- a/schema/ElementAllocatedFromPool.registration Wed Dec 19 12:49:52 2007 +0100
+++ b/schema/ElementAllocatedFromPool.registration Wed Dec 19 12:53:01 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPoolProvider
Virt_ElementAllocatedFromPool association
-KVM_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPoolProvider
Virt_ElementAllocatedFromPool association
+Xen_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool
Virt_ElementAllocatedFromPool association
+KVM_ElementAllocatedFromPool root/virt Virt_ElementAllocatedFromPool
Virt_ElementAllocatedFromPool association
diff -r 8d747cfb847e -r f621585dee11 src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c Wed Dec 19 12:49:52 2007 +0100
+++ b/src/Virt_ElementAllocatedFromPool.c Wed Dec 19 12:53:01 2007 +0100
@@ -311,7 +311,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_ElementAllocatedFromPoolProvider, _BROKER, libvirt_cim_init(),
handlers);
+STDA_AssocMIStub(,
+ Virt_ElementAllocatedFromPool,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 09 of 29] ElementCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065306 -3600
# Node ID d91ee8dda3100227e829fb8ab510253cf4c39497
# Parent f621585dee1100d9f3f516c0e74cc982e570919d
ElementCapabilities: OpenWbem support
- rename provider from ElementCapabilitiesProvider to ElementCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r f621585dee11 -r d91ee8dda310 schema/ElementCapabilities.mof
--- a/schema/ElementCapabilities.mof Wed Dec 19 12:53:01 2007 +0100
+++ b/schema/ElementCapabilities.mof Wed Dec 19 12:55:06 2007 +0100
@@ -2,7 +2,8 @@
[Association,
Description (
- "A class to associate a ManagedElement with its Capabilities.")
+ "A class to associate a ManagedElement with its Capabilities."),
+ Provider("cmpi::Virt_ElementCapabilities")
]
class Xen_ElementCapabilities : CIM_ElementCapabilities
{
@@ -10,7 +11,8 @@ class Xen_ElementCapabilities : CIM_Elem
[Association,
Description (
- "A class to associate a ManagedElement with its Capabilities.")
+ "A class to associate a ManagedElement with its Capabilities."),
+ Provider("cmpi::Virt_ElementCapabilities")
]
class KVM_ElementCapabilities : CIM_ElementCapabilities
{
diff -r f621585dee11 -r d91ee8dda310 schema/ElementCapabilities.registration
--- a/schema/ElementCapabilities.registration Wed Dec 19 12:53:01 2007 +0100
+++ b/schema/ElementCapabilities.registration Wed Dec 19 12:55:06 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ElementCapabilities root/virt Virt_ElementCapabilitiesProvider
Virt_ElementCapabilities association
-KVM_ElementCapabilities root/virt Virt_ElementCapabilitiesProvider
Virt_ElementCapabilities association
+Xen_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities
association
+KVM_ElementCapabilities root/virt Virt_ElementCapabilities Virt_ElementCapabilities
association
diff -r f621585dee11 -r d91ee8dda310 src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c Wed Dec 19 12:53:01 2007 +0100
+++ b/src/Virt_ElementCapabilities.c Wed Dec 19 12:55:06 2007 +0100
@@ -350,7 +350,11 @@ struct std_assoc *assoc_handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_ElementCapabilitiesProvider, _BROKER, libvirt_cim_init(),
assoc_handlers);
+STDA_AssocMIStub(,
+ Virt_ElementCapabilities,
+ _BROKER,
+ libvirt_cim_init(),
+ assoc_handlers);
/*
* Local Variables:
* mode: C
6:20 a.m.
New subject: [PATCH 10 of 29] ElementConformsToProfile: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065441 -3600
# Node ID 361f6304b75b1bbf48d1fd8c3454f64e63bdf880
# Parent d91ee8dda3100227e829fb8ab510253cf4c39497
ElementConformsToProfile: OpenWbem support
- rename provider from ElementConformsToProfileProvider to ElementConformsToProfile
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r d91ee8dda310 -r 361f6304b75b schema/ElementConformsToProfile.mof
--- a/schema/ElementConformsToProfile.mof Wed Dec 19 12:55:06 2007 +0100
+++ b/schema/ElementConformsToProfile.mof Wed Dec 19 12:57:21 2007 +0100
@@ -2,7 +2,8 @@
[Association,
Description (
- "A class to associate a ManagedElement with its RegisteredProfile.")
+ "A class to associate a ManagedElement with its RegisteredProfile."),
+ Provider("cmpi::Virt_ElementConformsToProfile")
]
class Xen_ElementConformsToProfile : CIM_ElementConformsToProfile
{
@@ -14,7 +15,8 @@ class Xen_ElementConformsToProfile : CIM
[Association,
Description (
- "A class to associate a ManagedElement with its RegisteredProfile.")
+ "A class to associate a ManagedElement with its RegisteredProfile."),
+ Provider("cmpi::Virt_ElementConformsToProfile")
]
class KVM_ElementConformsToProfile : CIM_ElementConformsToProfile
{
diff -r d91ee8dda310 -r 361f6304b75b schema/ElementConformsToProfile.registration
--- a/schema/ElementConformsToProfile.registration Wed Dec 19 12:55:06 2007 +0100
+++ b/schema/ElementConformsToProfile.registration Wed Dec 19 12:57:21 2007 +0100
@@ -1,6 +1,6 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider
Virt_ElementConformsToProfile association
-Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider
Virt_ElementConformsToProfile association
-#KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider
Virt_ElementConformsToProfile association
-KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider
Virt_ElementConformsToProfile association
+#Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfile
Virt_ElementConformsToProfile association
+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
diff -r d91ee8dda310 -r 361f6304b75b src/Virt_ElementConformsToProfile.c
--- a/src/Virt_ElementConformsToProfile.c Wed Dec 19 12:55:06 2007 +0100
+++ b/src/Virt_ElementConformsToProfile.c Wed Dec 19 12:57:21 2007 +0100
@@ -244,7 +244,11 @@ struct std_assoc *assoc_handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_ElementConformsToProfileProvider, _BROKER, libvirt_cim_init(),
assoc_handlers);
+STDA_AssocMIStub(,
+ Virt_ElementConformsToProfile,
+ _BROKER,
+ libvirt_cim_init(),
+ assoc_handlers);
/*
* Local Variables:
* mode: C
6:20 a.m.
New subject: [PATCH 11 of 29] ElementSettingData: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065561 -3600
# Node ID d65646ef8cc468fa8e320543edfd54d4907a4e6f
# Parent 361f6304b75b1bbf48d1fd8c3454f64e63bdf880
ElementSettingData: OpenWbem support
- rename provider from ElementSettingDataProvider to ElementSettingData
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 361f6304b75b -r d65646ef8cc4 schema/ElementSettingData.mof
--- a/schema/ElementSettingData.mof Wed Dec 19 12:57:21 2007 +0100
+++ b/schema/ElementSettingData.mof Wed Dec 19 12:59:21 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_ElementSettingData")
+]
class Xen_ElementSettingData : CIM_ElementSettingData
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_ElementSettingData")
+]
class KVM_ElementSettingData : CIM_ElementSettingData
{
};
diff -r 361f6304b75b -r d65646ef8cc4 schema/ElementSettingData.registration
--- a/schema/ElementSettingData.registration Wed Dec 19 12:57:21 2007 +0100
+++ b/schema/ElementSettingData.registration Wed Dec 19 12:59:21 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ElementSettingData root/virt Virt_ElementSettingDataProvider Virt_ElementSettingData
association
-KVM_ElementSettingData root/virt Virt_ElementSettingDataProvider Virt_ElementSettingData
association
+Xen_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData
association
+KVM_ElementSettingData root/virt Virt_ElementSettingData Virt_ElementSettingData
association
diff -r 361f6304b75b -r d65646ef8cc4 src/Virt_ElementSettingData.c
--- a/src/Virt_ElementSettingData.c Wed Dec 19 12:57:21 2007 +0100
+++ b/src/Virt_ElementSettingData.c Wed Dec 19 12:59:21 2007 +0100
@@ -216,7 +216,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_ElementSettingDataProvider, _BROKER, libvirt_cim_init(),
handlers);
+STDA_AssocMIStub(,
+ Virt_ElementSettingData,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 12 of 29] EnabledLogicalElementCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065683 -3600
# Node ID 75627bcb3851a1df2f938d5cc92af0f3570a519e
# Parent d65646ef8cc468fa8e320543edfd54d4907a4e6f
EnabledLogicalElementCapabilities: OpenWbem support
- rename provider from EnabledLogicalElementCapabilitiesProvider to
EnabledLogicalElementCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r d65646ef8cc4 -r 75627bcb3851 schema/EnabledLogicalElementCapabilities.mof
--- a/schema/EnabledLogicalElementCapabilities.mof Wed Dec 19 12:59:21 2007 +0100
+++ b/schema/EnabledLogicalElementCapabilities.mof Wed Dec 19 13:01:23 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_Capabilities to represent "
- "the changes that can be made to a started Xen virtual system")
+ "the changes that can be made to a started Xen virtual system"),
+ Provider("cmpi::Virt_EnabledLogicalElementCapabilities")
]
class Xen_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities
{
@@ -10,7 +11,8 @@ class Xen_EnabledLogicalElementCapabilit
[Description (
"A class derived from CIM_Capabilities to represent "
- "the changes that can be made to a started KVM virtual system")
+ "the changes that can be made to a started KVM virtual system"),
+ Provider("cmpi::Virt_EnabledLogicalElementCapabilities")
]
class KVM_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities
{
diff -r d65646ef8cc4 -r 75627bcb3851
schema/EnabledLogicalElementCapabilities.registration
--- a/schema/EnabledLogicalElementCapabilities.registration Wed Dec 19 12:59:21 2007
+0100
+++ b/schema/EnabledLogicalElementCapabilities.registration Wed Dec 19 13:01:23 2007
+0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_EnabledLogicalElementCapabilities root/virt
Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities
instance
-KVM_EnabledLogicalElementCapabilities root/virt
Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities
instance
+Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities
Virt_EnabledLogicalElementCapabilities instance
+KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilities
Virt_EnabledLogicalElementCapabilities instance
diff -r d65646ef8cc4 -r 75627bcb3851 src/Virt_EnabledLogicalElementCapabilities.c
--- a/src/Virt_EnabledLogicalElementCapabilities.c Wed Dec 19 12:59:21 2007 +0100
+++ b/src/Virt_EnabledLogicalElementCapabilities.c Wed Dec 19 13:01:23 2007 +0100
@@ -234,8 +234,10 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_EnabledLogicalElementCapabilitiesProvider, _BROKER,
- libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_EnabledLogicalElementCapabilities,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 13 of 29] HostedResourcePool: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065811 -3600
# Node ID 6e52e38ce55e14a89dd459c373664206ebe67394
# Parent 75627bcb3851a1df2f938d5cc92af0f3570a519e
HostedResourcePool: OpenWbem support
- rename provider from HostedResourcePoolProvider to HostedResourcePoll
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 75627bcb3851 -r 6e52e38ce55e schema/HostedResourcePool.mof
--- a/schema/HostedResourcePool.mof Wed Dec 19 13:01:23 2007 +0100
+++ b/schema/HostedResourcePool.mof Wed Dec 19 13:03:31 2007 +0100
@@ -2,7 +2,8 @@
[Association,
Description (
- "Associates a host system to its resource pools")
+ "Associates a host system to its resource pools"),
+ Provider("cmpi::Virt_HostedResourcePool")
]
class Xen_HostedResourcePool : CIM_HostedResourcePool
{
@@ -10,7 +11,8 @@ class Xen_HostedResourcePool : CIM_Hoste
[Association,
Description (
- "Associates a host system to its resource pools")
+ "Associates a host system to its resource pools"),
+ Provider("cmpi::Virt_HostedResourcePool")
]
class KVM_HostedResourcePool : CIM_HostedResourcePool
{
diff -r 75627bcb3851 -r 6e52e38ce55e schema/HostedResourcePool.registration
--- a/schema/HostedResourcePool.registration Wed Dec 19 13:01:23 2007 +0100
+++ b/schema/HostedResourcePool.registration Wed Dec 19 13:03:31 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool
association
-KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool
association
\ No newline at end of file
+Xen_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool
association
+KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool
association
\ No newline at end of file
diff -r 75627bcb3851 -r 6e52e38ce55e src/Virt_HostedResourcePool.c
--- a/src/Virt_HostedResourcePool.c Wed Dec 19 13:01:23 2007 +0100
+++ b/src/Virt_HostedResourcePool.c Wed Dec 19 13:03:31 2007 +0100
@@ -155,7 +155,11 @@ struct std_assoc *assoc_handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_HostedResourcePoolProvider, _BROKER, libvirt_cim_init(),
assoc_handlers);
+STDA_AssocMIStub(,
+ Virt_HostedResourcePool,
+ _BROKER,
+ libvirt_cim_init(),
+ assoc_handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 14 of 29] HostedService: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198065909 -3600
# Node ID 6eacbac6c4c8e8727bb417197be05716eb1b3859
# Parent 6e52e38ce55e14a89dd459c373664206ebe67394
HostedService: OpenWbem support
- rename provider from HostedServiceProvider to HostedService
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 6e52e38ce55e -r 6eacbac6c4c8 schema/HostedService.mof
--- a/schema/HostedService.mof Wed Dec 19 13:03:31 2007 +0100
+++ b/schema/HostedService.mof Wed Dec 19 13:05:09 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_HostedService")
+]
class Xen_HostedService : CIM_HostedService
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_HostedService")
+]
class KVM_HostedService : CIM_HostedService
{
};
diff -r 6e52e38ce55e -r 6eacbac6c4c8 schema/HostedService.registration
--- a/schema/HostedService.registration Wed Dec 19 13:03:31 2007 +0100
+++ b/schema/HostedService.registration Wed Dec 19 13:05:09 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_HostedService root/virt Virt_HostedServiceProvider Virt_HostedService association
-KVM_HostedService root/virt Virt_HostedServiceProvider Virt_HostedService association
+Xen_HostedService root/virt Virt_HostedService Virt_HostedService association
+KVM_HostedService root/virt Virt_HostedService Virt_HostedService association
diff -r 6e52e38ce55e -r 6eacbac6c4c8 src/Virt_HostedService.c
--- a/src/Virt_HostedService.c Wed Dec 19 13:03:31 2007 +0100
+++ b/src/Virt_HostedService.c Wed Dec 19 13:05:09 2007 +0100
@@ -141,7 +141,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_HostedServiceProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(,
+ Virt_HostedService,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 15 of 29] ResourceAllocationSettingData: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198066580 -3600
# Node ID 7eee552df9d39221db1b9415c8d237c34aec6867
# Parent 6eacbac6c4c8e8727bb417197be05716eb1b3859
ResourceAllocationSettingData: OpenWbem support
- rename provider from RASDProvider to RASD
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 6eacbac6c4c8 -r 7eee552df9d3 schema/ResourceAllocationSettingData.mof
--- a/schema/ResourceAllocationSettingData.mof Wed Dec 19 13:05:09 2007 +0100
+++ b/schema/ResourceAllocationSettingData.mof Wed Dec 19 13:16:20 2007 +0100
@@ -8,7 +8,9 @@ class KVM_ResourceAllocationSettingData
{
};
-[Description ("Xen virtual disk configuration")]
+[Description ("Xen virtual disk configuration"),
+ Provider("cmpi::Virt_RASD")
+]
class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData
{
@@ -17,7 +19,9 @@ class Xen_DiskResourceAllocationSettingD
};
-[Description ("KVM virtual disk configuration")]
+[Description ("KVM virtual disk configuration"),
+ Provider("cmpi::Virt_RASD")
+]
class KVM_DiskResourceAllocationSettingData : KVM_ResourceAllocationSettingData
{
@@ -26,7 +30,9 @@ class KVM_DiskResourceAllocationSettingD
};
-[Description ("Xen virtual network configuration")]
+[Description ("Xen virtual network configuration"),
+ Provider("cmpi::Virt_RASD")
+]
class Xen_NetResourceAllocationSettingData : Xen_ResourceAllocationSettingData
{
@@ -35,7 +41,9 @@ class Xen_NetResourceAllocationSettingDa
};
-[Description ("KVM virtual network configuration")]
+[Description ("KVM virtual network configuration"),
+ Provider("cmpi::Virt_RASD")
+]
class KVM_NetResourceAllocationSettingData : KVM_ResourceAllocationSettingData
{
@@ -44,22 +52,30 @@ class KVM_NetResourceAllocationSettingDa
};
-[Description ("Xen virtual processor")]
+[Description ("Xen virtual processor"),
+ Provider("cmpi::Virt_RASD")
+]
class Xen_ProcResourceAllocationSettingData : Xen_ResourceAllocationSettingData
{
};
-[Description ("KVM virtual processor")]
+[Description ("KVM virtual processor"),
+ Provider("cmpi::Virt_RASD")
+]
class KVM_ProcResourceAllocationSettingData : KVM_ResourceAllocationSettingData
{
};
-[Description ("Xen virtual memory")]
+[Description ("Xen virtual memory"),
+ Provider("cmpi::Virt_RASD")
+]
class Xen_MemResourceAllocationSettingData : Xen_ResourceAllocationSettingData
{
};
-[Description ("KVM virtual memory")]
+[Description ("KVM virtual memory"),
+ Provider("cmpi::Virt_RASD")
+]
class KVM_MemResourceAllocationSettingData : KVM_ResourceAllocationSettingData
{
};
diff -r 6eacbac6c4c8 -r 7eee552df9d3 schema/ResourceAllocationSettingData.registration
--- a/schema/ResourceAllocationSettingData.registration Wed Dec 19 13:05:09 2007 +0100
+++ b/schema/ResourceAllocationSettingData.registration Wed Dec 19 13:16:20 2007 +0100
@@ -1,6 +1,6 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_DiskResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance
-Xen_NetResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance
-Xen_ProcResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance
-Xen_MemResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance
+Xen_DiskResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance
+Xen_NetResourceAllocationSettingData root/virt Virt_RASDP Virt_RASD instance
+Xen_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance
+Xen_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance
diff -r 6eacbac6c4c8 -r 7eee552df9d3 src/Virt_RASD.c
--- a/src/Virt_RASD.c Wed Dec 19 13:05:09 2007 +0100
+++ b/src/Virt_RASD.c Wed Dec 19 13:16:20 2007 +0100
@@ -342,7 +342,10 @@ DEFAULT_INST_CLEANUP();
DEFAULT_INST_CLEANUP();
DEFAULT_EQ();
-STD_InstanceMIStub(, Virt_RASDProvider, _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_RASD,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 16 of 29] RegisteredProfile: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198066581 -3600
# Node ID af0fdc34cdc05deb3d03ddf31713a96007f49284
# Parent 7eee552df9d39221db1b9415c8d237c34aec6867
RegisteredProfile: OpenWbem support
- rename provider from RegisteredProfileProvider to RegisteredProfile
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 7eee552df9d3 -r af0fdc34cdc0 schema/RegisteredProfile.mof
--- a/schema/RegisteredProfile.mof Wed Dec 19 13:16:20 2007 +0100
+++ b/schema/RegisteredProfile.mof Wed Dec 19 13:16:21 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_RegisteredProfile to represent "
- "an advertised conformant profile.")
+ "an advertised conformant profile."),
+ Provider("cmpi::Virt_RegisteredProfile")
]
class Xen_RegisteredProfile : CIM_RegisteredProfile
{
@@ -10,7 +11,8 @@ class Xen_RegisteredProfile : CIM_Regist
[Description (
"A class derived from CIM_RegisteredProfile to represent "
- "an advertised conformant profile.")
+ "an advertised conformant profile."),
+ Provider("cmpi::Virt_RegisteredProfile")
]
class KVM_RegisteredProfile : CIM_RegisteredProfile
{
diff -r 7eee552df9d3 -r af0fdc34cdc0 schema/RegisteredProfile.registration
--- a/schema/RegisteredProfile.registration Wed Dec 19 13:16:20 2007 +0100
+++ b/schema/RegisteredProfile.registration Wed Dec 19 13:16:21 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile
instance
-KVM_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile
instance
+Xen_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile
instance
+KVM_RegisteredProfile root/interop Virt_RegisteredProfile Virt_RegisteredProfile
instance
diff -r 7eee552df9d3 -r af0fdc34cdc0 src/Virt_RegisteredProfile.c
--- a/src/Virt_RegisteredProfile.c Wed Dec 19 13:16:20 2007 +0100
+++ b/src/Virt_RegisteredProfile.c Wed Dec 19 13:16:21 2007 +0100
@@ -197,7 +197,9 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_RegisteredProfileProvider, _BROKER,
+STD_InstanceMIStub(,
+ Virt_RegisteredProfile,
+ _BROKER,
libvirt_cim_init());
/*
6:20 a.m.
New subject: [PATCH 17 of 29] Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com>
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198066756 -3600
# Node ID 7b9de95b191d6d72b1140e55622e4a5f9ccde81e
# Parent af0fdc34cdc05deb3d03ddf31713a96007f49284
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r af0fdc34cdc0 -r 7b9de95b191d schema/ResourceAllocationFromPool.mof
--- a/schema/ResourceAllocationFromPool.mof Wed Dec 19 13:16:21 2007 +0100
+++ b/schema/ResourceAllocationFromPool.mof Wed Dec 19 13:19:16 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_ResourceAllocationFromPool")
+]
class Xen_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_ResourceAllocationFromPool")
+]
class KVM_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool
{
};
diff -r af0fdc34cdc0 -r 7b9de95b191d schema/ResourceAllocationFromPool.registration
--- a/schema/ResourceAllocationFromPool.registration Wed Dec 19 13:16:21 2007 +0100
+++ b/schema/ResourceAllocationFromPool.registration Wed Dec 19 13:19:16 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPoolProvider
Virt_ResourceAllocationFromPool association
-KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPoolProvider
Virt_ResourceAllocationFromPool association
\ No newline at end of file
+Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool
Virt_ResourceAllocationFromPool association
+KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool
Virt_ResourceAllocationFromPool association
\ No newline at end of file
diff -r af0fdc34cdc0 -r 7b9de95b191d src/Virt_ResourceAllocationFromPool.c
--- a/src/Virt_ResourceAllocationFromPool.c Wed Dec 19 13:16:21 2007 +0100
+++ b/src/Virt_ResourceAllocationFromPool.c Wed Dec 19 13:19:16 2007 +0100
@@ -290,7 +290,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_ResourceAllocationFromPoolProvider, _BROKER, libvirt_cim_init(),
handlers);
+STDA_AssocMIStub(,
+ Virt_ResourceAllocationFromPool,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 18 of 29] ResourcePoolConfigurationCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198067043 -3600
# Node ID 1fd44b737c16ab07487ba08f77f3bbebd30262c3
# Parent 7b9de95b191d6d72b1140e55622e4a5f9ccde81e
ResourcePoolConfigurationCapabilities: OpenWbem support
- rename provider from ResourcePoolConfigurationCapabilitiesProvider to
ResourcePoolConfigurationCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 7b9de95b191d -r 1fd44b737c16 schema/ResourcePoolConfigurationCapabilities.mof
--- a/schema/ResourcePoolConfigurationCapabilities.mof Wed Dec 19 13:19:16 2007 +0100
+++ b/schema/ResourcePoolConfigurationCapabilities.mof Wed Dec 19 13:24:03 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_ResourcePoolConfigurationCapabilities")]
class Xen_ResourcePoolConfigurationCapabilities :
CIM_ResourcePoolConfigurationCapabilities
{
};
+[Provider("cmpi::Virt_ResourcePoolConfigurationCapabilities")]
class KVM_ResourcePoolConfigurationCapabilities :
CIM_ResourcePoolConfigurationCapabilities
{
};
diff -r 7b9de95b191d -r 1fd44b737c16
schema/ResourcePoolConfigurationCapabilities.registration
--- a/schema/ResourcePoolConfigurationCapabilities.registration Wed Dec 19 13:19:16 2007
+0100
+++ b/schema/ResourcePoolConfigurationCapabilities.registration Wed Dec 19 13:24:03 2007
+0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ResourcePoolConfigurationCapabilities root/virt
Virt_ResourcePoolConfigurationCapabilitiesProvider
Virt_ResourcePoolConfigurationCapabilities instance
-KVM_ResourcePoolConfigurationCapabilities root/virt
Virt_ResourcePoolConfigurationCapabilitiesProvider
Virt_ResourcePoolConfigurationCapabilities instance
\ No newline at end of file
+Xen_ResourcePoolConfigurationCapabilities root/virt
Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities
instance
+KVM_ResourcePoolConfigurationCapabilities root/virt
Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities
instance
\ No newline at end of file
diff -r 7b9de95b191d -r 1fd44b737c16 src/Virt_ResourcePoolConfigurationCapabilities.c
--- a/src/Virt_ResourcePoolConfigurationCapabilities.c Wed Dec 19 13:19:16 2007 +0100
+++ b/src/Virt_ResourcePoolConfigurationCapabilities.c Wed Dec 19 13:24:03 2007 +0100
@@ -118,8 +118,10 @@ static CMPIStatus GetInstance(CMPIInstan
}
-STD_InstanceMIStub(, Virt_ResourcePoolConfigurationCapabilitiesProvider,
- _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_ResourcePoolConfigurationCapabilities,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 19 of 29] ResourcePoolConfigurationService: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198067173 -3600
# Node ID 37e5f1fdb2b2eaf926f48ac0964364e1223bf28b
# Parent 1fd44b737c16ab07487ba08f77f3bbebd30262c3
ResourcePoolConfigurationService: OpenWbem support
- rename provider from ResourcePoolConfigurationServiceProvider to
ResourcePoolConfigurationService
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 1fd44b737c16 -r 37e5f1fdb2b2 schema/ResourcePoolConfigurationService.mof
--- a/schema/ResourcePoolConfigurationService.mof Wed Dec 19 13:24:03 2007 +0100
+++ b/schema/ResourcePoolConfigurationService.mof Wed Dec 19 13:26:13 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_ResourcePoolConfigurationService")]
class Xen_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService
{
};
+[Provider("cmpi::Virt_ResourcePoolConfigurationService")]
class KVM_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService
{
};
diff -r 1fd44b737c16 -r 37e5f1fdb2b2 schema/ResourcePoolConfigurationService.registration
--- a/schema/ResourcePoolConfigurationService.registration Wed Dec 19 13:24:03 2007 +0100
+++ b/schema/ResourcePoolConfigurationService.registration Wed Dec 19 13:26:13 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ResourcePoolConfigurationService root/virt
Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService
instance method
-KVM_ResourcePoolConfigurationService root/virt
Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService
instance method
\ No newline at end of file
+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
diff -r 1fd44b737c16 -r 37e5f1fdb2b2 src/Virt_ResourcePoolConfigurationService.c
--- a/src/Virt_ResourcePoolConfigurationService.c Wed Dec 19 13:24:03 2007 +0100
+++ b/src/Virt_ResourcePoolConfigurationService.c Wed Dec 19 13:26:13 2007 +0100
@@ -205,8 +205,10 @@ static CMPIStatus EnumInstances(CMPIInst
}
-STD_InstanceMIStub(, Virt_ResourcePoolConfigurationServiceProvider,
- _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_ResourcePoolConfigurationService,
+ _BROKER,
+ libvirt_cim_init());
/*
6:20 a.m.
New subject: [PATCH 20 of 29] SettingsDefineCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198067387 -3600
# Node ID 5cb22a44b7603b5c1890ed35256b9d3760aabab3
# Parent 37e5f1fdb2b2eaf926f48ac0964364e1223bf28b
SettingsDefineCapabilities: OpenWbem support
- rename provider from SettingsDefineCapabilitiesProvider to SettingsDefineCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 37e5f1fdb2b2 -r 5cb22a44b760 schema/SettingsDefineCapabilities.mof
--- a/schema/SettingsDefineCapabilities.mof Wed Dec 19 13:26:13 2007 +0100
+++ b/schema/SettingsDefineCapabilities.mof Wed Dec 19 13:29:47 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_SettingsDefineCapabilities")
+]
class Xen_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_SettingsDefineCapabilities")
+]
class KVM_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities
{
};
diff -r 37e5f1fdb2b2 -r 5cb22a44b760 schema/SettingsDefineCapabilities.registration
--- a/schema/SettingsDefineCapabilities.registration Wed Dec 19 13:26:13 2007 +0100
+++ b/schema/SettingsDefineCapabilities.registration Wed Dec 19 13:29:47 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilitiesProvider
Virt_SettingsDefineCapabilities association
-KVM_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilitiesProvider
Virt_SettingsDefineCapabilities association
+Xen_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities
Virt_SettingsDefineCapabilities association
+KVM_SettingsDefineCapabilities root/virt Virt_SettingsDefineCapabilities
Virt_SettingsDefineCapabilities association
diff -r 37e5f1fdb2b2 -r 5cb22a44b760 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Wed Dec 19 13:26:13 2007 +0100
+++ b/src/Virt_SettingsDefineCapabilities.c Wed Dec 19 13:29:47 2007 +0100
@@ -883,7 +883,11 @@ struct std_assoc *assoc_handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_SettingsDefineCapabilitiesProvider, _BROKER, libvirt_cim_init(),
assoc_handlers);
+STDA_AssocMIStub(,
+ Virt_SettingsDefineCapabilities,
+ _BROKER,
+ libvirt_cim_init(),
+ assoc_handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 21 of 29] SettingsDefineState: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198067492 -3600
# Node ID 57e751879fd4d235827c9b5a19fc816333c91585
# Parent 5cb22a44b7603b5c1890ed35256b9d3760aabab3
SettingsDefineState: OpenWbem support
- rename provider from SettingsDefineStateProvider to SettingsDefineState
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 5cb22a44b760 -r 57e751879fd4 schema/SettingsDefineState.mof
--- a/schema/SettingsDefineState.mof Wed Dec 19 13:29:47 2007 +0100
+++ b/schema/SettingsDefineState.mof Wed Dec 19 13:31:32 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_SettingsDefineState")
+]
class Xen_SettingsDefineState : CIM_SettingsDefineState
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_SettingsDefineState")
+]
class KVM_SettingsDefineState : CIM_SettingsDefineState
{
};
\ No newline at end of file
diff -r 5cb22a44b760 -r 57e751879fd4 schema/SettingsDefineState.registration
--- a/schema/SettingsDefineState.registration Wed Dec 19 13:29:47 2007 +0100
+++ b/schema/SettingsDefineState.registration Wed Dec 19 13:31:32 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_SettingsDefineState root/virt Virt_SettingsDefineStateProvider
Virt_SettingsDefineState association
-KVM_SettingsDefineState root/virt Virt_SettingsDefineStateProvider
Virt_SettingsDefineState association
+Xen_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState
association
+KVM_SettingsDefineState root/virt Virt_SettingsDefineState Virt_SettingsDefineState
association
diff -r 5cb22a44b760 -r 57e751879fd4 src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c Wed Dec 19 13:29:47 2007 +0100
+++ b/src/Virt_SettingsDefineState.c Wed Dec 19 13:31:32 2007 +0100
@@ -392,7 +392,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_SettingsDefineStateProvider, _BROKER, libvirt_cim_init(),
handlers);
+STDA_AssocMIStub(,
+ Virt_SettingsDefineState,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 22 of 29] SystemDevice: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069811 -3600
# Node ID a2411bdc20ffbea13758137f67321b1ad185a3ee
# Parent 57e751879fd4d235827c9b5a19fc816333c91585
SystemDevice: OpenWbem support
- rename provider from SystemDeviceProvider to SystemDevice
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 57e751879fd4 -r a2411bdc20ff schema/SystemDevice.mof
--- a/schema/SystemDevice.mof Wed Dec 19 13:31:32 2007 +0100
+++ b/schema/SystemDevice.mof Wed Dec 19 14:10:11 2007 +0100
@@ -2,7 +2,8 @@
[Association,
Description (
- "A class to associate a Xen_ComputerSystem with its devices." )
+ "A class to associate a Xen_ComputerSystem with its devices." ),
+ Provider("cmpi::Virt_SystemDevice")
]
class Xen_SystemDevice : CIM_SystemDevice
{
@@ -17,7 +18,8 @@ class Xen_SystemDevice : CIM_SystemDevic
[Association,
Description (
- "A class to associate a KVM_ComputerSystem with its devices." )
+ "A class to associate a KVM_ComputerSystem with its devices." ),
+ Provider("cmpi::Virt_SystemDevice")
]
class KVM_SystemDevice : CIM_SystemDevice
{
diff -r 57e751879fd4 -r a2411bdc20ff schema/SystemDevice.registration
--- a/schema/SystemDevice.registration Wed Dec 19 13:31:32 2007 +0100
+++ b/schema/SystemDevice.registration Wed Dec 19 14:10:11 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_SystemDevice root/virt Virt_SystemDeviceProvider Virt_SystemDevice association
-KVM_SystemDevice root/virt Virt_SystemDeviceProvider Virt_SystemDevice association
+Xen_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association
+KVM_SystemDevice root/virt Virt_SystemDevice Virt_SystemDevice association
diff -r 57e751879fd4 -r a2411bdc20ff src/Virt_SystemDevice.c
--- a/src/Virt_SystemDevice.c Wed Dec 19 13:31:32 2007 +0100
+++ b/src/Virt_SystemDevice.c Wed Dec 19 14:10:11 2007 +0100
@@ -268,7 +268,11 @@ static struct std_assoc *assoc_handlers[
NULL
};
-STDA_AssocMIStub(, Virt_SystemDeviceProvider, _BROKER, libvirt_cim_init(),
assoc_handlers);
+STDA_AssocMIStub(,
+ Virt_SystemDevice,
+ _BROKER,
+ libvirt_cim_init(),
+ assoc_handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 23 of 29] VirtualSystemManagementCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069814 -3600
# Node ID 2d83ae41f68fc5ad4bbf4aa51a68255422fbf2dd
# Parent a2411bdc20ffbea13758137f67321b1ad185a3ee
VirtualSystemManagementCapabilities: OpenWbem support
- rename provider from VirtualSystemManagementCapabilitiesProvider to
VirtualSystemManagementCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r a2411bdc20ff -r 2d83ae41f68f schema/VirtualSystemManagementCapabilities.mof
--- a/schema/VirtualSystemManagementCapabilities.mof Wed Dec 19 14:10:11 2007 +0100
+++ b/schema/VirtualSystemManagementCapabilities.mof Wed Dec 19 14:10:14 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_Capabilities to represent "
- "the management capabilities of a Xen virtual system")
+ "the management capabilities of a Xen virtual system"),
+ Provider("cmpi::Virt_VirtualSystemManagementCapabilities")
]
class Xen_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities
{
@@ -10,7 +11,8 @@ class Xen_VirtualSystemManagementCapabil
[Description (
"A class derived from CIM_Capabilities to represent "
- "the management capabilities of a KVM virtual system.")
+ "the management capabilities of a KVM virtual system."),
+ Provider("cmpi::Virt_VirtualSystemManagementCapabilities")
]
class KVM_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities
{
diff -r a2411bdc20ff -r 2d83ae41f68f
schema/VirtualSystemManagementCapabilities.registration
--- a/schema/VirtualSystemManagementCapabilities.registration Wed Dec 19 14:10:11 2007
+0100
+++ b/schema/VirtualSystemManagementCapabilities.registration Wed Dec 19 14:10:14 2007
+0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_VirtualSystemManagementCapabilities root/virt
Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities
instance
-KVM_VirtualSystemManagementCapabilities root/virt
Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities
instance
+Xen_VirtualSystemManagementCapabilities root/virt
Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities
instance
+KVM_VirtualSystemManagementCapabilities root/virt
Virt_VirtualSystemManagementCapabilities Virt_VirtualSystemManagementCapabilities
instance
diff -r a2411bdc20ff -r 2d83ae41f68f src/Virt_VirtualSystemManagementCapabilities.c
--- a/src/Virt_VirtualSystemManagementCapabilities.c Wed Dec 19 14:10:11 2007 +0100
+++ b/src/Virt_VirtualSystemManagementCapabilities.c Wed Dec 19 14:10:14 2007 +0100
@@ -181,8 +181,10 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_VirtualSystemManagementCapabilitiesProvider, _BROKER,
- libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_VirtualSystemManagementCapabilities,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 24 of 29] VirtualSystemManagementService: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069815 -3600
# Node ID fe073ec5963b78bd16ed13d54c793e355069921f
# Parent 2d83ae41f68fc5ad4bbf4aa51a68255422fbf2dd
VirtualSystemManagementService: OpenWbem support
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 2d83ae41f68f -r fe073ec5963b schema/VirtualSystemManagementService.mof
--- a/schema/VirtualSystemManagementService.mof Wed Dec 19 14:10:14 2007 +0100
+++ b/schema/VirtualSystemManagementService.mof Wed Dec 19 14:10:15 2007 +0100
@@ -1,9 +1,11 @@
// Copyright IBM Corp. 2007
+[Provider("cmpi::Virt_VirtualSystemManagementService")]
class Xen_VirtualSystemManagementService : CIM_VirtualSystemManagementService
{
};
+[Provider("cmpi::Virt_VirtualSystemManagementService")]
class KVM_VirtualSystemManagementService : CIM_VirtualSystemManagementService
{
};
diff -r 2d83ae41f68f -r fe073ec5963b src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Wed Dec 19 14:10:14 2007 +0100
+++ b/src/Virt_VirtualSystemManagementService.c Wed Dec 19 14:10:15 2007 +0100
@@ -1246,7 +1246,9 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_VirtualSystemManagementService, _BROKER,
+STD_InstanceMIStub(,
+ Virt_VirtualSystemManagementService,
+ _BROKER,
libvirt_cim_init());
6:20 a.m.
New subject: [PATCH 25 of 29] VirtualSystemMigrationCapabilities: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069815 -3600
# Node ID d7113a165bab3e14235dff949cdf3bad60bb3541
# Parent fe073ec5963b78bd16ed13d54c793e355069921f
VirtualSystemMigrationCapabilities: OpenWbem support
- rename provider from VSMC to VSMigrationCapabilities
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r fe073ec5963b -r d7113a165bab schema/VSMigrationCapabilities.mof
--- a/schema/VSMigrationCapabilities.mof Wed Dec 19 14:10:15 2007 +0100
+++ b/schema/VSMigrationCapabilities.mof Wed Dec 19 14:10:15 2007 +0100
@@ -10,8 +10,10 @@ class Virt_VirtualSystemMigrationCapabil
};
+[Provider("cmpi::Virt_VSMigrationCapabilities")]
class Xen_VirtualSystemMigrationCapabilities : Virt_VirtualSystemMigrationCapabilities {
};
+[Provider("cmpi::Virt_VSMigrationCapabilities")]
class KVM_VirtualSystemMigrationCapabilities : Virt_VirtualSystemMigrationCapabilities {
};
diff -r fe073ec5963b -r d7113a165bab schema/VSMigrationCapabilities.registration
--- a/schema/VSMigrationCapabilities.registration Wed Dec 19 14:10:15 2007 +0100
+++ b/schema/VSMigrationCapabilities.registration Wed Dec 19 14:10:15 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMC Virt_VSMigrationCapabilities
instance
-KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMC Virt_VSMigrationCapabilities
instance
\ No newline at end of file
+Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities
Virt_VSMigrationCapabilities instance
+KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities
Virt_VSMigrationCapabilities instance
\ No newline at end of file
diff -r fe073ec5963b -r d7113a165bab src/Virt_VSMigrationCapabilities.c
--- a/src/Virt_VSMigrationCapabilities.c Wed Dec 19 14:10:15 2007 +0100
+++ b/src/Virt_VSMigrationCapabilities.c Wed Dec 19 14:10:15 2007 +0100
@@ -177,7 +177,8 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_VSMC,
+STD_InstanceMIStub(,
+ Virt_VSMigrationCapabilities,
_BROKER,
libvirt_cim_init());
6:20 a.m.
New subject: [PATCH 26 of 29] VirtualSystemMigrationService: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069816 -3600
# Node ID 0ce468d1f205a5d3e6848b0fad21a509c27634e7
# Parent d7113a165bab3e14235dff949cdf3bad60bb3541
VirtualSystemMigrationService: OpenWbem support
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r d7113a165bab -r 0ce468d1f205 schema/VSMigrationService.mof
--- a/schema/VSMigrationService.mof Wed Dec 19 14:10:15 2007 +0100
+++ b/schema/VSMigrationService.mof Wed Dec 19 14:10:16 2007 +0100
@@ -36,9 +36,11 @@ class Virt_MigrationJob : CIM_ConcreteJo
class Virt_MigrationJob : CIM_ConcreteJob {
};
+[Provider("cmpi::Virt_VSMigrationService")]
class Xen_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService {
};
+[Provider("cmpi::Virt_VSMigrationService")]
class KVM_VirtualSystemMigrationService : CIM_VirtualSystemMigrationService {
};
diff -r d7113a165bab -r 0ce468d1f205 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Wed Dec 19 14:10:15 2007 +0100
+++ b/src/Virt_VSMigrationService.c Wed Dec 19 14:10:16 2007 +0100
@@ -751,7 +751,8 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_VSMigrationService,
+STD_InstanceMIStub(,
+ Virt_VSMigrationService,
_BROKER,
libvirt_cim_init());
/*
6:20 a.m.
New subject: [PATCH 27 of 29] VirtualSystemSettingData: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069816 -3600
# Node ID b4f86d7e6d2120ce516efde2b2750d85c2c8b5c3
# Parent 0ce468d1f205a5d3e6848b0fad21a509c27634e7
VirtualSystemSettingData: OpenWbem support
- rename provider from VSSDProvider to VSSD
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 0ce468d1f205 -r b4f86d7e6d21 schema/VSSD.mof
--- a/schema/VSSD.mof Wed Dec 19 14:10:16 2007 +0100
+++ b/schema/VSSD.mof Wed Dec 19 14:10:16 2007 +0100
@@ -2,7 +2,8 @@
[Description (
"A class derived from CIM_VirtualSystemSettingData to represent "
- "the config of Xen virtual machines/domains running on the system.")
+ "the config of Xen virtual machines/domains running on the system."),
+ Provider("cmpi::Virt_VSSD")
]
class Xen_VirtualSystemSettingData : CIM_VirtualSystemSettingData
{
@@ -14,7 +15,8 @@ class Xen_VirtualSystemSettingData : CIM
[Description (
"A class derived from CIM_VirtualSystemSettingData to represent "
- "the config of KVM virtual machines/domains running on the system.")
+ "the config of KVM virtual machines/domains running on the system."),
+ Provider("cmpi::Virt_VSSD")
]
class KVM_VirtualSystemSettingData : CIM_VirtualSystemSettingData
{
diff -r 0ce468d1f205 -r b4f86d7e6d21 schema/VSSD.registration
--- a/schema/VSSD.registration Wed Dec 19 14:10:16 2007 +0100
+++ b/schema/VSSD.registration Wed Dec 19 14:10:16 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance
-KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance
+Xen_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance
+KVM_VirtualSystemSettingData root/virt Virt_VSSD Virt_VSSD instance
diff -r 0ce468d1f205 -r b4f86d7e6d21 src/Virt_VSSD.c
--- a/src/Virt_VSSD.c Wed Dec 19 14:10:16 2007 +0100
+++ b/src/Virt_VSSD.c Wed Dec 19 14:10:16 2007 +0100
@@ -250,7 +250,10 @@ DEFAULT_EQ();
DEFAULT_EQ();
DEFAULT_INST_CLEANUP();
-STD_InstanceMIStub(, Virt_VSSDProvider, _BROKER, libvirt_cim_init());
+STD_InstanceMIStub(,
+ Virt_VSSD,
+ _BROKER,
+ libvirt_cim_init());
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 28 of 29] VirtualSystemSettingDataComponent: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069817 -3600
# Node ID 204010b3fe863e9ceee38fb0761d70bb96e761c4
# Parent b4f86d7e6d2120ce516efde2b2750d85c2c8b5c3
VirtualSystemSettingDataComponent: OpenWbem support
- rename provider from VSSDComponentProvider to VSSDComponent
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r b4f86d7e6d21 -r 204010b3fe86 schema/VSSDComponent.mof
--- a/schema/VSSDComponent.mof Wed Dec 19 14:10:16 2007 +0100
+++ b/schema/VSSDComponent.mof Wed Dec 19 14:10:17 2007 +0100
@@ -1,11 +1,15 @@
// Copyright IBM Corp. 2007
-[Association]
+[Association,
+ Provider("cmpi::Virt_VSSDComponent")
+]
class Xen_VirtualSystemSettingDataComponent : CIM_Component
{
};
-[Association]
+[Association,
+ Provider("cmpi::Virt_VSSDComponent")
+]
class KVM_VirtualSystemSettingDataComponent : CIM_Component
{
};
diff -r b4f86d7e6d21 -r 204010b3fe86 schema/VSSDComponent.registration
--- a/schema/VSSDComponent.registration Wed Dec 19 14:10:16 2007 +0100
+++ b/schema/VSSDComponent.registration Wed Dec 19 14:10:17 2007 +0100
@@ -1,4 +1,4 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponentProvider
Virt_VSSDComponent association
-KVM_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponentProvider
Virt_VSSDComponent association
+Xen_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent
association
+KVM_VirtualSystemSettingDataComponent root/virt Virt_VSSDComponent Virt_VSSDComponent
association
diff -r b4f86d7e6d21 -r 204010b3fe86 src/Virt_VSSDComponent.c
--- a/src/Virt_VSSDComponent.c Wed Dec 19 14:10:16 2007 +0100
+++ b/src/Virt_VSSDComponent.c Wed Dec 19 14:10:17 2007 +0100
@@ -210,7 +210,11 @@ static struct std_assoc *handlers[] = {
NULL
};
-STDA_AssocMIStub(, Virt_VSSDComponentProvider, _BROKER, libvirt_cim_init(), handlers);
+STDA_AssocMIStub(,
+ Virt_VSSDComponent,
+ _BROKER,
+ libvirt_cim_init(),
+ handlers);
/*
* Local Variables:
6:20 a.m.
New subject: [PATCH 29 of 29] ComputerSystemIndication: OpenWbem support
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1198069818 -3600
# Node ID b64462bb760d425d45257d0a7ab8b075bc518059
# Parent 204010b3fe863e9ceee38fb0761d70bb96e761c4
ComputerSystemIndication: OpenWbem support
- rename provider from ComputerSystemIndicationProvider to ComputerSystemIndication
- update registration file with new providername
- add "Provider" qualifier to mof
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 204010b3fe86 -r b64462bb760d schema/ComputerSystemIndication.mof
--- a/schema/ComputerSystemIndication.mof Wed Dec 19 14:10:17 2007 +0100
+++ b/schema/ComputerSystemIndication.mof Wed Dec 19 14:10:18 2007 +0100
@@ -1,21 +1,29 @@
// Copyright IBM Corp. 2007
-[Description ("Xen_ComputerSystem created")]
+[Description ("Xen_ComputerSystem created"),
+ Provider("cmpi::Virt_ComputerSystemIndication")
+]
class Xen_ComputerSystemCreatedIndication : CIM_InstCreation
{
};
-[Description ("Xen_ComputerSystem deleted")]
+[Description ("Xen_ComputerSystem deleted"),
+ Provider("cmpi::Virt_ComputerSystemIndication")
+]
class Xen_ComputerSystemDeletedIndication : CIM_InstDeletion
{
};
-[Description ("KVM_ComputerSystem lifecycle")]
+[Description ("KVM_ComputerSystem lifecycle"),
+ Provider("cmpi::Virt_ComputerSystemIndication")
+]
class KVM_ComputerSystemCreatedIndication : CIM_InstCreation
{
};
-[Description ("KVM_ComputerSystem lifecycle")]
+[Description ("KVM_ComputerSystem lifecycle"),
+ Provider("cmpi::Virt_ComputerSystemIndication")
+]
class KVM_ComputerSystemDeletedIndication : CIM_InstDeletion
{
};
diff -r 204010b3fe86 -r b64462bb760d schema/ComputerSystemIndication.registration
--- a/schema/ComputerSystemIndication.registration Wed Dec 19 14:10:17 2007 +0100
+++ b/schema/ComputerSystemIndication.registration Wed Dec 19 14:10:18 2007 +0100
@@ -1,6 +1,6 @@
# Copyright IBM Corp. 2007
# Classname Namespace ProviderName ProviderModule ProviderTypes
-Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider
Virt_ComputerSystemIndication indication method
-Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider
Virt_ComputerSystemIndication indication method
-KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider
Virt_ComputerSystemIndication indication method
-KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider
Virt_ComputerSystemIndication indication method
+Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndication
Virt_ComputerSystemIndication indication method
+Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndication
Virt_ComputerSystemIndication indication method
+KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndication
Virt_ComputerSystemIndication indication method
+KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndication
Virt_ComputerSystemIndication indication method
diff -r 204010b3fe86 -r b64462bb760d src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c Wed Dec 19 14:10:17 2007 +0100
+++ b/src/Virt_ComputerSystemIndication.c Wed Dec 19 14:10:18 2007 +0100
@@ -303,8 +303,11 @@ DEFAULT_AF();
DEFAULT_AF();
DEFAULT_MP();
-STDI_IndicationMIStub(, Virt_ComputerSystemIndicationProvider,
- _BROKER, libvirt_cim_init(), &csi);
+STDI_IndicationMIStub(,
+ Virt_ComputerSystemIndication,
+ _BROKER,
+ libvirt_cim_init(),
+ &csi);
/*
* Local Variables:
12:04 p.m.
Heidi Eckhart wrote:
updated schema and provider registration scripts
added "Provider" qualifier to each provider's mof
fixed provider and module naming
I tested this set with a Pegasus / Fedora 8 setup. Everything looks
good - no regressions on the Pegasus side of things. =)
--
Kaitlin Rupert
IBM Linux Technology Center
karupert(a)us.ibm.com
2:07 p.m.
Kaitlin Rupert wrote:
Heidi Eckhart wrote:
> updated schema and provider registration scripts
> added "Provider" qualifier to each provider's mof
> fixed provider and module naming
>
I tested this set with a Pegasus / Fedora 8 setup. Everything looks
good - no regressions on the Pegasus side of things. =)
I'd love to test the sfcb side. The slight barrier to that is the
complete meltdown of the Pok lab network. I think it was our fault, but
the fix requires getting access to a Cisco switch that we aren't going
to get, and getting someone else to fix it for us isn't going to
speedily. Bottom line is that the only way I can test code right now is
physically transporting it into the lab, which doesn't sound too
appetizing. I'm hoping that we can get the network back up before that
becomes necessary.
--
-Jay
11:13 p.m.
JG> I'd love to test the sfcb side.
I bet Heidi has tested it on sfcb already. If so, I'm ready to push
these in.
Thanks Heidi!
--
Dan Smith
IBM Linux Technology Center
Open Hypervisor Team
email: danms(a)us.ibm.com
2:11 p.m.
Dan Smith wrote:
JG> I'd love to test the sfcb side.
I bet Heidi has tested it on sfcb already. If so, I'm ready to push
these in.
Thanks Heidi!
Yes, I did a fast test on sfcb, Pegasus and OpenWbem.
--
Regards
Heidi Eckhart
Software Engineer
Linux Technology Center - Open Hypervisor
heidieck(a)linux.vnet.ibm.com
**************************************************
IBM Deutschland Entwicklung GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschaeftsfuehrung: Herbert Kircher
Sitz der Gesellschaft: Boeblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
6211
days inactive
6212
days old
35 comments
4 participants
participants (4)
-
Dan Smith -
Heidi Eckhart -
Jay Gagnon -
Kaitlin Rupert