November 2008 - CIM - libvirt List Archives

[PATCH][TEST] Fixed a misused character
by Toshifumi Fujimura 06 Nov '08

06 Nov '08

[PATCH][TEST] Fixed a misused character I found a misused character. Signed-off-by: Toshifumi Fujimura <fujimura.toshifumi(a)np.css.fujitsu.com> diff -r 29c875cab8b8 doc/architecture.html.in --- a/doc/architecture.html.in Tue Nov 04 13:10:46 2008 -0800 +++ b/doc/architecture.html.in Wed Nov 05 18:42:43 2008 +0900 @@ -15,7 +15,7 @@ </ul> <p> The provider classes implement the actual CIM class model. Some of - the provider libraries implement one CIM class and one providier. + the provider libraries implement one CIM class and one provider. However, many of them perform more than one task. For example, the <tt>Virt_Device</tt> and <tt>Virt_DevicePool</tt> providers implement the device and device pool classes for each of the major -- Toshifumi Fujimura.

3 2

[PATCH] Avoid clobbering disk flags on redefine
by Dan Smith 06 Nov '08

06 Nov '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1225992264 28800 # Node ID 9385e61cd401162bef9c44bc11f64ca349a41abf # Parent 20af5ae5b01c308d2cfab62899b2dbcb8d186567 Avoid clobbering disk flags on redefine This patch makes sure we track the shareable and readonly flags that can be present in a disk device. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 20af5ae5b01c -r 9385e61cd401 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/device_parsing.c Thu Nov 06 09:24:24 2008 -0800 @@ -24,6 +24,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <inttypes.h> #include <sys/stat.h> #include <libxml/tree.h> @@ -235,6 +236,10 @@ ddev->virtual_dev = get_attr_value(child, "dev"); if (ddev->virtual_dev == NULL) goto err; + } else if (XSTREQ(child->name, "readonly")) { + ddev->readonly = true; + } else if (XSTREQ(child->name, "shareable")) { + ddev->shareable = true; } } if ((ddev->source == NULL) || (ddev->virtual_dev == NULL)) @@ -619,6 +624,8 @@ DUP_FIELD(dev, _dev, dev.disk.driver); DUP_FIELD(dev, _dev, dev.disk.source); DUP_FIELD(dev, _dev, dev.disk.virtual_dev); + dev->dev.disk.readonly = dev->dev.disk.readonly; + dev->dev.disk.shareable = dev->dev.disk.shareable; } else if (dev->type == CIM_RES_TYPE_MEM) { dev->dev.mem.size = _dev->dev.mem.size; dev->dev.mem.maxsize = _dev->dev.mem.maxsize; diff -r 20af5ae5b01c -r 9385e61cd401 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/device_parsing.h Thu Nov 06 09:24:24 2008 -0800 @@ -25,6 +25,7 @@ #define __DEVICE_PARSING_H #include <stdint.h> +#include <stdbool.h> #include <libvirt/libvirt.h> #include "../src/svpc_types.h" @@ -36,6 +37,8 @@ char *source; char *virtual_dev; enum {DISK_UNKNOWN, DISK_PHY, DISK_FILE, DISK_FS} disk_type; + bool readonly; + bool shareable; }; struct net_device { diff -r 20af5ae5b01c -r 9385e61cd401 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/xmlgen.c Thu Nov 06 09:24:24 2008 -0800 @@ -113,7 +113,7 @@ return 1; } -static char *disk_block_xml(const char *path, const char *vdev) +static char *disk_block_xml(struct disk_device *dev) { char *xml; int ret; @@ -122,16 +122,20 @@ "<disk type='block' device='disk'>\n" " <source dev='%s'/>\n" " <target dev='%s'/>\n" + "%s" + "%s" "</disk>\n", - path, - vdev); + dev->source, + dev->virtual_dev, + dev->readonly ? "<readonly/>\n" : "", + dev->shareable ? "<shareable/>\n" : ""); if (ret == -1) xml = NULL; return xml; } -static char *disk_file_xml(const char *path, const char *vdev) +static char *disk_file_xml(struct disk_device *dev) { char *xml; int ret; @@ -140,16 +144,20 @@ "<disk type='file' device='disk'>\n" " <source file='%s'/>\n" " <target dev='%s'/>\n" + "%s" + "%s" "</disk>\n", - path, - vdev); + dev->source, + dev->virtual_dev, + dev->readonly ? "<readonly/>" : "", + dev->shareable ? "<shareable/>" : ""); if (ret == -1) xml = NULL; return xml; } -static char *disk_fs_xml(const char *path, const char *vdev) +static char *disk_fs_xml(struct disk_device *dev) { char *xml; int ret; @@ -159,8 +167,8 @@ " <source dir='%s'/>\n" " <target dir='%s'/>\n" "</filesystem>\n", - path, - vdev); + dev->source, + dev->virtual_dev); if (ret == -1) xml = NULL; @@ -173,13 +181,13 @@ struct disk_device *disk = &dev->dev.disk; if (disk->disk_type == DISK_PHY) - _xml = disk_block_xml(disk->source, disk->virtual_dev); + _xml = disk_block_xml(disk); else if (disk->disk_type == DISK_FILE) /* If it's not a block device, we assume a file, which should be a reasonable fail-safe */ - _xml = disk_file_xml(disk->source, disk->virtual_dev); + _xml = disk_file_xml(disk); else if (disk->disk_type == DISK_FS) - _xml = disk_fs_xml(disk->source, disk->virtual_dev); + _xml = disk_fs_xml(disk); else return false;

3 2

[PATCH] [TEST] Updating 02_enum_crscap.py tc of RedirectionService to work with libvirt-cim provider with no CRS CAP support
by Deepti B. Kalakeri 06 Nov '08

06 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225804761 28800 # Node ID 82afd0f6f9b91ef42c6fd1602d9929faecb94c9e # Parent a63c661d0e709149d874d7632ac16f721aea60e6 [TEST] Updating 02_enum_crscap.py tc of RedirectionService to work with libvirt-cim provider with no CRS CAP support. Updating 02_enum_crscap.py tc of RedirectionService to skip the tc if CRS CAP provider is not present in the libvirt_cim provider when the libvirt_cim_revision < 691. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r a63c661d0e70 -r 82afd0f6f9b9 suites/libvirt-cim/cimtest/RedirectionService/02_enum_crscap.py --- a/suites/libvirt-cim/cimtest/RedirectionService/02_enum_crscap.py Tue Nov 04 04:48:25 2008 -0800 +++ b/suites/libvirt-cim/cimtest/RedirectionService/02_enum_crscap.py Tue Nov 04 05:19:21 2008 -0800 @@ -31,15 +31,29 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.const import get_provider_version SHAREMODESUPP = 3 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +libvirtcim_crscap_changes = 691 + @do_main(sup_types) def main(): virt = main.options.virt server = main.options.ip + + # This check is required for libivirt-cim providers which do not have + # CRSCAP changes in it and the CRSCAP provider is available with + # revision >= 691. + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirtcim_crscap_changes: + logger.info("ConsoleRedirectionServiceCapabilities provider not" + " supported, hence skipping the tc ....") + return SKIP + + cname = 'ConsoleRedirectionServiceCapabilities' cap_name = 'ConsoleRedirectionCapabilities' classname = get_typed_class(virt, cname)

3 3

[PATCH] Store and preserve keymap attribute for graphics device
by Dan Smith 06 Nov '08

06 Nov '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1225900807 28800 # Node ID 20af5ae5b01c308d2cfab62899b2dbcb8d186567 # Parent 29c875cab8b808655c04d2f971c0d6c9a9f03dbd Store and preserve keymap attribute for graphics device This prevents us from discarding the keymap setting when we redefine a domain. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 29c875cab8b8 -r 20af5ae5b01c libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Tue Nov 04 13:10:46 2008 -0800 +++ b/libxkutil/device_parsing.c Wed Nov 05 08:00:07 2008 -0800 @@ -76,6 +76,7 @@ free(dev->type); free(dev->port); free(dev->host); + free(dev->keymap); } void cleanup_virt_device(struct virt_device *dev) @@ -440,6 +441,7 @@ gdev->type = get_attr_value(node, "type"); gdev->port = get_attr_value(node, "port"); gdev->host = get_attr_value(node, "listen"); + gdev->keymap = get_attr_value(node, "keymap"); if ((gdev->type == NULL) || (gdev->port == NULL)) goto err; @@ -628,6 +630,7 @@ DUP_FIELD(dev, _dev, dev.graphics.type); DUP_FIELD(dev, _dev, dev.graphics.port); DUP_FIELD(dev, _dev, dev.graphics.host); + DUP_FIELD(dev, _dev, dev.graphics.keymap); } return dev; diff -r 29c875cab8b8 -r 20af5ae5b01c libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Tue Nov 04 13:10:46 2008 -0800 +++ b/libxkutil/device_parsing.h Wed Nov 05 08:00:07 2008 -0800 @@ -63,6 +63,7 @@ char *type; char *port; char *host; + char *keymap; }; struct virt_device { diff -r 29c875cab8b8 -r 20af5ae5b01c libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Nov 04 13:10:46 2008 -0800 +++ b/libxkutil/xmlgen.c Wed Nov 05 08:00:07 2008 -0800 @@ -342,9 +342,12 @@ struct graphics_device *graphics = &dev->dev.graphics; ret = asprintf(&_xml, - "<graphics type='%s' port='%s'/>\n", + "<graphics type='%s' port='%s' " + "listen='%s' keymap='%s'/>\n", graphics->type, - graphics->port); + graphics->port, + graphics->host != NULL ? graphics->host : "127.0.0.1", + graphics->keymap != NULL ? graphics->keymap : "en-us"); if (ret == -1) return false; else

2 4

[PATCH] Avoid clobbering disk flags on redefine
by Dan Smith 06 Nov '08

06 Nov '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1225901751 28800 # Node ID ece7c71cd2aab612dec19cc6247194cdf8b5b049 # Parent 20af5ae5b01c308d2cfab62899b2dbcb8d186567 Avoid clobbering disk flags on redefine This patch makes sure we track the shareable and readonly flags that can be present in a disk device. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 20af5ae5b01c -r ece7c71cd2aa libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/device_parsing.c Wed Nov 05 08:15:51 2008 -0800 @@ -24,6 +24,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdbool.h> #include <inttypes.h> #include <sys/stat.h> #include <libxml/tree.h> @@ -235,6 +236,10 @@ ddev->virtual_dev = get_attr_value(child, "dev"); if (ddev->virtual_dev == NULL) goto err; + } else if (XSTREQ(child->name, "readonly")) { + ddev->readonly = true; + } else if (XSTREQ(child->name, "shareable")) { + ddev->shareable = true; } } if ((ddev->source == NULL) || (ddev->virtual_dev == NULL)) @@ -619,6 +624,8 @@ DUP_FIELD(dev, _dev, dev.disk.driver); DUP_FIELD(dev, _dev, dev.disk.source); DUP_FIELD(dev, _dev, dev.disk.virtual_dev); + dev->dev.disk.readonly = dev->dev.disk.readonly; + dev->dev.disk.shareable = dev->dev.disk.shareable; } else if (dev->type == CIM_RES_TYPE_MEM) { dev->dev.mem.size = _dev->dev.mem.size; dev->dev.mem.maxsize = _dev->dev.mem.maxsize; diff -r 20af5ae5b01c -r ece7c71cd2aa libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/device_parsing.h Wed Nov 05 08:15:51 2008 -0800 @@ -25,6 +25,7 @@ #define __DEVICE_PARSING_H #include <stdint.h> +#include <stdbool.h> #include <libvirt/libvirt.h> #include "../src/svpc_types.h" @@ -36,6 +37,8 @@ char *source; char *virtual_dev; enum {DISK_UNKNOWN, DISK_PHY, DISK_FILE, DISK_FS} disk_type; + bool readonly; + bool shareable; }; struct net_device { diff -r 20af5ae5b01c -r ece7c71cd2aa libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Nov 05 08:00:07 2008 -0800 +++ b/libxkutil/xmlgen.c Wed Nov 05 08:15:51 2008 -0800 @@ -113,7 +113,7 @@ return 1; } -static char *disk_block_xml(const char *path, const char *vdev) +static char *disk_block_xml(struct disk_device *dev) { char *xml; int ret; @@ -122,16 +122,20 @@ "<disk type='block' device='disk'>\n" " <source dev='%s'/>\n" " <target dev='%s'/>\n" + "%s" + "%s" "</disk>\n", - path, - vdev); + dev->source, + dev->virtual_dev, + dev->readonly ? "<readonly/>\n" : "", + dev->shareable ? "<shareable/>\n" : ""); if (ret == -1) xml = NULL; return xml; } -static char *disk_file_xml(const char *path, const char *vdev) +static char *disk_file_xml(struct disk_device *dev) { char *xml; int ret; @@ -140,16 +144,20 @@ "<disk type='file' device='disk'>\n" " <source file='%s'/>\n" " <target dev='%s'/>\n" + "%s" + "%s" "</disk>\n", - path, - vdev); + dev->source, + dev->virtual_dev, + dev->readonly ? "<readonly/>" : "", + dev->shareable ? "shareable/>" : ""); if (ret == -1) xml = NULL; return xml; } -static char *disk_fs_xml(const char *path, const char *vdev) +static char *disk_fs_xml(struct disk_device *dev) { char *xml; int ret; @@ -159,8 +167,8 @@ " <source dir='%s'/>\n" " <target dir='%s'/>\n" "</filesystem>\n", - path, - vdev); + dev->source, + dev->virtual_dev); if (ret == -1) xml = NULL; @@ -173,13 +181,13 @@ struct disk_device *disk = &dev->dev.disk; if (disk->disk_type == DISK_PHY) - _xml = disk_block_xml(disk->source, disk->virtual_dev); + _xml = disk_block_xml(disk); else if (disk->disk_type == DISK_FILE) /* If it's not a block device, we assume a file, which should be a reasonable fail-safe */ - _xml = disk_file_xml(disk->source, disk->virtual_dev); + _xml = disk_file_xml(disk); else if (disk->disk_type == DISK_FS) - _xml = disk_fs_xml(disk->source, disk->virtual_dev); + _xml = disk_fs_xml(disk); else return false;

3 7

[PATCH] Don't drop disk type on redefine
by Dan Smith 06 Nov '08

06 Nov '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1225902171 28800 # Node ID 1d696e80fccc41c9b21b5f24b84deab82d1416cc # Parent ece7c71cd2aab612dec19cc6247194cdf8b5b049 Don't drop disk type on redefine Right now, we track the status of disk/cdrom of a disk device, but don't use it in the XML define. This patch uses the value instead of a static device='disk'. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ece7c71cd2aa -r 1d696e80fccc libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed Nov 05 08:15:51 2008 -0800 +++ b/libxkutil/xmlgen.c Wed Nov 05 08:22:51 2008 -0800 @@ -119,12 +119,13 @@ int ret; ret = asprintf(&xml, - "<disk type='block' device='disk'>\n" + "<disk type='block' device='%s'>\n" " <source dev='%s'/>\n" " <target dev='%s'/>\n" "%s" "%s" "</disk>\n", + dev->device, dev->source, dev->virtual_dev, dev->readonly ? "<readonly/>\n" : "", @@ -141,12 +142,13 @@ int ret; ret = asprintf(&xml, - "<disk type='file' device='disk'>\n" + "<disk type='file' device='%s'>\n" " <source file='%s'/>\n" " <target dev='%s'/>\n" "%s" "%s" "</disk>\n", + dev->device, dev->source, dev->virtual_dev, dev->readonly ? "<readonly/>" : "",

2 2

[PATCH] [TEST] Fix VSMS 14_define_sys_disk.py to specify FV or PV disk for Xen guests
by Kaitlin Rupert 06 Nov '08

06 Nov '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1225932047 28800 # Node ID 78c534011b848cade45897c0c35dac4ebc53fce1 # Parent ddd395416461b33536e9475521548ba8e2c16d84 [TEST] Fix VSMS 14_define_sys_disk.py to specify FV or PV disk for Xen guests. Without this fix, both FV and PV rasds are passed to the DefineSystem() call which isn't valid on PV systems. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ddd395416461 -r 78c534011b84 suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Tue Nov 04 22:19:33 2008 -0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/14_define_sys_disk.py Wed Nov 05 16:40:47 2008 -0800 @@ -48,18 +48,22 @@ return path -def get_vssd_rasd(ip, virt, addr): +def get_vssd_rasd(ip, virt, addr, disk_type): vssd = get_vssd_mof(virt, test_dom) rasds = get_default_rasds(ip, virt) - for i in range(len(rasds)): - if 'DiskPool' in rasds[i]['PoolID']: - rasds[i]['Address'] = addr - rasds[i] = inst_to_mof(rasds[i]) + rasd_list = [] + + for rasd in rasds: + if 'DiskPool' in rasd['PoolID']: + if disk_type != "" and rasd['Caption'] != disk_type: + continue + rasd['Address'] = addr + rasd_list.append(inst_to_mof(rasd)) params = { 'vssd' : vssd, - 'rasd' : rasds + 'rasd' : rasd_list } return params @@ -68,12 +72,19 @@ def main(): options = main.options + if options.virt == "Xen": + disk_cap = "PV disk" + elif options.virt == "XenFV": + disk_cap = "FV disk" + else: + disk_cap = "" + try: addr = make_long_disk_path(options.ip) if addr is None: raise Exception("Unable to create large disk image") - define_params = get_vssd_rasd(options.ip, options.virt, addr) + define_params = get_vssd_rasd(options.ip, options.virt, addr, disk_cap) if len(define_params) != 2: raise Exception("Unable to get VSSD and RASDs for %s" % test_dom)

2 1

[PATCH] [TEST]#2 Move some functions from live.py and utils.py to xm_virt_util.py
by yunguol＠cn.ibm.com 06 Nov '08

06 Nov '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1225951428 28800 # Node ID a56da9383d25d808284820338091e2d1cc2fdf0c # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST]#2 Move some functions from live.py and utils.py to xm_virt_util.py Also remove CONSOLE_APP_PATH to lib/XenKvmLib/xm_virt_util.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 319e2e9509d3 -r a56da9383d25 lib/VirtLib/live.py --- a/lib/VirtLib/live.py Tue Nov 04 05:22:21 2008 -0800 +++ b/lib/VirtLib/live.py Wed Nov 05 22:03:48 2008 -0800 @@ -25,59 +25,6 @@ import os import utils import socket - -def processors_count(ip, vs_name): - """Returns the number of processors of the specified VS - """ - - guest_cmd = "grep '^$' /proc/cpuinfo | wc -l" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return -1 - - try: - cpus = int(out) - return cpus - except ValueError: - return -1 - -def memory_count(ip, vs_name): - """Returns the memory size (in Bytes) of the specified VS. - """ - - guest_cmd = "grep MemTotal /proc/meminfo" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return -1 - - try: - mem = int( out.split()[1] ) - return mem * 1024 - except (IndexError, ValueError): - return -1 - -def network_macs(ip, vs_name): - """Returns a list of MAC address of the specified VS. - """ - - guest_cmd = "ifconfig -a | grep eth" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return [] - - ret = [] - lines = out.splitlines() - for l in lines: - try: - mac = l.split()[-1] - ret.append( mac ) - except IndexError: - pass - - return ret def available_bridges(ip): """Return a list of the available bridges in the running dom0. diff -r 319e2e9509d3 -r a56da9383d25 lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Tue Nov 04 05:22:21 2008 -0800 +++ b/lib/VirtLib/utils.py Wed Nov 05 22:03:48 2008 -0800 @@ -23,8 +23,6 @@ import os import commands - -CONSOLE_APP_PATH = "/tmp/Console.py" # ssh utils @@ -103,11 +101,3 @@ cmd = 'ssh-keygen -y -f %s' % SSH_KEY pubkey = commands.getoutput(cmd) write_pubkey(pubkey) - -def run_remote_guest(ip, domain, command): - """ Execute commands on remote guest console. - """ - - cmd = 'python %s %s "%s"' % (CONSOLE_APP_PATH, domain, command) - - return run_remote(ip, cmd) diff -r 319e2e9509d3 -r a56da9383d25 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Nov 05 22:03:48 2008 -0800 @@ -26,6 +26,7 @@ from VirtLib import utils import socket +CONSOLE_APP_PATH = "/tmp/Console.py" def xm_domname(ip, domid): cmd = "xm domname %s" % domid @@ -287,3 +288,65 @@ if virt == "LXC": return "lxc:///system" return "" + +def run_remote_guest(ip, domain, command): + """ Execute commands on remote guest console. + """ + + cmd = 'python %s %s "%s"' % (CONSOLE_APP_PATH, domain, command) + + return run_remote(ip, cmd) + +def processors_count(ip, vs_name): + """Returns the number of processors of the specified VS + """ + + guest_cmd = "grep '^$' /proc/cpuinfo | wc -l" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return -1 + + try: + cpus = int(out) + return cpus + except ValueError: + return -1 + +def memory_count(ip, vs_name): + """Returns the memory size (in Bytes) of the specified VS. + """ + + guest_cmd = "grep MemTotal /proc/meminfo" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return -1 + + try: + mem = int( out.split()[1] ) + return mem * 1024 + except (IndexError, ValueError): + return -1 + +def network_macs(ip, vs_name): + """Returns a list of MAC address of the specified VS. + """ + + guest_cmd = "ifconfig -a | grep eth" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return [] + + ret = [] + lines = out.splitlines() + for l in lines: + try: + mac = l.split()[-1] + ret.append( mac ) + except IndexError: + pass + + return ret +

1 0

[PATCH] [TEST] Move some functions from utils.py to xm_virt_util.py
by yunguol＠cn.ibm.com 06 Nov '08

06 Nov '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1225701642 28800 # Node ID 636e060429738891aae9d1c5ca43e12d1508773c # Parent d1614c101c281b57bd2bc98dfb6625f790748e54 [TEST] Move some functions from utils.py to xm_virt_util.py I will do below on the next: 1) Update common_util.py 2) Delete these functions in utils.py 3) Update all related tc Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r d1614c101c28 -r 636e06042973 suites/libvirt-cim/lib/XenKvmLib/test_doms.py --- a/suites/libvirt-cim/lib/XenKvmLib/test_doms.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/test_doms.py Mon Nov 03 00:40:42 2008 -0800 @@ -24,7 +24,7 @@ import tempfile import os from VirtLib import utils -from XenKvmLib.xm_virt_util import domain_list +from XenKvmLib.xm_virt_util import domain_list, virt2uri from CimTest.Globals import CIM_FUUID try: @@ -47,19 +47,19 @@ f.write(xml) f.close() - cmd = "virsh -c %s define %s" % (utils.virt2uri(virt), name) + cmd = "virsh -c %s define %s" % (virt2uri(virt), name) s, o = utils.run_remote(server, cmd) return s == 0 def undefine_test_domain(name, server, virt="Xen"): - cmd = "virsh -c %s undefine %s" % (utils.virt2uri(virt), name) + cmd = "virsh -c %s undefine %s" % (virt2uri(virt), name) s, o = utils.run_remote(server, cmd) return s == 0 def start_test_domain(name, server, virt="Xen"): - cmd = "virsh -c %s start %s" % (utils.virt2uri(virt), name) + cmd = "virsh -c %s start %s" % (virt2uri(virt), name) s, o = utils.run_remote(server, cmd) return s == 0 @@ -68,7 +68,7 @@ """Get a list of domid from virsh""" cmd = "virsh -c %s list 2>/dev/null | sed '1,2 d; /^$/d'" % \ - utils.virt2uri(virt) + virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: return None @@ -109,7 +109,7 @@ def viruuid(name, server, virt="Xen"): """Return domain uuid given domid or domname""" cmd = "virsh -c %s domuuid %s 2>/dev/null | sed '/^$/d'" % \ - (utils.virt2uri(virt), name) + (virt2uri(virt), name) ret, out = utils.run_remote(server, cmd) if ret == 0: return out.strip(" \n") @@ -120,7 +120,7 @@ """Destroy and undefine a domain. name could be domid or domname""" cmd = "virsh -c %s 'destroy %s ; undefine %s'" % \ - (utils.virt2uri(virt), name, name) + (virt2uri(virt), name, name) utils.run_remote(server, cmd) def destroy_and_undefine_all(server, virt="Xen", aggressive = False): @@ -154,7 +154,7 @@ else: name = xmlfile_domname - vcmd = "virsh -c %s %s %s" % (utils.virt2uri(virt), cmd, name) + vcmd = "virsh -c %s %s %s" % (virt2uri(virt), cmd, name) s, o = utils.run_remote(server, vcmd) if cmd == "define" or cmd == "create": f.close() @@ -165,7 +165,7 @@ Get the vcpu lists. The input is either the domid or domname. """ cmd = "virsh -c %s vcpuinfo %s | grep '^$' | wc -l" % \ - (utils.virt2uri(virt), name_id) + (virt2uri(virt), name_id) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -180,7 +180,7 @@ nf.write(net_xml) nf.flush() fname = nf.name - cmd = "virsh -c %s net-create %s" % (utils.virt2uri(virt), fname) + cmd = "virsh -c %s net-create %s" % (virt2uri(virt), fname) ret, out = utils.run_remote(server, cmd) nf.close() if ret != 0: diff -r d1614c101c28 -r 636e06042973 suites/libvirt-cim/lib/XenKvmLib/test_xml.py --- a/suites/libvirt-cim/lib/XenKvmLib/test_xml.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/test_xml.py Mon Nov 03 00:40:42 2008 -0800 @@ -35,7 +35,7 @@ from XenKvmLib.test_doms import set_uuid, create_vnet from VirtLib.live import available_bridges from XenKvmLib.xm_virt_util import net_list, get_bridge_from_network_xml, \ - bootloader + bootloader, virt2uri from CimTest.ReturnCodes import SKIP image_dir = "/tmp" @@ -201,7 +201,7 @@ def dumpxml(name, server, virt="Xen"): - cmd = "virsh -c %s dumpxml %s" % (utils.virt2uri(virt), name) + cmd = "virsh -c %s dumpxml %s" % (virt2uri(virt), name) s, o = utils.run_remote(server, cmd) if s == 0: return o diff -r d1614c101c28 -r 636e06042973 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Mon Nov 03 00:40:42 2008 -0800 @@ -63,7 +63,7 @@ """ guest_cmd = "cat /proc/partitions | awk '/^ /{ print $4 } ' " - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) + rc, out = run_remote_guest(ip, vs_name, guest_cmd) if rc != 0: return None @@ -89,7 +89,7 @@ virt = "Xen" cmd = "virsh -c %s list --all | sed -e '1,2 d' -e '$ d'" % \ - utils.virt2uri(virt) + virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -109,7 +109,7 @@ virt = "Xen" cmd = "virsh -c %s list | sed -e '1,2 d' -e '$ d'" % \ - utils.virt2uri(virt) + virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -156,7 +156,7 @@ """Function to list active network""" names = [] cmd = "virsh -c %s net-list | sed -e '1,2 d' -e '$ d'" % \ - utils.virt2uri(virt) + virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -173,7 +173,7 @@ """Function returns bridge name for a given virtual network""" cmd = "virsh -c %s net-dumpxml %s | awk '/bridge name/ { print $2 }'" % \ - (utils.virt2uri(virt), network) + (virt2uri(virt), network) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -196,7 +196,7 @@ return None def virsh_version(server, virt="KVM"): - cmd = "virsh -c %s -v " % utils.virt2uri(virt) + cmd = "virsh -c %s -v " % virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: return None @@ -206,7 +206,7 @@ """Function to list active DiskPool list""" names = [] cmd = "virsh -c %s pool-list | sed -e '1,2 d' -e '$ d'" % \ - utils.virt2uri(virt) + virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret != 0: @@ -221,7 +221,7 @@ return names def virsh_vcpuinfo(server, dom, virt="Xen"): - cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (utils.virt2uri(virt), + cmd = "virsh -c %s vcpuinfo %s | grep VCPU | wc -l" % (virt2uri(virt), dom) ret, out = utils.run_remote(server, cmd) if out.isdigit(): @@ -229,10 +229,70 @@ return None def get_hv_ver(server, virt="Xen"): - cmd = "virsh -c %s version | grep ^Running | cut -d ' ' -f 3,4" % utils.virt2uri(virt) + cmd = "virsh -c %s version | grep ^Running | cut -d ' ' -f 3,4" %virt2uri(virt) ret, out = utils.run_remote(server, cmd) if ret == 0: return out else: return None +def run_remote_guest(ip, domain, command): + """ Execute commands on remote guest console. + """ + + cmd = 'python %s %s "%s"' % (CONSOLE_APP_PATH, domain, command) + + return run_remote(ip, cmd) + + +def get_xmtest_files(ip, kernel): + # get the xm-test disk from morbo + rc, out = run_remote(ip, + "rm -rf /tmp/boot ; mkdir -p /tmp/boot /tmp/xmtest") + rc, out = run_remote(ip, + "cd /tmp/boot ; wget http://morbo.linux.ibm.com/pub/xmtest.disk.gz") + if rc != 0: + return 2, "fetching xmtest.disk failed:\n%s" % out + + # mount on /tmp/xmtest + rc, out = run_remote(ip, + "gzip -d /tmp/boot/xmtest.disk.gz ; mount -o loop /tmp/boot/xmtest.disk /tmp/xmtest") + if rc != 0: + run_remote(ip, "umount /tmp/xmtest") + return 2, "mounting xmtest.disk failed:\n%s" % out + + # We need "uname -r" to name the kernel correctly + rc, uname = run_remote(ip, "uname -r") + if rc != 0: + run_remote(ip, "umount /tmp/xmtest") + return 2, "uname failed:\n%s" % out + + # get the kernel binary, put in /tmp/boot + rc, out = run_remote(ip, + "wget %s -O /tmp/boot/vmlinuz-\`uname -r\`" % kernel) + if rc != 0: + run_remote(ip, "umount /tmp/xmtest") + return 2, "fetching kernel failed:\n%s" % out + + return 0, "" + +def customize_xmtest_ramdisk(ip): + # customize modules on xm-test ramdisk + # cd $xmtestdir/ramdisk ; bin/add_modules_to_initrd ; cd + rc, out = run_remote(ip, + "cd /tmp/xmtest/ramdisk ; bin/add_modules_to_initrd") + if rc != 0: + run_remote(ip, "umount /tmp/xmtest") + return 2, "customizing ramdisk failed:\n%s" % out + + return 0, "" + +def virt2uri(virt): + # convert cimtest --virt param string to libvirt uri + if virt == "Xen" or virt == "XenFV": + return "xen:///" + if virt == "KVM": + return "qemu:///system" + if virt == "LXC": + return "lxc:///system" + return "" diff -r d1614c101c28 -r 636e06042973 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Nov 03 00:40:42 2008 -0800 @@ -36,6 +36,7 @@ default_pool_name from XenKvmLib.reporting import gen_report, send_report from VirtLib import utils +from XenKvmLib.xm_virt_util import virt2uri from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import create_netpool_conf, destroy_netpool, \ create_diskpool_conf, destroy_diskpool @@ -90,12 +91,12 @@ print "Cleaned log files." def pre_check(ip, virt): - cmd = "virsh -c %s list --all" % utils.virt2uri(virt) + cmd = "virsh -c %s list --all" % virt2uri(virt) ret, out = utils.run_remote(ip, cmd) if ret != 0: return "This libvirt install does not support %s" % virt - cmd = "virsh -c %s version" % utils.virt2uri(virt) + cmd = "virsh -c %s version" % virt2uri(virt) ret, out = utils.run_remote(ip, cmd) if ret != 0: return "Encountered an error querying libvirt with: %s" % cmd

3 9

[PATCH] Fix potiential seg fault in SDC
by Kaitlin Rupert 06 Nov '08

06 Nov '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1225926589 28800 # Node ID 16aa18cf5325f5e689c4967d35288d15825fc2be # Parent ece7c71cd2aab612dec19cc6247194cdf8b5b049 Fix potiential seg fault in SDC. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ece7c71cd2aa -r 16aa18cf5325 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Wed Nov 05 08:15:51 2008 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Wed Nov 05 15:09:49 2008 -0800 @@ -270,6 +270,14 @@ base, NAMESPACE(ref)); + if (inst == NULL) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Unable to create instance of type %s", + base); + goto out; + } + CMSetProperty(inst, "ResourceType", &resource_type, CMPI_uint16); out: @@ -310,6 +318,8 @@ } inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_MEM); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); CMSetProperty(inst, "AllocationUnits", @@ -395,6 +405,8 @@ } inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_PROC); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); CMSetProperty(inst, "AllocationUnits", @@ -528,6 +540,8 @@ } inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_NET); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); CMSetProperty(inst, "VirtualQuantity", @@ -606,6 +620,8 @@ } inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_DISK); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); CMSetProperty(inst, "AllocationQuantity", @@ -632,6 +648,7 @@ inst_list_add(list, inst); + out: return s; }

1 0

[PATCH] [TEST] Move some functions from live.py and utils.py to xm_virt_util.py
by yunguol＠cn.ibm.com 05 Nov '08

05 Nov '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1225865149 28800 # Node ID 79b321ebebfda4cde38ecb4fe0ea7bd9e4f51539 # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] Move some functions from live.py and utils.py to xm_virt_util.py The moved functions are: processors_count() memory_count() network_macs() run_remote_guest() Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 319e2e9509d3 -r 79b321ebebfd lib/VirtLib/live.py --- a/lib/VirtLib/live.py Tue Nov 04 05:22:21 2008 -0800 +++ b/lib/VirtLib/live.py Tue Nov 04 22:05:49 2008 -0800 @@ -25,59 +25,6 @@ import os import utils import socket - -def processors_count(ip, vs_name): - """Returns the number of processors of the specified VS - """ - - guest_cmd = "grep '^$' /proc/cpuinfo | wc -l" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return -1 - - try: - cpus = int(out) - return cpus - except ValueError: - return -1 - -def memory_count(ip, vs_name): - """Returns the memory size (in Bytes) of the specified VS. - """ - - guest_cmd = "grep MemTotal /proc/meminfo" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return -1 - - try: - mem = int( out.split()[1] ) - return mem * 1024 - except (IndexError, ValueError): - return -1 - -def network_macs(ip, vs_name): - """Returns a list of MAC address of the specified VS. - """ - - guest_cmd = "ifconfig -a | grep eth" - - rc, out = utils.run_remote_guest(ip, vs_name, guest_cmd) - if rc != 0: - return [] - - ret = [] - lines = out.splitlines() - for l in lines: - try: - mac = l.split()[-1] - ret.append( mac ) - except IndexError: - pass - - return ret def available_bridges(ip): """Return a list of the available bridges in the running dom0. diff -r 319e2e9509d3 -r 79b321ebebfd lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Tue Nov 04 05:22:21 2008 -0800 +++ b/lib/VirtLib/utils.py Tue Nov 04 22:05:49 2008 -0800 @@ -103,11 +103,3 @@ cmd = 'ssh-keygen -y -f %s' % SSH_KEY pubkey = commands.getoutput(cmd) write_pubkey(pubkey) - -def run_remote_guest(ip, domain, command): - """ Execute commands on remote guest console. - """ - - cmd = 'python %s %s "%s"' % (CONSOLE_APP_PATH, domain, command) - - return run_remote(ip, cmd) diff -r 319e2e9509d3 -r 79b321ebebfd suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 22:05:49 2008 -0800 @@ -287,3 +287,65 @@ if virt == "LXC": return "lxc:///system" return "" + +def run_remote_guest(ip, domain, command): + """ Execute commands on remote guest console. + """ + + cmd = 'python %s %s "%s"' % (CONSOLE_APP_PATH, domain, command) + + return run_remote(ip, cmd) + +def processors_count(ip, vs_name): + """Returns the number of processors of the specified VS + """ + + guest_cmd = "grep '^$' /proc/cpuinfo | wc -l" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return -1 + + try: + cpus = int(out) + return cpus + except ValueError: + return -1 + +def memory_count(ip, vs_name): + """Returns the memory size (in Bytes) of the specified VS. + """ + + guest_cmd = "grep MemTotal /proc/meminfo" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return -1 + + try: + mem = int( out.split()[1] ) + return mem * 1024 + except (IndexError, ValueError): + return -1 + +def network_macs(ip, vs_name): + """Returns a list of MAC address of the specified VS. + """ + + guest_cmd = "ifconfig -a | grep eth" + + rc, out = run_remote_guest(ip, vs_name, guest_cmd) + if rc != 0: + return [] + + ret = [] + lines = out.splitlines() + for l in lines: + try: + mac = l.split()[-1] + ret.append( mac ) + except IndexError: + pass + + return ret +

2 1

[PATCH] Add KVMRedirectionSAP header to noinst_HEADERS list
by Kaitlin Rupert 05 Nov '08

05 Nov '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1225833046 28800 # Node ID 29c875cab8b808655c04d2f971c0d6c9a9f03dbd # Parent 1e1954312a8adb776cc62703d3363fe7f82c0069 Add KVMRedirectionSAP header to noinst_HEADERS list. Without this, building an rpm fails. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1e1954312a8a -r 29c875cab8b8 src/Makefile.am --- a/src/Makefile.am Fri Oct 31 13:06:10 2008 -0700 +++ b/src/Makefile.am Tue Nov 04 13:10:46 2008 -0800 @@ -22,7 +22,8 @@ Virt_VirtualSystemSnapshotServiceCapabilities.h \ Virt_VSMigrationSettingData.h \ Virt_ConsoleRedirectionService.h \ - Virt_ConsoleRedirectionServiceCapabilities.h + Virt_ConsoleRedirectionServiceCapabilities.h \ + Virt_KVMRedirectionSAP.h XKUADD = $(top_builddir)/libxkutil/libxkutil.la

3 2

KVM on Pegasus Test Run Summary for Nov 05 2008 [ F9 rpm ]
by Deepti B Kalakeri 05 Nov '08

05 Nov '08

================================================= KVM on Pegasus Test Run Summary for Nov 05 2008 ================================================= Distro: Fedora release 9 (Sulphur) Kernel: 2.6.25.14-108.fc9.x86_64 libvirt: 0.4.4 Hypervisor: QEMU 0.9.1 CIMOM: Pegasus 2.7.0 Libvirt-cim revision: 712 Libvirt-cim changeset: 668097d4b27c Cimtest revision: 475 Cimtest changeset: 319e2e9509d3 ================================================= FAIL : 3 XFAIL : 2 SKIP : 6 PASS : 128 ----------------- Total : 139 ================================================= FAIL Test Summary: SystemDevice - 01_forward.py: FAIL VirtualSystemManagementService - 09_procrasd_persist.py: FAIL VirtualSystemManagementService - 15_mod_system_settings.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 32_start_reboot.py: XFAIL ComputerSystem - 33_suspend_reboot.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP VSSD - 02_bootldr.py: SKIP VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_suspend_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_suspend_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: XFAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed') ERROR - Unable to 'Reboot' dom 'cs_test_domain' using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed') ERROR - Unable to 'Reboot' dom 'test_domain' using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 03_reverse_errs.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 04_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- ElementCapabilities - 02_reverse.py: PASS -------------------------------------------------------------------- ElementCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 05_hostsystem_cap.py: PASS -------------------------------------------------------------------- ElementConforms - 01_forward.py: PASS -------------------------------------------------------------------- ElementConforms - 02_reverse.py: PASS -------------------------------------------------------------------- ElementConforms - 03_ectp_fwd_errs.py: PASS -------------------------------------------------------------------- ElementConforms - 04_ectp_rev_errs.py: PASS -------------------------------------------------------------------- ElementSettingData - 01_forward.py: PASS -------------------------------------------------------------------- ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 01_enum.py: PASS -------------------------------------------------------------------- HostSystem - 02_hostsystem_to_rasd.py: PASS -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: PASS -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedDependency - 01_forward.py: PASS -------------------------------------------------------------------- HostedDependency - 02_reverse.py: PASS -------------------------------------------------------------------- HostedDependency - 03_enabledstate.py: PASS -------------------------------------------------------------------- HostedDependency - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 01_forward.py: PASS -------------------------------------------------------------------- HostedResourcePool - 02_reverse.py: PASS -------------------------------------------------------------------- HostedResourcePool - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedService - 01_forward.py: PASS -------------------------------------------------------------------- HostedService - 02_reverse.py: PASS -------------------------------------------------------------------- HostedService - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedService - 04_reverse_errs.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: PASS -------------------------------------------------------------------- Memory - 01_memory.py: PASS -------------------------------------------------------------------- Memory - 02_defgetmem.py: PASS -------------------------------------------------------------------- Memory - 03_mem_gi_errs.py: PASS -------------------------------------------------------------------- NetworkPort - 01_netport.py: PASS -------------------------------------------------------------------- NetworkPort - 02_np_gi_errors.py: PASS -------------------------------------------------------------------- NetworkPort - 03_user_netport.py: PASS -------------------------------------------------------------------- Processor - 01_processor.py: PASS -------------------------------------------------------------------- Processor - 02_definesys_get_procs.py: PASS -------------------------------------------------------------------- Processor - 03_proc_gi_errs.py: PASS -------------------------------------------------------------------- Profile - 01_enum.py: PASS -------------------------------------------------------------------- Profile - 02_profile_to_elec.py: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: PASS -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: PASS -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: PASS -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS -------------------------------------------------------------------- SystemDevice - 01_forward.py: FAIL ERROR - NameError : name 'KVM_NetworkPort' is not defined Traceback (most recent call last): File "./lib/XenKvmLib/const.py", line 116, in do_try File "01_forward.py", line 92, in main device = devices.device_of(options.ip, key_list) File "./lib/XenKvmLib/devices.py", line 48, in device_of File "<string>", line 1, in <module> NameError: name 'KVM_NetworkPort' is not defined ERROR - None -------------------------------------------------------------------- SystemDevice - 02_reverse.py: PASS -------------------------------------------------------------------- SystemDevice - 03_fwderrs.py: PASS -------------------------------------------------------------------- VSSD - 01_enum.py: PASS -------------------------------------------------------------------- VSSD - 02_bootldr.py: SKIP -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 01_definesystem_name.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 02_destroysystem.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: FAIL ERROR - Exception: details (1, u"CIM_ERR_FAILED: ResourceSettings Error: Missing `VirtualQuantity' field in Processor RASD") InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: Missing `VirtualQuantity' field in Processor RASD -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 14_define_sys_disk.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 15_mod_system_settings.py: FAIL ERROR - rstest_domain not updated properly. ERROR - Exp AutomaticRecoveryAction=3, got 2 -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS -------------------------------------------------------------------- Thanks and Regards, Deepti.

1 1

[PATCH] [TEST] Fixing 09_procrasd_persist.py of VSMS
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225880784 28800 # Node ID b1d7f871c2553a461600ef7f82cc8fd931e11551 # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] Fixing 09_procrasd_persist.py of VSMS. The tc was failing bcs of the changes made to ProcResourceAllocationSettingData of vsms.py Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r b1d7f871c255 suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py Wed Nov 05 02:26:24 2008 -0800 @@ -47,7 +47,7 @@ vssd, rasd = vsms.default_vssd_rasd_str(default_dom, virt=vtype) class_pasd = vsms.get_pasd_class(vtype) - proc_inst = class_pasd(nvcpu, default_dom, weight, limit) + proc_inst = class_pasd(default_dom, nvcpu, weight, limit) proc_mof = proc_inst.mof() for i in range(len(rasd)):

1 0

[PATCH] [TEST] #3 Fixing 01_forward.py tc of SystemDevice
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225873834 28800 # Node ID 0814061c13e22cdfa552a2e7e578fb717195e26c # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] #3 Fixing 01_forward.py tc of SystemDevice. changes form patch2: -------------------- Modified the for loop. The test needs to be updated with cim_define(). Tested on KVM, LXC and Xen with current sources and F9 rpm. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r 0814061c13e2 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Nov 05 00:30:34 2008 -0800 @@ -8,6 +8,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 @@ -25,10 +26,10 @@ # import sys +from sets import Set from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import vxml -from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main @@ -38,72 +39,88 @@ test_dom = "test_domain" test_mac = "00:11:22:33:44:55" -test_cpu = 1 +test_cpu = 3 @do_main(sup_types) def main(): - options= main.options - - if options.virt == 'Xen': + options = main.options + server = options.ip + virt = options.virt + + if virt == 'Xen': test_disk = 'xvdb' else: test_disk = 'hdb' status = PASS - virt_xml = vxml.get_class(options.virt) - if options.virt == 'LXC': - cxml = virt_xml(test_dom) + virt_xml = vxml.get_class(virt) + if virt == 'LXC': + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac) else: - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) - ret = cxml.create(options.ip) + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, + disk = test_disk) + + ret = cxml.create(server) if not ret: logger.error('Unable to create domain %s' % test_dom) return FAIL - sd_classname = get_typed_class(options.virt, 'SystemDevice') - cs_classname = get_typed_class(options.virt, 'ComputerSystem') + sd_classname = get_typed_class(virt, 'SystemDevice') + cs_classname = get_typed_class(virt, 'ComputerSystem') - devs = assoc.AssociatorNames(options.ip, sd_classname, cs_classname, + devs = assoc.AssociatorNames(server, sd_classname, cs_classname, Name=test_dom, CreationClassName=cs_classname) if devs == None: - logger.error("System association failed") - return FAIL - elif len(devs) == 0: - logger.error("No devices returned") + logger.error("'%s' association failed", sd_classname) + cxml.destroy(server) return FAIL - cn_devid = { - get_typed_class(options.virt, "NetworkPort") : '%s/%s' % (test_dom, test_mac), - get_typed_class(options.virt, "Memory") : '%s/mem' % test_dom, - get_typed_class(options.virt, "LogicalDisk") : '%s/%s' % (test_dom, test_disk), - get_typed_class(options.virt, "Processor") : '%s/%s' % (test_dom, test_cpu-1) - } + if len(devs) == 0: + logger.error("No devices returned") + cxml.destroy(server) + return FAIL - key_list = {'DeviceID' : '', - 'CreationClassName' : '', - 'SystemName' : test_dom, - 'SystemCreationClassname' : cs_classname - } - - for dev_cn in cn_devid.keys(): - for dev in devs: - key_list['CreationClassName'] = dev['CreationClassname'] - key_list['DeviceID'] = dev['DeviceID'] - device = devices.device_of(options.ip, key_list) - if device.CreationClassName != dev_cn: - continue - devid = device.DeviceID + mem_cn = get_typed_class(virt, "Memory") + exp_pllist = { mem_cn : ['%s/mem' % test_dom] } + proc_cn = get_typed_class(virt, "Processor") + exp_pllist[proc_cn] = [] + for i in range(test_cpu): + exp_pllist[proc_cn].append( '%s/%s' % (test_dom, i)) - _devid = cn_devid[dev_cn] - if devid != _devid: - logger.error("DeviceID `%s` != `%s'" % (devid, _devid)) - status = FAIL - else: - logger.info("Examined %s" % _devid) - - cxml.destroy(options.ip) - cxml.undefine(options.ip) + if virt != 'LXC': + net_cn = get_typed_class(virt, "NetworkPort") + disk_cn = get_typed_class(virt, "LogicalDisk") + exp_pllist[net_cn] = ['%s/%s' % (test_dom, test_mac)] + exp_pllist[disk_cn] = [ '%s/%s' % (test_dom, test_disk)] + try: + res_pllist = {} + for items in devs: + if items.classname in res_pllist.keys(): + res_pllist[items.classname].append(items['DeviceID']) + else: + res_pllist[items.classname] = [items['DeviceID']] + + #Verifying we get all the expected device class info + if Set(exp_pllist.keys()) != Set(res_pllist.keys()): + logger.error("Device Class mismatch") + raise Exception("Expected Device class list: %s \n \t Got: %s" + % (sorted(exp_pllist.keys()), + sorted(res_pllist.keys()))) + + #Verifying that we get only the expected deviceid + #for every device class + for key in exp_pllist.keys(): + if Set(exp_pllist[key]) != Set(res_pllist[key]): + logger.error("DeviceID mismatch") + raise Exception("Expected DeviceID: %s \n \t Got: %s" + % (sorted(exp_pllist[key]), + sorted(res_pllist[key]))) + except Exception, details: + logger.error("Exception %s", details) + status = FAIL + + cxml.destroy(server) return status if __name__ == "__main__":

1 0

[PATCH] [TEST] Updating 01_forward.py tc of SettingsDefineCapabilities
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225865973 28800 # Node ID f0c349a1321c590b172b3ecaa279e5d0c2f0b26d # Parent f5a2c1cc3df0bc76fbdcefad05c2254669a42428 [TEST] Updating 01_forward.py tc of SettingsDefineCapabilities. This modification is required for libvirt-cim providers which does not include the properties of template RASDs changes. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5a2c1cc3df0 -r f0c349a1321c suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Nov 04 22:09:41 2008 -0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue Nov 04 22:19:33 2008 -0800 @@ -63,8 +63,10 @@ from XenKvmLib.const import do_main, def from XenKvmLib.const import do_main, default_pool_name, default_network_name from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import print_field_error +from XenKvmLib.const import get_provider_version platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] +libvirt_rasd_template_changes = 707 memid = "MemoryPool/0" procid = "ProcessorPool/0" @@ -168,7 +170,9 @@ def verify_sdc_with_ac(virt, server, poo assoc_info = assoc.Associators(server, assoc_cname, cn, InstanceID = instid) - if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV'): + curr_cim_rev, changeset = get_provider_version(virt, server) + if 'DiskPool' in instid and (virt =='Xen' or virt == 'XenFV') and \ + curr_cim_rev >= libvirt_rasd_template_changes: # For Diskpool, we have info 1 for each of Min, Max, # default, Increment and 1 for each of PV and FV # hence 4 * 2 = 8 records

1 0

[PATCH] [TEST] Updating 03_hs_to_settdefcap.py tc of HostSystem
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225865381 28800 # Node ID f5a2c1cc3df0bc76fbdcefad05c2254669a42428 # Parent b1634f5d4f0b0cb0f373e3790754536786e9b008 [TEST] Updating 03_hs_to_settdefcap.py tc of HostSystem . This modification is required for libvirt-cim providers which does not include the properties of template RASDs changes. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r b1634f5d4f0b -r f5a2c1cc3df0 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Nov 04 21:25:46 2008 -0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Tue Nov 04 22:09:41 2008 -0800 @@ -50,11 +50,13 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.test_xml import testxml from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.const import get_provider_version sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst_test" test_vcpus = 1 bug_sblim='00007' +libvirt_rasd_template_changes = 707 def setup_env(server, virt="Xen"): status = PASS @@ -215,7 +217,9 @@ def get_rasddetails(server, alloccap, vi ccn, InstanceID = ap['InstanceID']) - if 'DiskPool' in ap['InstanceID'] and virt =='Xen': + curr_cim_rev, changeset = get_provider_version(virt, server) + if 'DiskPool' in ap['InstanceID'] and virt =='Xen' and \ + curr_cim_rev >= libvirt_rasd_template_changes: # For Diskpool, we have info 1 for each of Min, Max, # default, Increment and 1 for each of PV and FV # hence 4 * 2 = 8 records

1 0

[PATCH] [TEST] Updating the tc to verify fewer Profile when rev < 680
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225862746 28800 # Node ID b1634f5d4f0b0cb0f373e3790754536786e9b008 # Parent f5bac806db6e00499b572364216031240a31fe8f [TEST] Updating the tc to verify fewer Profile when rev < 680. This tc will still fail since the following query does not work yet. Will send a follow up patch for the same. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f5bac806db6e -r b1634f5d4f0b suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Tue Nov 04 20:55:00 2008 -0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Tue Nov 04 21:25:46 2008 -0800 @@ -51,11 +51,13 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.enumclass import EnumInstances from XenKvmLib.const import default_network_name, default_pool_name +from XenKvmLib.const import get_provider_version sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = "domU" bug_sblim = '00007' +libvirt_cim_ectp_changes = 680 def pool_init(verify_list, pool_cn, pool_name, virt): ccn = get_typed_class(virt, pool_cn) @@ -141,9 +143,14 @@ def get_proflist(server, reg_classname, status = PASS try: proflist = EnumInstances(server, reg_classname) - if len(proflist) < 7: - logger.error("'%s' returned '%d' '%s' objects, expected atleast 7", - reg_classname, len(proflist), 'Profile') + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirt_cim_ectp_changes: + len_prof_list = 5 + else: + len_prof_list = 7 + if len(proflist) < len_prof_list: + logger.error("'%s' returned '%d' '%s' objects, expected atleast %d", + reg_classname, len(proflist), 'Profile', len_prof_list) status = FAIL except Exception, detail:

1 0

[PATCH] [TEST] Fixing xm_virt_util.py to import fv_cap
by Deepti B. Kalakeri 05 Nov '08

05 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225860900 28800 # Node ID f5bac806db6e00499b572364216031240a31fe8f # Parent 319e2e9509d360334c0e38e17abc9bf2b163e1cb [TEST] Fixing xm_virt_util.py to import fv_cap. This is req for tc which use bootloader() will fail otherwise. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 319e2e9509d3 -r f5bac806db6e suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 05:22:21 2008 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Tue Nov 04 20:55:00 2008 -0800 @@ -25,6 +25,7 @@ import os import os from VirtLib import utils import socket +from VirtLib.live import fv_cap def xm_domname(ip, domid):

1 0

[PATCH 0 of 5] (#2) Fix up associations to SBLIM host system
by Dan Smith 04 Nov '08

04 Nov '08

This time with the base schema changes...

2 8

[PATCH] [TEST] #2 Fixing 01_forward.py tc of SystemDevice
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225792617 28800 # Node ID 3ce5cf8fb12feb015f5ecce5c72517c7836b407c # Parent d1614c101c281b57bd2bc98dfb6625f790748e54 [TEST] #2 Fixing 01_forward.py tc of SystemDevice. The test needs to be updated with cim_define(). Tested on KVM, LXC and Xen with current sources and F9 rpm. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r d1614c101c28 -r 3ce5cf8fb12f suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Oct 29 20:11:47 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Nov 04 01:56:57 2008 -0800 @@ -8,6 +8,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 @@ -25,10 +26,10 @@ # import sys +from sets import Set from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import vxml -from XenKvmLib import devices from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main @@ -38,72 +39,99 @@ test_dom = "test_domain" test_mac = "00:11:22:33:44:55" -test_cpu = 1 +test_cpu = 3 @do_main(sup_types) def main(): - options= main.options - - if options.virt == 'Xen': + options = main.options + server = options.ip + virt = options.virt + + if virt == 'Xen': test_disk = 'xvdb' else: test_disk = 'hdb' status = PASS - virt_xml = vxml.get_class(options.virt) - if options.virt == 'LXC': - cxml = virt_xml(test_dom) + virt_xml = vxml.get_class(virt) + if virt == 'LXC': + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac) else: - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) - ret = cxml.create(options.ip) + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, + disk = test_disk) + + ret = cxml.create(server) if not ret: logger.error('Unable to create domain %s' % test_dom) return FAIL - sd_classname = get_typed_class(options.virt, 'SystemDevice') - cs_classname = get_typed_class(options.virt, 'ComputerSystem') + sd_classname = get_typed_class(virt, 'SystemDevice') + cs_classname = get_typed_class(virt, 'ComputerSystem') - devs = assoc.AssociatorNames(options.ip, sd_classname, cs_classname, + devs = assoc.AssociatorNames(server, sd_classname, cs_classname, Name=test_dom, CreationClassName=cs_classname) if devs == None: - logger.error("System association failed") - return FAIL - elif len(devs) == 0: - logger.error("No devices returned") + logger.error("'%s' association failed", sd_classname) + cxml.destroy(server) return FAIL - cn_devid = { - get_typed_class(options.virt, "NetworkPort") : '%s/%s' % (test_dom, test_mac), - get_typed_class(options.virt, "Memory") : '%s/mem' % test_dom, - get_typed_class(options.virt, "LogicalDisk") : '%s/%s' % (test_dom, test_disk), - get_typed_class(options.virt, "Processor") : '%s/%s' % (test_dom, test_cpu-1) - } + if len(devs) == 0: + logger.error("No devices returned") + cxml.destroy(server) + return FAIL - key_list = {'DeviceID' : '', - 'CreationClassName' : '', - 'SystemName' : test_dom, - 'SystemCreationClassname' : cs_classname - } - - for dev_cn in cn_devid.keys(): - for dev in devs: - key_list['CreationClassName'] = dev['CreationClassname'] - key_list['DeviceID'] = dev['DeviceID'] - device = devices.device_of(options.ip, key_list) - if device.CreationClassName != dev_cn: - continue - devid = device.DeviceID + mem_cn = get_typed_class(virt, "Memory") + exp_pllist = { mem_cn : ['%s/mem' % test_dom] } + proc_cn = get_typed_class(virt, "Processor") + exp_pllist[proc_cn] = [] + for i in range(test_cpu): + exp_pllist[proc_cn].append( '%s/%s' % (test_dom, i)) - _devid = cn_devid[dev_cn] - if devid != _devid: - logger.error("DeviceID `%s` != `%s'" % (devid, _devid)) - status = FAIL + if virt != 'LXC': + net_cn = get_typed_class(virt, "NetworkPort") + disk_cn = get_typed_class(virt, "LogicalDisk") + exp_pllist[net_cn] = ['%s/%s' % (test_dom, test_mac)] + exp_pllist[disk_cn] = [ '%s/%s' % (test_dom, test_disk)] + + try: + res_pllist = {} + for items in devs: + # The dict has some elements + if len(res_pllist) != 0: + # If the dict already has the key we append the new value + if items.classname in res_pllist.keys(): + list = [] + list = res_pllist[items.classname] + list.append(items['DeviceID']) + res_pllist[items.classname] = list + else: + # If the dict is not empty, but does not yet contain + # items.classname, we create new item + res_pllist[items.classname] = [items['DeviceID']] else: - logger.info("Examined %s" % _devid) - - cxml.destroy(options.ip) - cxml.undefine(options.ip) + # When the dict is empty + res_pllist[items.classname] = [items['DeviceID']] + #Verifying we get all the expected device class info + if Set(exp_pllist.keys()) != Set(res_pllist.keys()): + logger.error("Device Class mismatch") + raise Exception("Expected Device class list: %s \n \t Got: %s" + % (sorted(exp_pllist.keys()), + sorted(res_pllist.keys()))) + + #Verifying that we get only the expected deviceid + #for every device class + for key in exp_pllist.keys(): + if Set(exp_pllist[key]) != Set(res_pllist[key]): + logger.error("DeviceID mismatch") + raise Exception("Expected DeviceID: %s \n \t Got: %s" + % (sorted(exp_pllist[key]), + sorted(res_pllist[key]))) + except Exception, details: + logger.error("Exception %s", details) + status = FAIL + + cxml.destroy(server) return status if __name__ == "__main__":

2 1

[PATCH 0 of 5] Fix up associations to SBLIM host system
by Dan Smith 04 Nov '08

04 Nov '08

This patch set attempts to patch up our associations for the case where the SBLIM providers are installed and we use them for our HostSystem class. Since that class exists in root/cimv2, we have to register our associations there as well, and make sure they provide paths back to the rest of our providers. The convert_sblim_hostsystem() function that I use to do this is a bit of a hack, given that it requires knowledge of how the reference we're passing to all of our factory functions is used. However, I think it's definitely the easiest thing to do right now. Comments are welcome as usual :)

2 9

[PATCH] [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225804941 28800 # Node ID 914e2bbfeb62295a2a0afb976ed5b2a72e38daed # Parent 8118a0e17d219b6886b34176423c45c855f08576 [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support. Updating 01_enum_crs.py tc of RedirectionService to skip the tc which if CRS provider is not present in the libvirt_cim provider when the libvirt_cim_revision < 688. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 8118a0e17d21 -r 914e2bbfeb62 suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py --- a/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Sun Nov 02 19:16:33 2008 -0800 +++ b/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Tue Nov 04 05:22:21 2008 -0800 @@ -32,19 +32,28 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.common_util import get_host_info from XenKvmLib.const import get_provider_version SHAREMODE = 3 REDIRECTION_SER_TYPE = 3 CRS_MAX_SAP_REV = 724 +libvirtcim_hr_crs_changes = 688 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): virt = main.options.virt server = main.options.ip + + # This check is required for libivirt-cim providers which do not have + # CRS changes in it and the CRS provider is available with revision >= 688. + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirtcim_hr_crs_changes: + logger.info("ConsoleRedirectionService provider not supported, " + "hence skipping the tc ....") + return SKIP status, host_name, host_cn = get_host_info(server, virt) if status != PASS:

1 0

[PATCH] [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225802905 28800 # Node ID a63c661d0e709149d874d7632ac16f721aea60e6 # Parent d7c8a05587743fd0fafb2d4d53a62896f45d1b31 [TEST] Updating 01_enum_crs.py tc of RedirectionService to work with libvirt-cim provider with no CRS support. Updating 01_enum_crs.py tc of RedirectionService to skip the tc which if CRS provider is not present in the libvirt_cim provider when the libvirt_cim_revision < 695. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r d7c8a0558774 -r a63c661d0e70 suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py --- a/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Tue Nov 04 04:05:05 2008 -0800 +++ b/suites/libvirt-cim/cimtest/RedirectionService/01_enum_crs.py Tue Nov 04 04:48:25 2008 -0800 @@ -32,19 +32,28 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.classes import get_typed_class from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.common_util import get_host_info from XenKvmLib.const import get_provider_version SHAREMODE = 3 REDIRECTION_SER_TYPE = 3 CRS_MAX_SAP_REV = 724 +libvirtcim_hr_crs_changes = 695 sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): virt = main.options.virt server = main.options.ip + + # This check is required for libivirt-cim providers which do not have + # CRS changes in it and the CRS provider is available with revision >= 695. + curr_cim_rev, changeset = get_provider_version(virt, server) + if curr_cim_rev < libvirtcim_hr_crs_changes: + logger.info("ConsoleRedirectionService provider not supported, " + "hence skipping the tc ....") + return SKIP status, host_name, host_cn = get_host_info(server, virt) if status != PASS:

1 0

[PATCH] [TEST] Updating 02_reverse.py tc of HostedService
by Deepti B. Kalakeri 04 Nov '08

04 Nov '08

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1225801400 28800 # Node ID 302c90a9915261a1aebe6e0f20785cb8ccf3caaf # Parent e0860bbf3ed4cf3d4adb20b5de805ec5ca8818be [TEST] Updating 02_reverse.py tc of HostedService. Updating 02_reverse.py tc of HostedService to include CRS provider information when the libvirt_cim_revision >= 695. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r e0860bbf3ed4 -r 302c90a99152 suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Tue Nov 04 03:47:46 2008 -0800 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Tue Nov 04 04:23:20 2008 -0800 @@ -31,20 +31,28 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL from XenKvmLib.common_util import get_host_info +from XenKvmLib.const import get_provider_version sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] +libvirtcim_hr_crs_changes = 695 @do_main(sup_types) def main(): options = main.options + server = options.ip virt = options.virt servicelist = {"ResourcePoolConfigurationService" : "RPCS", "VirtualSystemManagementService" : "Management Service", - "VirtualSystemMigrationService" : "MigrationService", - "ConsoleRedirectionService" : "ConsoleRedirectionService" } + "VirtualSystemMigrationService" : "MigrationService"} - status, host_name, host_ccn = get_host_info(options.ip, virt) + # This check is required for libivirt-cim providers which do not have + # CRS changes in it and the CRS provider is available with revision >= 695. + cim_rev, changeset = get_provider_version(virt, server) + if cim_rev >= libvirtcim_hr_crs_changes: + servicelist['ConsoleRedirectionService'] = "ConsoleRedirectionService" + + status, host_name, host_ccn = get_host_info(server, virt) if status != PASS: logger.error("Failed to get host info.") return status @@ -53,7 +61,7 @@ for k, v in servicelist.iteritems(): cn = get_typed_class(virt, k) try: - assoc_host = assoc.AssociatorNames(options.ip, an, cn, + assoc_host = assoc.AssociatorNames(server, an, cn, Name = v, CreationClassName = cn, SystemCreationClassName = host_ccn, @@ -63,7 +71,7 @@ return FAIL if len(assoc_host) != 1: - logger.error("Too many hosts") + logger.error("'%s' association failed", an) return FAIL ccn = assoc_host[0].keybindings['CreationClassName']

1 0