# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1193994073 -3600 # Node ID 233f09c15c1194a9814cb339f5cd70b5b1e27932 # Parent d0a5fd9a1b73ed456ee179ce54b51d57fad1adeb Consolidation of ResourceAllocationSettingData Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r d0a5fd9a1b73 -r 233f09c15c11 Makefile.am --- a/Makefile.am Thu Nov 01 12:15:08 2007 +0100 +++ b/Makefile.am Fri Nov 02 10:01:13 2007 +0100 @@ -71,12 +71,8 @@ INTEROP_REGS = \ schema/RegisteredProfile.registration \ schema/ElementConformsToProfile.registration -EXTRA_BASE_MOFS = \ - schema/Xen_ResourceAllocationSettingData.mof \ - schema/KVM_ResourceAllocationSettingData.mof - pkgdata_DATA = $(MOFS) $(REGS) -pkgdata_SCRIPTS = provider-register.sh register_base.sh +pkgdata_SCRIPTS = provider-register.sh EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \ libvirt-cim.spec.in libvirt-cim.spec \ @@ -85,7 +81,6 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script postinstall: - sh register_base.sh @CIMSERVER@ $(EXTRA_BASE_MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) diff -r d0a5fd9a1b73 -r 233f09c15c11 register_base.sh --- a/register_base.sh Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -#!/bin/bash -# -# A script to register base classes with the CIMOM -# -# Copyright IBM Corp. 2007 -# Author: Dan Smith <danms@us.ibm.com> -# -# Usage: -# -# $ register_base.sh (sfcb|pegasus) [MOF...] -# -# FIXME: Need to make pegasus location and namespace variable - -CIMOM=$1 - -if [ -z "$CIMOM" ]; then - echo "Usage: $0 (pegasus|sfcb)" - exit 1 -fi - -shift - -if [ "$CIMOM" = "pegasus" ]; then - for i in $*; do - cimmofl -W -uc -aEV -R/var/lib/Pegasus -n /root/ibmsd $i - done -elif [ "$CIMOM" = "sfcb" ]; then - for i in $*; do - sfcbstage -n /root/ibmsd $i - done -else - echo "Unknown CIMOM type: $CIMOM" -fi diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/KVM_ResourceAllocationSettingData.mof --- a/schema/KVM_ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -// Copyright IBM Corp. 2007 -class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - -}; diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ b/schema/ResourceAllocationSettingData.mof Fri Nov 02 10:01:13 2007 +0100 @@ -1,4 +1,12 @@ // Copyright IBM Corp. 2007 +class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + +}; + +class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { + +}; + [Description ("Xen virtual disk configuration")] class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData{ diff -r d0a5fd9a1b73 -r 233f09c15c11 schema/Xen_ResourceAllocationSettingData.mof --- a/schema/Xen_ResourceAllocationSettingData.mof Thu Nov 01 12:15:08 2007 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -// Copyright IBM Corp. 2007 -class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - -};