[Libvirt-cim] [PATCH] [TEST] Fix VSMS 23 to not start a second Xen guest
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1255986945 25200
# Node ID 3f334de6a0713170a64990ba0ad21d7591ab8349
# Parent 4047a548c85f56c139dc32cbf6953337a0789482
[TEST] Fix VSMS 23 to not start a second Xen guest
See the comment in the test - starting a second guest is valid for KVM guests,
but not for Xen guests.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 4047a548c85f -r 3f334de6a071
suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py
---
a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py Mon
Oct 19 13:48:31 2009 -0700
+++
b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py Mon
Oct 19 14:15:45 2009 -0700
@@ -50,7 +50,7 @@
cxml.undefine(ip)
destroy_netpool(ip, virt, npool_name)
-def start_dom(cxml,ip,dom):
+def start_dom(cxml, ip, dom, virt):
ret = cxml.cim_define(ip)
if not ret:
status = cxml.verify_error_msg(exp_rc, exp_desc)
@@ -58,6 +58,12 @@
raise Exception("Got unexpected rc code %s and description %s"
% (cxml.err_rc, cxml.err_desc))
return FAIL
+
+ #Xen will return an error about how the image is already in use
+ #Because of this, this test isn't valid with Xen guests
+ if virt == 'Xen' or virt == 'XenFV':
+ return PASS
+
ret = cxml.cim_start(ip)
if ret:
status = cxml.verify_error_msg(exp_rc, exp_desc)
@@ -81,7 +87,7 @@
cxml = get_class(options.virt)(default_dom, mac=nmac,
ntype=ntype, net_name=npool_name)
try:
- status = start_dom(cxml, options.ip, default_dom)
+ status = start_dom(cxml, options.ip, default_dom, options.virt)
if status == FAIL:
raise Exception("Starting %s domain failed, got unexpeceted rc"
"code %s and description %s" % (default_dom,
@@ -95,12 +101,14 @@
sxml = get_class(options.virt)(test_dom, mac=nmac,
ntype=ntype, net_name=npool_name)
try:
- status = start_dom(sxml, options.ip, test_dom)
+ status = start_dom(sxml, options.ip, test_dom, options.virt)
- if status == PASS:
+ #start_dom() passes because it doesn't attempt to start a guest
+ if status == PASS and options.virt != 'Xen' \
+ and options.virt != 'XenFV':
sxml.cim_destroy(options.ip)
sxml.undefine(options.ip)
- raise Exception("Was able to create two domains with"
+ raise Exception("Was able to create two domains with "
"Conflicting MAC Addresses")
service = get_vsms_class(options.virt)(options.ip)