# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1236583632 25200
# Node ID 76034664976f61b9f702691e40e6b506783b39e5
# Parent 087aaba2658940bbc8718aa55cbcd6150f7cac23
[TEST] #5 Add "AllocationCapabilities" to associate with ECTP and skip
KVM_RegisteredProfile association
Updates from 4 to 5:
1) Break the libvirt_cim_ac_lower <= curr_cim_rev < libvirt_cim_ac_upperr
2) Remove the unused import statements
Updates from 3 to 4:
Use a variable to assign revision value to be calculated for comparison
Updates from 2 to 3:
Add changeset instead of skip the verification of KVM_ResourceAllocation to ECTP for all
the src versions
Tested for KVM/LXC with current sources and rpm on Pegasus
Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com>
diff -r 087aaba26589 -r 76034664976f
suites/libvirt-cim/cimtest/ElementConforms/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Thu Mar 05 22:04:39 2009
-0800
+++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Mon Mar 09 00:27:12 2009
-0700
@@ -37,13 +37,12 @@
# Date : 04-12-2007
import sys
-from VirtLib import utils, live
from XenKvmLib import assoc
from XenKvmLib.test_doms import destroy_and_undefine_all
from XenKvmLib.classes import get_typed_class
from XenKvmLib import vxml
from CimTest import Globals
-from XenKvmLib.common_util import print_field_error, get_host_info
+from XenKvmLib.common_util import get_host_info
from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
from XenKvmLib.const import do_main, get_provider_version
from CimTest.ReturnCodes import PASS, FAIL
@@ -53,7 +52,9 @@
test_dom = "domU"
bug_sblim = '00007'
libvirt_cim_ectp_changes = 686
-libvirt_cim_input_graphics_ectp = 773
+libvirt_cim_input_graphics_ectp = 773
+libvirt_cim_ac_lower = 796
+libvirt_cim_ac_upper = 818
def init_managed_ele_values(server, virt):
verify_ectp_list = {}
@@ -63,7 +64,7 @@
curr_cim_rev, changeset = get_provider_version(virt, server)
if curr_cim_rev >= libvirt_cim_ectp_changes:
cn_names2 = ["VirtualSystemMigrationService", "DiskPool",
"NetworkPool",
- "ProcessorPool", "MemoryPool"]
+ "ProcessorPool", "MemoryPool",
"AllocationCapabilities"]
cn_names.extend(cn_names2)
if curr_cim_rev >= libvirt_cim_input_graphics_ectp:
cn_names.append("ConsoleRedirectionService")
@@ -136,6 +137,12 @@
if profile.InstanceID not in unsupp_prof:
profiles_instid_list.append(profile.InstanceID)
+ for prof_id in profiles_instid_list:
+ if prof_id == "CIM:DSP1041-ResourceAllocation-1.1.0c" and \
+ curr_cim_rev >= libvirt_cim_ac_lower and \
+ curr_cim_rev< libvirt_cim_ac_upper:
+ profiles_instid_list.remove(prof_id)
+
return status, profiles_instid_list
@do_main(sup_types)