- CIM - libvirt List Archives

[PATCH] [TEST] Fixing rcps/07*py which fails with sfcb
by Deepti B. Kalakeri 16 Jul '09

16 Jul '09

# HG changeset patch # User Deepti B.Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1247754531 25200 # Node ID 14b666e2a803048c1ce4e71b550a49c62915b3a3 # Parent ec760853195bcb5920e3822d1a8f5ba37c5b2c48 [TEST] Fixing rcps/07*py which fails with sfcb. Tested with SLES11, with current source and sfcb. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r ec760853195b -r 14b666e2a803 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Wed Jul 15 14:52:43 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Thu Jul 16 07:28:51 2009 -0700 @@ -86,7 +86,7 @@ "Netmask" : "255.255.255.0", "IPRangeStart" : "192.168.0.9", "IPRangeEnd" : "192.168.0.15", - "ForwardMode" : "nat" + "ForwardMode" : pywbem.cim_types.Uint16(1) } status = create_pool(options.ip, options.virt, test_pool, pool_attr)

1 0

[PATCH] [TEST] Remove stale XenFV guest if migration fails in VSMS/02
by Kaitlin Rupert 15 Jul '09

15 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247604765 25200 # Node ID a3ff36c310b2729052991032cf6c8f5cee85e838 # Parent 05d74ccb64b9ca5b313d8ccb5a89138f1dfc1aea [TEST] Remove stale XenFV guest if migration fails in VSMS/02 Sometimes xend gets hung doing a local migration of XenFV guests. The guest will show up in "xm list" as "migrating-guest_name". The problem with this is that libvirt sees the guest as "guest_name", so libvirt is unable to undefine the guest. In this case, we need to do an xm destroy to remove the guest. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 05d74ccb64b9 -r a3ff36c310b2 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Tue Jul 14 10:15:37 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/02_host_migrate_type.py Tue Jul 14 13:52:45 2009 -0700 @@ -34,6 +34,7 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from XenKvmLib.xm_virt_util import xm_destroy sup_types = ['Xen', 'XenFV'] @@ -182,7 +183,11 @@ if local_migrate == 0 and cxml is not None: cxml.destroy(options.ip) - cxml.undefine(options.ip) + rc = cxml.undefine(options.ip) + if rc == 1: + #Problem migrating guest locally, forcefully remove guest + xen_guest_name = "migrating-%s" % guest_name + xm_destroy(options.ip, xen_guest_name) except Exception, details: logger.error("Exception details: %s", details) diff -r 05d74ccb64b9 -r a3ff36c310b2 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Jul 14 10:15:37 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Jul 14 13:52:45 2009 -0700 @@ -38,6 +38,13 @@ return out +def xm_destroy(ip, domid): + + cmd = "xm destroy %s" % domid + + rc, out = utils.run_remote(ip, cmd) + return rc + def list_guests_on_bridge(ip, bridge): """Returns a list of domU names that have vifs in the specified bridge.

2 2

[PATCH] [TEST] A few more usb vs ps2 related fixes
by Kaitlin Rupert 15 Jul '09

15 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247609514 25200 # Node ID ca15cd2e09bc3d6f36a17ba13ad4e1971980f633 # Parent c6049e5fdac67a46ffc0bdc3f5cf41e83f0507a7 [TEST] A few more usb vs ps2 related fixes Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c6049e5fdac6 -r ca15cd2e09bc suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Jul 14 14:28:34 2009 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Jul 14 15:11:54 2009 -0700 @@ -105,7 +105,7 @@ if curr_cim_rev >= input_graphics_pool_rev: input_cn = get_typed_class(virt, "PointingDevice") graphics_cn = get_typed_class(virt, "DisplayController") - if virt == 'XenFV': + if virt == 'LXC': point_device = "%s/%s" %(test_dom, "mouse:usb") elif virt == 'Xen': point_device = "%s/%s" %(test_dom, "mouse:xen") diff -r c6049e5fdac6 -r ca15cd2e09bc suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Tue Jul 14 14:28:34 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Tue Jul 14 15:11:54 2009 -0700 @@ -86,7 +86,7 @@ rlist[3] : "%s/%s" % (test_dom, "proc") } - if virt == 'LXC' or virt == 'XenFV': + if virt == 'LXC': input_device = "mouse:usb" elif virt == 'Xen': input_device = "mouse:xen" diff -r c6049e5fdac6 -r ca15cd2e09bc suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Tue Jul 14 14:28:34 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Tue Jul 14 15:11:54 2009 -0700 @@ -82,7 +82,7 @@ verified. """ status = PASS - if virt == 'LXC' or virt == 'XenFV': + if virt == 'LXC': input_device = "mouse:usb" elif virt == 'Xen': input_device = "mouse:xen"

2 1

[PATCH] [TEST] Fix ESD 01: XenFV guest should use ps2 style input device
by Kaitlin Rupert 15 Jul '09

15 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247606914 25200 # Node ID c6049e5fdac67a46ffc0bdc3f5cf41e83f0507a7 # Parent a3ff36c310b2729052991032cf6c8f5cee85e838 [TEST] Fix ESD 01: XenFV guest should use ps2 style input device Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r a3ff36c310b2 -r c6049e5fdac6 suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Jul 14 13:52:45 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Tue Jul 14 14:28:34 2009 -0700 @@ -127,7 +127,7 @@ else: vdisk = "hda" - if options.virt == 'LXC' or options.virt == 'XenFV': + if options.virt == 'LXC': input_device = "%s/%s" %(test_dom, "mouse:usb") elif options.virt == 'Xen': input_device = "%s/%s" %(test_dom, "mouse:xen")

2 1

[PATCH] [TEST] #2 Fix RPCS 08 to work with older version of libvirt-cim
by Kaitlin Rupert 15 Jul '09

15 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247591737 25200 # Node ID 05d74ccb64b9ca5b313d8ccb5a89138f1dfc1aea # Parent ad683039dafd91ced940b28c28689bdc1e3e829c [TEST] #2 Fix RPCS 08 to work with older version of libvirt-cim... For versions that don't support dir, netfs pool creation, or DiskPoolRASD templates. Instead of checking for SKIP return value, just return status. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ad683039dafd -r 05d74ccb64b9 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Tue Jul 14 10:17:19 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/08_CreateDiskResourcePool.py Tue Jul 14 10:15:37 2009 -0700 @@ -61,9 +61,11 @@ libvirt_disk_pool_support=837 libvirt_netfs_pool_support=869 -def get_pool_attr(server, pool_type, dp_types): +def get_pool_attr(server, pool_type, dp_types, rev): pool_attr = { "Path" : "/tmp" } - if pool_type == dp_types['DISK_POOL_NETFS']: + + if rev >= libvirt_netfs_pool_support and \ + pool_type == dp_types['DISK_POOL_NETFS']: status , src_mnt_dir, dir_mnt_dir = nfs_netfs_setup(server) if status != PASS: logger.error("Failed to get pool_attr for NETFS diskpool type") @@ -107,7 +109,8 @@ try: logger.info("Verifying '%s'.....", key) test_pool = key - status, pool_attr = get_pool_attr(server, value, dp_types) + status, pool_attr = get_pool_attr(server, value, dp_types, + curr_cim_rev) if status != PASS: return FAIL @@ -144,7 +147,7 @@ logger.error("Exception details: %s", details) if key == 'DISK_POOL_NETFS': netfs_cleanup(server, pool_attr) - return FAIL + return status return status

2 1

[PATCH] Check for duplicate MAC addresses
by Sharad Mishra 15 Jul '09

15 Jul '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1247634781 25200 # Node ID ab9ad4cf3cb6f65ef082f4fb0fce23258e2af199 # Parent 3730865ecff94af45926b110373817e6ce38576d Check for duplicate MAC addresses. This patch gets all MAC addresses assigned to the VMs on the host and verifies that the generated or passed MAC does not conflict with an existing MAC. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 3730865ecff9 -r ab9ad4cf3cb6 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Jul 07 14:13:30 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Tue Jul 14 22:13:01 2009 -0700 @@ -534,6 +534,69 @@ return _mac; } +static const char *filter_by_address(struct inst_list *src, + const char *address) +{ + int i; + CMPIrc ret; + const char *addr; + const char *msg = NULL; + CMPIInstance *inst; + + for (i = 0; i < src->cur; i++) { + inst = src->list[i]; + ret = cu_get_str_prop(inst, "Address", &addr); + + if (ret != CMPI_RC_OK) + continue; + + if (STREQ(addr, address)) { + msg = "Conflicting MAC Addresses"; + goto out; + } + } +out: + return msg; + +} + +static const char *check_duplicate_mac(CMPIInstance *inst, + const char *mac, + const char *ns) +{ + CMPIObjectPath *op = NULL; + CMPIStatus s; + const char *msg = NULL; + const char *props[] = {"Address", NULL}; + struct inst_list in_list; + + op = CMGetObjectPath(inst, &s); + if ((op == NULL) || (s.rc != CMPI_RC_OK)) { + msg = "Unable to get a reference to the guest"; + goto out; + } + + /* FIXME: This is a Pegasus work around. Pegsus loses the namespace + when an ObjectPath is pulled from an instance */ + + if (STREQ(NAMESPACE(op), "")) + CMSetNameSpace(op, ns); + + inst_list_init(&in_list); + s = enum_rasds(_BROKER, op, NULL, CIM_RES_TYPE_NET, props, &in_list); + if (s.rc != CMPI_RC_OK) { + msg = "Failed to enumerate network instances"; + goto out; + } + + msg = filter_by_address(&in_list, mac); + +out: + inst_list_free(&in_list); + return msg; +} + + static const char *net_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev, const char *ns) @@ -550,6 +613,11 @@ } } + msg = check_duplicate_mac(inst, val, ns); + if (msg != NULL) { + goto out; + } + free(dev->dev.net.mac); dev->dev.net.mac = strdup(val);

1 0

Release of libcmpiutil 0.5
by Kaitlin Rupert 15 Jul '09

15 Jul '09

A new release of libvirt-cim is now available at: ftp://libvirt.org/libvirt-cim/ * Features: - Add support to parse arrays of strings - Additional commenting - Indication_tester.py enhancements *ability to specify a port *ability to specify name of indication filter - Report disabled indications * Bug fixes: - Workaround for sfcb, which doesn't provide actual names of registered classes, just provides subclass names - Add link to libxml2 - MOF parser will ignore NULL properties - Fix handling of invalid class in mof parser -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

1 0

Release of libvirt-cim 0.5.6
by Kaitlin Rupert 14 Jul '09

14 Jul '09

A new release of libvirt-cim is now available at: ftp://libvirt.org/libvirt-cim/ * Features: - Support for specifying NIC model type for virtual NICs - Allow user to specify UUID to use when guest is created - Schema update from 2.16 to 2.21 - Additional storage pool support: *fs *netfs *disk *iscsi *logical *scsi - Support for a list of boot devices instead of just one device - Support for specifying the BusType of a virtual disk - Support for generating KVM migration job indications - Users can now specify bridge type interfaces - Support for specifying VNC passwords * Bug fixes: - Allow users to specify ForwardDevice attribute for network pools - Generate <boot> tag properly for XenFV guests - Set the InitPath for LXC guests - Return ResultingSnapshot parameter from CreateSnapshot() - Expose OperationalStatus attribute of VirtualSystemManagementService - Set the PreviousInstance of a ComputerSystemModifiedInstance indication properly - Verified a UUID specified is not in use by an existing guest (when attempting to define a new guest) - Check to see if PoolID in NetRASD has valid format -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

1 0

[PATCH] [TEST] Fix rasd_init_list() - XenFV guests with newer vesions of libvirt
by Kaitlin Rupert 14 Jul '09

14 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247531298 25200 # Node ID 5443392e87298a0d1a94eee50485e20fb815a5be # Parent c72a55c4533250a84ae5bcd25cab08a083f2e8d5 [TEST] Fix rasd_init_list() - XenFV guests with newer vesions of libvirt... Use ps2 input devices, not usb. Set ps2 as the default, otherwise, the guest could end up with both ps2 and usb devices, which breaks some of the tests. This is because the test is only expecting one input device, but libvirt adds an additional ps2 device (in the case usb is specified). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c72a55c45332 -r 5443392e8729 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Mon Jul 13 16:12:22 2009 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Mon Jul 13 17:28:18 2009 -0700 @@ -149,7 +149,8 @@ status, rasd_values, in_list = rasd_init_list(vsxml, virt, test_disk, test_dom, - test_mac, test_mem) + test_mac, test_mem, + server) if status != PASS: return status diff -r c72a55c45332 -r 5443392e8729 suites/libvirt-cim/cimtest/RASD/02_enum.py --- a/suites/libvirt-cim/cimtest/RASD/02_enum.py Mon Jul 13 16:12:22 2009 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/02_enum.py Mon Jul 13 17:28:18 2009 -0700 @@ -147,7 +147,7 @@ status, rasd_values_list, in_list = rasd_init_list(vsxml, virt, test_disk, test_dom, test_mac, - test_mem) + test_mem, server) if status != PASS: return status diff -r c72a55c45332 -r 5443392e8729 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Mon Jul 13 16:12:22 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Mon Jul 13 17:28:18 2009 -0700 @@ -165,10 +165,10 @@ status = FAIL return status, vssdc_assoc_info -def verify_rasd_values(rasd_values_info): +def verify_rasd_values(rasd_values_info, server): status, rasd_values_list, in_list = rasd_init_list(vsxml, virt, test_disk, test_dom, test_mac, - test_mem) + test_mem, server) if status != PASS: return status @@ -229,12 +229,12 @@ if status != PASS or len(vssd_values) == 0: return status - status, rasd_values = get_rasd_values_from_vssdc_assoc(vssd_values) + status, rasd_values = get_rasd_values_from_vssdc_assoc(vssd_values) if status != PASS or len(rasd_values) == 0: vsxml.undefine(server) return status - status = verify_rasd_values(rasd_values) + status = verify_rasd_values(rasd_values, server) try: vsxml.undefine(server) except Exception, detail: diff -r c72a55c45332 -r 5443392e8729 suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Mon Jul 13 16:12:22 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Mon Jul 13 17:28:18 2009 -0700 @@ -47,7 +47,7 @@ dccn = 'DisplayController' pdcn = 'PointingDevice' -def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem): +def rasd_init_list(vsxml, virt, t_disk, t_dom, t_mac, t_mem, server): """ Creating the lists that will be used for comparisons. """ @@ -72,7 +72,9 @@ if virt == 'LXC': disk_path = '/tmp/lxc_files' - if virt == 'LXC' or virt == 'XenFV': + libvirt_version = virsh_version(server, virt) + + if virt == 'LXC' or (virt == 'XenFV' and libvirt_version < "0.6.3"): point_device = "%s/%s" %(t_dom, "mouse:usb") elif virt == 'Xen': point_device = "%s/%s" %(t_dom, "mouse:xen") diff -r c72a55c45332 -r 5443392e8729 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Jul 13 16:12:22 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Jul 13 17:28:18 2009 -0700 @@ -916,7 +916,7 @@ net_name=const.default_network_name, emu_type=None, grstype="vnc", address="127.0.0.1", port_num='-1', keymap="en-us", - irstype="mouse", btype="usb"): + irstype="mouse", btype="ps2"): if not os.path.exists(disk_file_path): logger.error('Error: Disk image does not exist') sys.exit(1)

2 1

[PATCH] [TEST] Fix VSSS to work with older versions of libvirt-cim
by Kaitlin Rupert 14 Jul '09

14 Jul '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1247507590 25200 # Node ID 46932b337bb4387cb8366cb9529d73e212e11c1d # Parent de91439de07c3cc8e3ca5a5e398f3fad35d0a664 [TEST] Fix VSSS to work with older versions of libvirt-cim... To work with versions that don't return a ResultingSnapshot result from CreateSnapshot(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r de91439de07c -r 46932b337bb4 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/03_create_snapshot.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/03_create_snapshot.py Mon Jul 13 10:45:38 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/03_create_snapshot.py Mon Jul 13 10:53:10 2009 -0700 @@ -28,7 +28,7 @@ from pywbem import cim_types from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from XenKvmLib.const import do_main +from XenKvmLib.const import do_main, get_provider_version from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.enumclass import EnumNames, EnumInstances, GetInstance @@ -41,6 +41,8 @@ SNAPSHOT = cim_types.Uint16(32769) test_dom = "snapshot_vm" +libvirt_cim_res_snap_rev = 876 + def get_cs_ref(virt, ip): cs_cn = get_typed_class(virt, "ComputerSystem") @@ -130,7 +132,9 @@ if output[1]['Job'] is None: raise Exception("CreateSnapshot failed to return a CIM job inst") - if output[1]['ResultingSnapshot'] is None: + rev, changeset = get_provider_version(options.virt, options.ip) + if rev >= libvirt_cim_res_snap_rev and \ + output[1]['ResultingSnapshot'] is None: raise Exception("CreateSnapshot failed to return ResultingSnapshot") except Exception, detail:

2 1