[PATCH] [TEST] Fixed the tc 05_destroysystem_neg.py failure
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1207834054 -19800
# Node ID 1f4926b238908ff7f4c6610fde37490492ba559c
# Parent 19ff9c851ed8cb76b74d158a4c439dfa5f4ccb50
[TEST] Fixed the tc 05_destroysystem_neg.py failure .
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 19ff9c851ed8 -r 1f4926b23890 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Wed Apr 09 18:00:14 2008 +0530
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Thu Apr 10 18:57:34 2008 +0530
@@ -22,12 +22,9 @@
#
import sys
-import pywbem
from pywbem.cim_obj import CIMInstanceName
-from VirtLib import utils
from XenKvmLib import vsms
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.test_doms import undefine_test_domain
from CimTest.Globals import log_param, logger
from CimTest.Globals import do_main
from CimTest.ReturnCodes import FAIL, PASS, SKIP
@@ -44,13 +41,12 @@ def destroysystem_fail(tc, options):
cs_ref = CIMInstanceName(classname,
keybindings = {'CreationClassName':classname})
elif tc == 'nonexistent':
- exp_rc = 4 #IM_RC_SYS_NOT_FOUND
- cs_ref = CIMInstanceName(classname,keybindings = {
+ exp_rc = 2 #IM_RC_SYS_NOT_FOUND
+ cs_ref = CIMInstanceName(classname, keybindings = {
'Name':'##@@!!cimtest_domain',
'CreationClassName':classname})
else:
return SKIP
-
status = FAIL
try:
ret = service.DestroySystem(AffectedSystem=cs_ref)
16 years, 5 months
[PATCH] [TEST] #2 Fixing 01_netport.py tc failure
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1207917822 -19800
# Node ID 970eaf6adde2704888d914c45c0aba19aff7f4dc
# Parent ee931f10e1f0b83d410f8e1c13d320b23bba7f1e
[TEST] #2 Fixing 01_netport.py tc failure.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r ee931f10e1f0 -r 970eaf6adde2 suites/libvirt-cim/cimtest/NetworkPort/01_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Fri Apr 11 16:58:23 2008 +0530
+++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Fri Apr 11 18:13:42 2008 +0530
@@ -30,12 +30,9 @@
# Date : 24-10-2007
import sys
-import pywbem
-from VirtLib import utils
-from VirtLib import live
from XenKvmLib import devices
from XenKvmLib.classes import get_typed_class
-from XenKvmLib.vxml import XenXML, KVMXML, get_class
+from XenKvmLib.vxml import get_class
from CimTest.Globals import log_param, logger
from CimTest.Globals import do_main
from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC
@@ -51,55 +48,54 @@ def main():
def main():
options = main.options
log_param()
+ status = PASS
vsxml = get_class(options.virt)(test_dom, mac=test_mac)
vsxml.define(options.ip)
devid = "%s/%s" % (test_dom, test_mac)
key_list = { 'DeviceID' : devid,
- 'CreationClassName' : get_typed_class(options.virt, "NetworkPort"),
+ 'CreationClassName' : get_typed_class(options.virt,
+ "NetworkPort"),
'SystemName' : test_dom,
- 'SystemCreationClassName' : get_typed_class(options.virt, "ComputerSystem")
+ 'SystemCreationClassName' : get_typed_class(options.virt,
+ "ComputerSystem")
}
-
dev = None
-
try:
- dev = eval('devices.' + get_typed_class(options.virt, "NetworkPort"))(options.ip, key_list)
+ dev = eval('devices.' + get_typed_class(options.virt, "NetworkPort")) \
+ (options.ip, key_list)
except Exception, detail:
logger.error("Exception: %s" % detail)
vsxml.undefine(options.ip)
return XFAIL_RC(bug)
- if dev == None:
+ if devid != dev.DeviceID :
logger.error("Error retrieving instance for devid %s" % devid)
vsxml.undefine(options.ip)
return FAIL
-
- status = PASS
if dev.LinkTechnology != devices.LinkTechnology_Ethernet:
- logger.error("LinkTechnology should be set to `%i' instead of `%s'" % \
- (devices.LinkTechnology_Ethernet, dev.LinkTechnology))
+ logger.error("LinkTechnology should be set to `%i' instead of `%s'"
+ % (devices.LinkTechnology_Ethernet, dev.LinkTechnology))
status = FAIL
addrs = dev.NetworkAddresses
if len(addrs) != 1:
- logger.error("Too many NetworkAddress entries (%i instead of %i)" % \
- (len(addrs), 1))
+ logger.error("Too many NetworkAddress entries (%i instead of %i)"
+ % (len(addrs), 1))
status = FAIL
if addrs[0] != test_mac:
- logger.error("MAC address reported incorrectly (%s instead of %s)" % \
- (addrs[0], test_mac))
+ logger.error("MAC address reported incorrectly (%s instead of %s)"
+ % (addrs[0], test_mac))
status = FAIL
if status == FAIL:
logger.error("Checked interface %s" % test_mac)
vsxml.undefine(options.ip)
-
return status
if __name__ == "__main__":
16 years, 5 months
[PATCH] [TEST] set default kvm emulator based on cpu capabilities
by zli＠linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1207881544 -28800
# Node ID fd2df63589968f4a14891f6c23c2748918b9b68f
# Parent 70565a27044e9d1f1219230bf1a5f7de6240e6ab
[TEST] set default kvm emulator based on cpu capabilities
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r 70565a27044e -r fd2df6358996 lib/VirtLib/live.py
--- a/lib/VirtLib/live.py Thu Apr 10 15:11:06 2008 +0800
+++ b/lib/VirtLib/live.py Fri Apr 11 10:39:04 2008 +0800
@@ -237,13 +237,7 @@ def bootloader(server, gtype = 0):
or domUloader.py for SLES.
3) returns the bootloader.
"""
- cmd = "cat /proc/cpuinfo | egrep flags | uniq | egrep 'vmx|svm' "
- ret, out = utils.run_remote(server,cmd)
- if ret != 0:
- mtype = "PVT"
- else:
- mtype = "FVT"
- if mtype == "FVT" and gtype == 1:
+ if fv_cap(server) and gtype == 1:
bootloader = "/usr/lib/xen/boot/hvmloader"
else:
cmd = "cat /etc/issue | grep -v ^$ | egrep 'Red Hat|Fedora'"
@@ -256,6 +250,11 @@ def bootloader(server, gtype = 0):
bootloader = "/usr/bin/pygrub"
return bootloader
+def fv_cap(server):
+ cmd = "egrep flags /proc/cpuinfo | uniq | egrep 'vmx|svm'"
+ ret, out = utils.run_remote(server, cmd)
+ return ret == 0
+
def hostname(server):
"""To return the hostname of the cimserver"""
diff -r 70565a27044e -r fd2df6358996 suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py Thu Apr 10 15:11:06 2008 +0800
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri Apr 11 10:39:04 2008 +0800
@@ -20,6 +20,8 @@
import os
import platform
+from VirtLib.live import fv_cap
+from CimTest.Globals import CIM_IP
# vxml.NetXML
default_bridge_name = 'testbridge'
@@ -43,7 +45,10 @@ Xen_default_net_type = 'ethernet'
Xen_default_net_type = 'ethernet'
# vxml.KVMXML
-KVM_default_emulator = '/usr/bin/qemu-kvm'
+if fv_cap(CIM_IP):
+ KVM_default_emulator = '/usr/bin/qemu-kvm'
+else:
+ KVM_default_emulator = '/usr/bin/qemu'
KVM_disk_path = os.path.join(_image_dir, 'default-kvm-dimage')
KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND')
KVM_default_disk_dev = 'hda'
16 years, 5 months
[PATCH] [TEST] Fixing the 04_defineStartVS.py tc failure
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1207834470 -19800
# Node ID 0e7eb39ed839e03d1dd2635157f19e5acdc4c9be
# Parent 1f4926b238908ff7f4c6610fde37490492ba559c
[TEST] Fixing the 04_defineStartVS.py tc failure.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r 1f4926b23890 -r 0e7eb39ed839 suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Apr 10 18:57:34 2008 +0530
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Apr 10 19:04:30 2008 +0530
@@ -6,6 +6,7 @@
# Kaitlin Rupert <karupert(a)us.ibm.com>
# Veerendra Chandrappa <vechandr(a)in.ibm.com>
# Zhengang Li <lizg(a)cn.ibm.com>
+# Deepti B. kalakeri <deeptik(a)linux.vnet.ibm.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public
@@ -28,10 +29,11 @@
# 10-Oct-2007
import sys
+from time import sleep
from XenKvmLib import vxml
from XenKvmLib import computersystem
-from VirtLib import utils
from CimTest import Globals
+from XenKvmLib.classes import get_typed_class
from CimTest.Globals import do_main
from CimTest.ReturnCodes import PASS, FAIL
@@ -53,18 +55,21 @@ def main():
Globals.logger.error("Failed to Start the dom: %s", test_dom)
cxml.undefine(options.ip)
return status
-
+
+ timeout = 10
try:
- cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom)
-
- if cs.Name == test_dom:
- enabState = cs.EnabledState
- else:
- Globals.logger.error("VS %s is not defined" % test_dom)
-
- # Success: VS is in Enabled State after Define and Start
- if enabState == 2:
- status = PASS
+ # Need to poll for XenFV, since enabState is not getting set otherwise.
+ for i in range(1, (timeout + 1)):
+ sleep(1)
+ cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom)
+ if cs.Name == test_dom:
+ enabState = cs.EnabledState
+ else:
+ Globals.logger.error("VS %s is not defined" % test_dom)
+ # Success: VS is in Enabled State after Define and Start
+ if enabState == 2:
+ status = PASS
+ break
except Exception, detail:
Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE,
16 years, 5 months
[PATCH] [TEST] Adding 05_RAPF_err.py to verify RAPF
by Deepti B. Kalakeri
# HG changeset patch
# User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
# Date 1207303009 -19800
# Node ID 0142551c8d3cf5f2a3bbdfe835d69c3880be395a
# Parent dce42f09c9c60c59e15db48882bc8fb68301238f
[TEST] Adding 05_RAPF_err.py to verify RAPF.
The test :
creates a guest with a network device that is not part of a known pool.
Then call ResourceAllocatedFromPool with the reference to that device.
Verifies for the error.
Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
diff -r dce42f09c9c6 -r 0142551c8d3c suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Fri Apr 04 15:26:49 2008 +0530
@@ -0,0 +1,204 @@
+#!/usr/bin/python
+#
+# Copyright 2008 IBM Corp.
+#
+# Authors:
+# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# This tc is used to verify the that the
+# ResourceAllocationFromPool asscoiation returns error
+# when guest is associated to a non-existing virtual network pool.
+#
+# The does the following:
+# 1) creates a guest with a network device that is not part of a known pool,
+# 2) call ResourceAllocatedFromPool with the reference to that device.
+# 3) Verifies for the following error:
+#
+# Command:
+# --------
+# wbemcli ain -ac KVM_ResourceAllocationFromPool
+# 'http://localhost:5988/root/virt:KVM_NetResourceAllocationSettingData.
+# InstanceID="test-kvm/24:42:53:21:52:45"'
+#
+#
+# Output:
+# -------
+# error no : CIM_ERR_FAILED
+# error desc : "Unable to determine pool of `test-kvm/24:42:53:21:52:45';"
+#
+# Date : 04-04-2008
+#
+import sys
+import pywbem
+from VirtLib import live
+from XenKvmLib import assoc, enumclass
+from XenKvmLib.common_util import try_assoc
+from XenKvmLib.test_doms import destroy_and_undefine_all
+from CimTest import Globals
+from CimTest.Globals import logger, CIM_ERROR_ENUMERATE
+from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.Globals import do_main, platform_sup
+from XenKvmLib.vxml import get_class
+from XenKvmLib.classes import get_typed_class
+
+test_dom = "RAPF_domain"
+test_mac = "00:11:22:33:44:aa"
+test_vcpus = 1
+
+
+def check_bridge_name(bridgename):
+ bridge_list = live.available_bridges(server)
+ vbr = None
+ if bridgename in bridge_list:
+ import random
+ vbr = bridgename + str(random.randint(1, 100))
+ if vbr in bridge_list:
+ logger.error('Need to give different bridge name since it already exists')
+ return None
+ else:
+ vbr = bridgename
+ return vbr
+
+def setup_env():
+ vsxml = None
+ if virt == "Xen":
+ test_disk = "xvda"
+ else:
+ test_disk = "hda"
+
+ virt_xml = get_class(virt)
+ vsxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk)
+ if virt != 'XenFV':
+ bridge = vsxml.set_vbridge(server)
+
+# Get a bridge name that is not used by any of the virtual network pool on the machine.
+ bridge_name = check_bridge_name('invalid-bridge')
+ if bridge_name == None:
+ logger.error("Failed to get an invalid bridge name")
+ return FAIL, vsxml
+# Assigning the bridge that does not belong to any networkpool.
+ vsxml.set_bridge_name(bridge_name)
+
+ ret = vsxml.define(server)
+ if not ret:
+ Globals.logger.error("Failed to define the dom: %s", test_dom)
+ return FAIL, vsxml
+
+ return PASS, vsxml
+
+def get_inst_from_list(classname, rasd_list, filter_name, exp_val):
+ status = PASS
+ ret = FAIL
+ inst = []
+
+ for rec in rasd_list:
+ record = rec[filter_name]
+ if exp_val in record:
+ inst.append(rec)
+ ret = PASS
+
+ if ret != PASS:
+ logger.error("%s with %s was not returned" % (classname, exp_val))
+ vsxml.undefine(server)
+ status = FAIL
+
+ return status, inst
+
+def get_netrasd_instid(classname):
+ rasd_list = []
+ status = PASS
+ try:
+ rasd_list = enumclass.enumerate_inst(server, classname, virt)
+ if len(rasd_list) < 1:
+ logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
+ len(rasd_list))
+ status = FAIL
+ except Exception, detail:
+ logger.error(CIM_ERROR_ENUMERATE, classname)
+ logger.error("Exception: %s", detail)
+ status = FAIL
+
+ if status != PASS:
+ return status, rasd_list
+
+ # Get the RASD info related to the domain "ONLY".
+ # We should get ONLY one record.
+ rasd_info = []
+ status, rasd_info = get_inst_from_list(classname, rasd_list, "InstanceID", test_dom)
+
+ return status, rasd_info
+
+def verify_rapf_err():
+ status = PASS
+ try:
+
+ classname = get_typed_class(virt, 'NetResourceAllocationSettingData')
+ status, net_rasd_list = get_netrasd_instid(classname)
+ if status != PASS or len(net_rasd_list) == 0:
+ return status
+ if len(net_rasd_list) != 1:
+ logger.error("%s returned %i instances, excepted atleast 1 instance", classname,
+ len(net_rasd_list))
+ return FAIL
+
+
+ conn = assoc.myWBEMConnection('http://%s' % server,
+ (Globals.CIM_USER,
+ Globals.CIM_PASS),
+ Globals.CIM_NS)
+ assoc_classname = get_typed_class(virt, "ResourceAllocationFromPool")
+ classname = net_rasd_list[0].classname
+ instid = net_rasd_list[0]['InstanceID']
+ keys = { "InstanceID" : instid }
+ expr_values = {
+ 'rapf_err' : {
+ 'desc' : "Unable to determine pool of `%s'" %instid,
+ 'rc' : pywbem.CIM_ERR_FAILED
+ }
+ }
+ status = try_assoc(conn, classname, assoc_classname, keys, field_name="InstanceID",
+ expr_values=expr_values['rapf_err'], bug_no="")
+
+ except Exception, detail:
+ logger.error("Exception: %s", detail)
+ status = FAIL
+
+ return status
+
+@do_main(platform_sup)
+def main():
+ global virt, vsxml, server
+ Globals.log_param()
+ options = main.options
+ server = options.ip
+ virt = options.virt
+ destroy_and_undefine_all(server)
+
+ status, vsxml = setup_env()
+ if status != PASS:
+ logger.error("Failed to setup the domain")
+ return status
+
+ ret = verify_rapf_err()
+ if ret:
+ logger.error("------FAILED: to verify the RAFP.------")
+ status = ret
+
+ vsxml.undefine(server)
+ return status
+if __name__ == "__main__":
+ sys.exit(main())
16 years, 5 months
[PATCH] [TEST] redirect logging to /dev/null instead of stderr
by zli＠linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1207727823 25200
# Node ID f58194a3271fe20b19894c9f3472164316e1ee4c
# Parent b5857217c64a081450cd21219035084eac455d85
[TEST] redirect logging to /dev/null instead of stderr
The original default basicConfig() added a stderr Streamhandler.
The log is duplicated to both the stderr and the file log 'vsmtest.log'.
Outputting all the log to the screen makes the test less easier to read.
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r b5857217c64a -r f58194a3271f lib/CimTest/Globals.py
--- a/lib/CimTest/Globals.py Tue Apr 08 19:56:59 2008 -0700
+++ b/lib/CimTest/Globals.py Wed Apr 09 00:57:03 2008 -0700
@@ -50,7 +50,7 @@
CIM_PORT = "5988"
NM = "TEST LOG"
platform_sup = ["Xen", "KVM", "XenFV"]
-logging.basicConfig()
+logging.basicConfig(filename='/dev/null')
logger = logging.getLogger(NM)
logging.PRINT = logging.DEBUG + 50
logging.addLevelName(logging.PRINT, "PRINT")
16 years, 5 months
[PATCH 0 of 6] Fix up handling of NetRASD-related define path
by Dan Smith
This patch set attempts to close the gap between what a client expects to be
able to discover and what we allow. After this, the client should be able
to use the default NetRASDs exposed from AllocationCapabilities as templates
for a DefineSystem operation with proper pool (i.e. Virtual Network) membership
maintained and unique MACs assigned.
Comments and thorough review appreciated :)
16 years, 5 months
[PATCH] [TEST] fix verification error in 01_netport.py
by Guo Lian Yun
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1207804593 25200
# Node ID c24b13077839fd7cfb2313357a8ea695539b61bc
# Parent 19ff9c851ed8cb76b74d158a4c439dfa5f4ccb50
[TEST] fix verification error in 01_netport.py
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 19ff9c851ed8 -r c24b13077839 suites/libvirt-cim/cimtest/NetworkPort/01_netport.py
--- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Wed Apr 09 18:00:14 2008 +0530
+++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Wed Apr 09 22:16:33 2008 -0700
@@ -72,7 +72,7 @@ def main():
vsxml.undefine(options.ip)
return XFAIL_RC(bug)
- if dev == None:
+ if dev.DeviceID == None:
logger.error("Error retrieving instance for devid %s" % devid)
vsxml.undefine(options.ip)
return FAIL
16 years, 5 months
[PATCH] Fix xml_parse_test to work with new definition of struct vcpu_device
by Dan Smith
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1207763825 25200
# Node ID f0efb24ba68e89847815b6bf2cfa89dea0330398
# Parent 6cddb842645dcf42c5780c38c3d38785f00f0de4
Fix xml_parse_test to work with new definition of struct vcpu_device
...also print out the 'source' field of network devices
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r 6cddb842645d -r f0efb24ba68e libxkutil/xml_parse_test.c
--- a/libxkutil/xml_parse_test.c Wed Apr 09 10:38:58 2008 -0700
+++ b/libxkutil/xml_parse_test.c Wed Apr 09 10:57:05 2008 -0700
@@ -78,6 +78,7 @@ static void print_dev_net(struct virt_de
{
print_value(d, "Type", dev->dev.net.type);
print_value(d, "MAC", dev->dev.net.mac);
+ print_value(d, "Source", dev->dev.net.source);
}
static void print_dev_disk(struct virt_device *dev,
@@ -93,7 +94,7 @@ static void print_dev_vcpu(struct virt_d
static void print_dev_vcpu(struct virt_device *dev,
FILE *d)
{
- print_u32(d, "Virtual CPU", dev->dev.vcpu.number);
+ print_u32(d, "Virtual CPUs", dev->dev.vcpu.quantity);
}
static void print_dev_emu(struct virt_device *dev,
16 years, 5 months
[PATCH] [TEST] change AllocationCapabilities expected error string
by zli＠linux.vnet.ibm.com
# HG changeset patch
# User Zhengang Li <lizg(a)cn.ibm.com>
# Date 1207728305 25200
# Node ID be122f36acaa24527bdc6339ed16b80526b5fcb7
# Parent f58194a3271fe20b19894c9f3472164316e1ee4c
[TEST] change AllocationCapabilities expected error string
On FC8 it was 'Instance not found'. Now FC9 expects 'Requested
Object could not be found'. This is only a string returned from
CIMOM, I'm changing this to a word used in both messages. What
we really expect is the CIM_ERR_NOT_FOUND. The rc code are identical
on FC8 and FC9.
This fixes AllocationCapabilities.02 failures on a pegasus 2.7 CIMOM.
Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>
diff -r f58194a3271f -r be122f36acaa suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py
--- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Wed Apr 09 00:57:03 2008 -0700
+++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Wed Apr 09 01:05:05 2008 -0700
@@ -73,7 +73,7 @@
"invalid_instid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \
'desc' : 'No InstanceID specified' }, \
"invalid_instid_keyvalue" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \
- 'desc' : 'Instance not found' }
+ 'desc' : 'found' }
}
def conf_file():
"""
16 years, 5 months
