[Libvirt-cim] [PATCH] [TEST] VSSD uses "Xen" not "XenFV" as part of the InstanceID
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1260576721 28800
# Node ID 5978eee0beb98fb1d2d8780376fc8edd825589d7
# Parent f4cdb74b80f86892cd5739f86ccb215fa7ac8de3
[TEST] VSSD uses "Xen" not "XenFV" as part of the InstanceID
Fix several tests to use the right InstanceID for Xen full virt guests.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r f4cdb74b80f8 -r 5978eee0beb9
suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py
--- a/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Fri Dec
11 16:12:01 2009 -0800
+++ b/suites/libvirt-cim/cimtest/RASDIndications/02_guest_add_mod_rem_rasd_ind.py Fri Dec
11 16:12:01 2009 -0800
@@ -82,11 +82,17 @@
def gen_indication(test_dom, s_sysname, virt, cxml, service, ind_name,
rasd=None, nmem_disk=None):
status = FAIL
+
+ if virt == "XenFV":
+ prefix = "Xen"
+ else:
+ prefix = virt
+
try:
if ind_name == "add":
cn = 'VirtualSystemSettingData'
- inst_id = '%s:%s' % (virt, test_dom)
+ inst_id = '%s:%s' % (prefix, test_dom)
classname = get_typed_class(virt, cn)
vssd_ref = get_rasd_rec(virt, cn, s_sysname, inst_id)
diff -r f4cdb74b80f8 -r 5978eee0beb9
suites/libvirt-cim/cimtest/VirtualSystemManagementService/22_addmulti_brg_interface.py
---
a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/22_addmulti_brg_interface.py Fri
Dec 11 16:12:01 2009 -0800
+++
b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/22_addmulti_brg_interface.py Fri
Dec 11 16:12:01 2009 -0800
@@ -74,7 +74,12 @@
if ret:
raise Exception("Failed to define the dom: %s" % default_dom)
- inst_id = '%s:%s' % (options.virt, test_dom)
+ if options.virt == "XenFV":
+ prefix = "Xen"
+ else:
+ prefix = options.virt
+
+ inst_id = '%s:%s' % (prefix, test_dom)
netpool = EnumNames(options.ip, classname)
vssd_ref = None
for i in range(0, len(netpool)):
diff -r f4cdb74b80f8 -r 5978eee0beb9
suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py
---
a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py Fri
Dec 11 16:12:01 2009 -0800
+++
b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/23_verify_duplicate_mac_err.py Fri
Dec 11 16:12:01 2009 -0800
@@ -113,7 +113,13 @@
service = get_vsms_class(options.virt)(options.ip)
classname = get_typed_class(options.virt, 'VirtualSystemSettingData')
netpool = EnumNames(options.ip, classname)
- inst_id = '%s:%s' % (options.virt, default_dom)
+
+ if options.virt == "XenFV":
+ prefix = "Xen"
+ else:
+ prefix = options.virt
+
+ inst_id = '%s:%s' % (prefix, default_dom)
vssd_ref = None
for i in range(0, len(netpool)):
ret_pool = netpool[i].keybindings['InstanceID']