- Devel - libvirt List Archives

[libvirt] [PATCH] Add missing % on %{_libdir} macro in RPM
by Daniel P. Berrange 12 Dec '13

12 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Pushed as build breaker fix Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9b34f3f..e22c373 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1957,7 +1957,7 @@ exit 0 %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so +%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so %endif %if %{with_lxc} -- 1.8.3.1

1 0

[libvirt] [PATCH 1/1] Make virtio as the default net device for PPC64
by Pradipta Kr. Banerjee 12 Dec '13

12 Dec '13

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> Make virtio as the default net device for PPC64 Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e964c75..db36eff 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -790,7 +790,8 @@ static const char * qemuDomainDefaultNetModel(const virDomainDef *def) { if (def->os.arch == VIR_ARCH_S390 || - def->os.arch == VIR_ARCH_S390X) + def->os.arch == VIR_ARCH_S390X || + def->os.arch == VIR_ARCH_PPC64) return "virtio"; if (def->os.arch == VIR_ARCH_ARMV7L) { -- 1.8.3.1

3 4

[libvirt] [PATCH 0/3] Reflect changes in kernel 3.12 in our cgroups code
by Martin Kletzander 12 Dec '13

12 Dec '13

To see what changed in the kernel, see explanation in PATCH 1/3. First two patches make proper use of VIR_DOMAIN_MEMORY_PARAM_UNLIMITED, the third one just fixes a "typo". Martin Kletzander (3): cgroups: Redefine what "unlimited" means wrt memory limits qemu: Report VIR_DOMAIN_MEMORY_PARAM_UNLIMITED properly qemu: Fix minor inconsistency in error message src/qemu/qemu_driver.c | 27 ++++++++++++------------ src/util/vircgroup.c | 57 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 31 deletions(-) -- 1.8.4.4

3 8

[libvirt] [PATCH] Read PCI class from sysfs class file instead of config space.
by Thadeu Lima de Souza Cascardo 12 Dec '13

12 Dec '13

When determining if a device is behind a PCI bridge, the PCI device class is checked by reading the config space. However, there are some devices which have the wrong class on the config space, but the class is initialized by Linux correctly as a PCI BRIDGE. This class can be read by the sysfs file '/sys/bus/pci/devices/xxxx:xx:xx.x/class'. One example of such bridge is IBM PCI Bridge 1014:03b9, which is identified as a Host Bridge when reading the config space. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)linux.vnet.ibm.com> --- src/util/virpci.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..8353411 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -344,6 +344,34 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) } static int +virPCIDeviceReadClass(virPCIDevicePtr dev, uint16_t *device_class) +{ + char *path = NULL; + char *id_str; + int ret = 0; + unsigned int value; + + if (virPCIFile(&path, dev->name, "class") < 0) + return -1; + + /* class string is '0xNNNNNN\n' ... i.e. 9 bytes */ + if (virFileReadAll(path, 9, &id_str) < 0) { + VIR_FREE(path); + return -1; + } + + VIR_FREE(path); + + id_str[8] = '\0'; + ret = virStrToLong_ui(id_str, NULL, 16, &value); + if (ret == 0) + *device_class = (value >> 8) & 0xFFFF; + + VIR_FREE(id_str); + return ret; +} + +static int virPCIDeviceWrite(virPCIDevicePtr dev, int cfgfd, unsigned int pos, @@ -645,8 +673,8 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) return 0; /* Is it a bridge? */ - device_class = virPCIDeviceRead16(check, fd, PCI_CLASS_DEVICE); - if (device_class != PCI_CLASS_BRIDGE_PCI) + ret = virPCIDeviceReadClass(check, &device_class); + if (ret == -1 || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; /* Is it a plane? */ @@ -2110,6 +2138,7 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) unsigned int pos; int fd; int ret = 0; + uint16_t device_class; if ((fd = virPCIDeviceConfigOpen(dev, true)) < 0) return -1; @@ -2119,8 +2148,11 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) goto cleanup; } + if (virPCIDeviceReadClass(dev, &device_class)) + goto cleanup; + pos = dev->pcie_cap_pos; - if (!pos || virPCIDeviceRead16(dev, fd, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) + if (!pos || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; flags = virPCIDeviceRead16(dev, fd, pos + PCI_EXP_FLAGS); -- 1.7.1

4 7

[libvirt] RFC: Changing version number at start of dev cycle instead of end
by Daniel P. Berrange 12 Dec '13

12 Dec '13

Currently throughout the dev cycle we stick on the current release number. The release number in configure.ac is only changed by DV when he is actually cutting the release. With the python bindings now being split out, this is causing us problems. The python code aims to build against any libvirt version that exists, so for example, the new network events APIs in libvirt will be included with version 1.2.1. So the python binding does #if LIBVIR_CHECK_VERSION(1, 2, 1) static void libvirt_virConnectNetworkEventFreeFunc(void *opaque) { PyObject *pyobj_conn = (PyObject*)opaque; LIBVIRT_ENSURE_THREAD_STATE; Py_DECREF(pyobj_conn); LIBVIRT_RELEASE_THREAD_STATE; } ... This works fine if a python release is built against a libvirt release. It does not work if a python git snapshot is built against a libvirt git snapshot. This is bad because it prevents us doing automated builds of GIT. The solution here is fairly simple. We should increase the version number in configure.ac at the *start* of each release cycle. This means that libvirt-python can use the next version number and things will 'just work'. I don't think this is a burden really - we already encode the next version number in our source code when tagging new APIs or driver methods. We're really just bringing autoconf's view of the version number inline with the rest of the code. So if no one objects, we should immediately change configure.ac to be 1.2.1 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

4 3

[libvirt] [test-API][PATCH] Add new cases for testing setSchedulerParametersFlags related API
by Xuesong Zhang 12 Dec '13

12 Dec '13

--- cases/sched_params.conf | 120 +++++++++++++++++++++++++++++++ repos/domain/sched_params.py | 136 ++++++++++++++++------------------- repos/domain/sched_params_flag.py | 148 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 330 insertions(+), 74 deletions(-) create mode 100755 cases/sched_params.conf create mode 100644 repos/domain/sched_params_flag.py diff --git a/cases/sched_params.conf b/cases/sched_params.conf new file mode 100755 index 0000000..6f7acce --- /dev/null +++ b/cases/sched_params.conf @@ -0,0 +1,120 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:sched_params + guestname + $defaultname + vcpuquota + 1000 + vcpuperiod + 200000 + emulatorperiod + 300000 + emulatorquota + 4000 + cpushares + 5000 + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1001 + vcpuperiod + 200001 + emulatorperiod + 300001 + emulatorquota + 4001 + cpushares + 5001 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1002 + vcpuperiod + 200002 + emulatorperiod + 300002 + emulatorquota + 4002 + cpushares + 5002 + flag + live + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1003 + vcpuperiod + 200003 + emulatorperiod + 300003 + emulatorquota + 4003 + cpushares + 5003 + flag + config + +domain:destroy + guestname + $defaultname + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1004 + vcpuperiod + 200004 + emulatorperiod + 300004 + emulatorquota + 4004 + cpushares + 5004 + flag + current + +domain:sched_params_flag + guestname + $defaultname + vcpuquota + 1005 + vcpuperiod + 200005 + emulatorperiod + 300005 + emulatorquota + 4005 + cpushares + 5005 + flag + config + +domain:undefine + guestname + $defaultname + diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py index 786e357..1be5986 100644 --- a/repos/domain/sched_params.py +++ b/repos/domain/sched_params.py @@ -1,95 +1,83 @@ #!/usr/bin/evn python -# To test domain scheduler parameters - -import os -import sys -import time -import commands +# Set and show scheduler parameters import libvirt +from libvirt import libvirtError from src import sharedmod from utils import utils -required_params = ('guestname', 'capshares',) +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares',) optional_params = {} -def check_guest_status(domobj): - """Check guest current status""" - state = domobj.info()[0] - if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN: - domobj.create() - time.sleep(30) - # Add check function - return True +def check_sched_params(guestname, sched_params_after): + """Check scheduler parameters validity after setting + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname else: - return True - -def check_sched_params(*args): - """Check scheduler parameters validity after setting""" - hypervisor, dicts, guestname, domobj = args - sched_dict = {} - if hypervisor == "xen": - sched_dict = eval(commands.getoutput('xm sched-credit -d %s' - % guestname)) - if sched_dict['weight'] == dicts['weight'] and \ - sched_dict['cap'] == dicts['cap']: - return 0 - else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) return 1 - if hypervisor == "kvm": - sched_dict = domobj.schedulerParameters() - if sched_dict['cpu_shares'] == dicts['cpu_shares']: - return 0 - else: + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") return 1 + logger.info("set scheduler parameters success") + return 0 + def sched_params(params): - """Setting scheduler parameters, argument params is a - dictionary data type.which includes 'weight' and 'cap' - keys, by assigning different value to 'weight' and 'cap' - to verify validity of the result + """ Change and get the scheduler parameters """ - hypervisor = utils.get_hypervisor() + global logger logger = params['logger'] guestname = params['guestname'] - conn = sharedmod.libvirtobj['conn'] - - domobj = conn.lookupByName(guestname) - - if check_guest_status(domobj): - sched_params = domobj.schedulerParameters() - logger.info("original scheduler parameters: %s\n" % sched_params) - - if 'xen' in hypervisor: - str_weight = params['weight'] - str_cap = params['cap'] - for wgt in eval(str_weight): - for cap in eval(str_cap): - dicts = {'weight': wgt, 'cap': cap} - logger.info("setting scheduler parameters: %s" % dicts) - domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - elif 'kvm' in hypervisor: - cpu_shares = int(params['cpushares']) - dicts = {'cpu_shares': cpu_shares} + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParameters() + logger.info("original scheduler parameters: %s" % sched_params_original) logger.info("setting scheduler parameters: %s" % dicts) domobj.setSchedulerParameters(dicts) - sched_params = domobj.schedulerParameters() - logger.info("current scheduler parameters: %s\n" % sched_params) - retval = check_sched_params(hypervisor, dicts, - guestname, domobj) - if retval != 0: - return 1 - else: - logger.error("unsupported hypervisor type: %s" % hypervisor) - return 1 + sched_params_after = domobj.schedulerParameters() + logger.info("current scheduler parameters: %s" % sched_params_after) - return 0 + ret = check_sched_params(guestname, sched_params_after) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 diff --git a/repos/domain/sched_params_flag.py b/repos/domain/sched_params_flag.py new file mode 100644 index 0000000..19bcb13 --- /dev/null +++ b/repos/domain/sched_params_flag.py @@ -0,0 +1,148 @@ +#!/usr/bin/evn python +# Set and show scheduler parameters with flag, such as "--current", "--live" +# and "--config" + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils +from xml.dom import minidom +import os + +required_params = ('guestname', 'vcpuquota', 'vcpuperiod', 'emulatorperiod', \ + 'emulatorquota', 'cpushares', 'flag',) +optional_params = {} + +def check_sched_params_flag(guestname, domobj, sched_params_after, domstate, \ + flags_value): + """Check scheduler parameters validity after setting + """ + + if (domstate == 1) and ((flags_value == 0) or (flags_value == 1)): + """While the domain is running and the flag is "--live" or "--current", + the value can be checked with the cgroup value + As for the other condition, the value can be checked with the domain + config xml + """ + + if os.path.exists("/cgroup"): + """ Add the judgment method, since the cgroup path is different on + rhel6 and rhel7. + if the folder cgroup is existed, it means the host os is rhel6, + if not existed, it means the the host of is rhel7 + """ + + cgroup_path = "cat /cgroup/cpu/libvirt/qemu/%s/" % guestname + else: + cgroup_path = "cat /sys/fs/cgroup/cpu\,cpuacct/machine.slice/" \ + "machine-qemu\\\\x2d%s.scope/" % guestname + + sched_dicts = {'vcpu_quota': 'vcpu0/cpu.cfs_quota_us', \ + 'vcpu_period': 'vcpu0/cpu.cfs_period_us', \ + 'emulator_period': 'emulator/cpu.cfs_period_us', \ + 'emulator_quota': 'emulator/cpu.cfs_quota_us', \ + 'cpu_shares': 'cpu.shares'} + + for sched_key in sched_dicts: + cmd = cgroup_path + sched_dicts[sched_key] + status, cmd_value = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get ***%s*** value" % sched_key) + return 1 + sched_dicts[sched_key] = int(cmd_value[0]) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + else: + guestxml = domobj.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + logger.debug("domain %s config xml :\n%s" % (domobj.name(), guestxml)) + + xmlrootnode = minidom.parseString(guestxml) + + sched_dicts = {'vcpu_quota': 'quota', 'vcpu_period': 'period', \ + 'emulator_period': 'emulator_period', \ + 'emulator_quota': 'emulator_quota', \ + 'cpu_shares': 'shares'} + + for sched_key in sched_dicts: + node = xmlrootnode.getElementsByTagName(sched_dicts[sched_key])[0] + sched_dicts[sched_key] = int(node.childNodes[0].data) + if sched_dicts[sched_key] != sched_params_after[sched_key]: + logger.error("set scheduler parameters failed") + return 1 + + logger.info("set scheduler parameters success") + return 0 + +def sched_params_flag(params): + """ Change and get the scheduler parameters + """ + + global logger + logger = params['logger'] + guestname = params['guestname'] + dicts = {'vcpu_quota': int(params['vcpuquota']), \ + 'vcpu_period': int(params['vcpuperiod']), \ + 'emulator_period': int(params['emulatorperiod']), \ + 'emulator_quota': int(params['emulatorquota']), \ + 'cpu_shares': int(params['cpushares'])} + flags = params['flag'] + + try: + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) + + domstate = domobj.state(0)[0] + """following is the domain state: + '1' is running status + '5' is shutoff status + please see the following reference link: + http://libvirt.org/html/libvirt-libvirt.html#virDomainState + """ + if domstate == 1: + logger.info("the state of virtual machine is ***running***") + elif domstate == 5: + logger.info("the state of virtual machine is ***shutoff***") + else: + logger.error("the state of virtual machine is not running or " \ + "shutoff now, it is out of the check range of this " \ + "script. Please check the domain status.") + return 1 + + """virDomainModificationImpact + VIR_DOMAIN_AFFECT_CURRENT = 0 + VIR_DOMAIN_AFFECT_LIVE = 1 + VIR_DOMAIN_AFFECT_CONFIG = 2 + """ + + if flags == "current": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CURRENT + elif flags == "live": + flags_value = libvirt.VIR_DOMAIN_AFFECT_LIVE + elif flags == "config": + flags_value = libvirt.VIR_DOMAIN_AFFECT_CONFIG + else: + logger.error("the value of flags is not correct, please check " \ + "the conf file") + return 1 + + sched_type = str(domobj.schedulerType()[0]) + logger.info("the scheduler type is: %s" % sched_type) + sched_params_original = domobj.schedulerParametersFlags(flags_value) + logger.info("original scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_original)) + logger.info("setting scheduler parameters: %s" % dicts) + domobj.setSchedulerParametersFlags(dicts, flags_value) + sched_params_after = domobj.schedulerParametersFlags(flags_value) + logger.info("current scheduler parameters with flag ***%s***: %s" % \ + (flags, sched_params_after)) + + ret = check_sched_params_flag(guestname, domobj, sched_params_after, \ + domstate, flags_value) + + return ret + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 -- 1.8.3.1

2 1

[libvirt] [test-API][PATCH] Add new case for listAllVolumes and update releated conf
by codong 12 Dec '13

12 Dec '13

listAllVolumes is a new API in RHEL7, so add a new case for it. And add the case to releated conf to check the volumes list. modified: cases/storage_dir.conf modified: cases/storage_dir_vol_resize_delta.conf modified: cases/storage_logical.conf modified: cases/storage_netfs.conf new file: repos/storage/list_volumes.py --- cases/storage_dir.conf | 16 +++++ cases/storage_dir_vol_resize_delta.conf | 8 +++ cases/storage_logical.conf | 16 +++++ cases/storage_netfs.conf | 16 +++++ repos/storage/list_volumes.py | 97 +++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 repos/storage/list_volumes.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index 38b349d..393d34f 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -28,18 +32,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_dir_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_dir_vol_resize_delta.conf b/cases/storage_dir_vol_resize_delta.conf index 58e15bf..22d3b47 100644 --- a/cases/storage_dir_vol_resize_delta.conf +++ b/cases/storage_dir_vol_resize_delta.conf @@ -12,6 +12,10 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_resize_delta poolname $defaultpoolname @@ -42,6 +46,10 @@ storage:delete_dir_volume volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index d374dfa..a0fdad6 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,10 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -30,18 +34,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_logical_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index f486ff4..6880763 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,10 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:list_volumes + poolname + $defaultpoolname + storage:vol_clone poolname $defaultpoolname @@ -32,18 +36,30 @@ storage:vol_clone clonevolname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolclonename +storage:list_volumes + poolname + $defaultpoolname + storage:delete_netfs_volume poolname $defaultpoolname volname $defaultvolumename +storage:list_volumes + poolname + $defaultpoolname + storage:destroy_pool poolname $defaultpoolname diff --git a/repos/storage/list_volumes.py b/repos/storage/list_volumes.py new file mode 100644 index 0000000..9555720 --- /dev/null +++ b/repos/storage/list_volumes.py @@ -0,0 +1,97 @@ +#!/usr/bin/evn python + +import libvirt +from libvirt import libvirtError +from xml.dom import minidom + +from utils import utils + +from src import sharedmod + +required_params = ('poolname',) +optional_params = {} + + +def get_pool_path(pool_obj): + """ + Get the pool path + """ + poolxml = pool_obj.XMLDesc(0) + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + + +def check_list_volumes(pool_obj, vol_name_list): + """ + Check the result of listAllVolumes + """ + + vol_poolobj_list = pool_obj.listVolumes() + logger.debug("get volumes from listVolumes is %s" % vol_poolobj_list) + + poolpath = get_pool_path(pool_obj) + logger.info("the pool path is %s" % poolpath) + vol_ls_cmd = "ls -a " + poolpath + + (status, vol_cmd_list) = utils.exec_cmd(vol_ls_cmd, shell=True) + if status: + logger.error("Executing " + vol_ls_cmd + " failed") + logger.error(vol_ls_cmd) + return False + else: + logger.debug("get volumes from poolpath is %s" % vol_cmd_list) + logger.info("compare the volume list under poolpath and list from API") + vol_cmd_list = vol_cmd_list[2:] + vol_name_list.sort() + vol_poolobj_list.sort() + vol_cmd_list.sort() + if (cmp(vol_poolobj_list, vol_name_list) == 0) and \ + (cmp(vol_name_list, vol_cmd_list) == 0): + + return True + else: + return False + + +def list_volumes(params): + """List all the volumes of a storage pool + """ + global logger + logger = params['logger'] + poolname = params['poolname'] + vol_name_list = [] + + logger.info("the poolname is %s" % (poolname)) + conn = sharedmod.libvirtobj['conn'] + storage_pool_list = conn.listStoragePools() + + if poolname not in storage_pool_list: + logger.error("pool %s doesn't exist or not running" % poolname) + return 1 + + pool_obj = conn.storagePoolLookupByName(poolname) + + try: + vol_obj_list = pool_obj.listAllVolumes() + for vol_obj in vol_obj_list: + vol_name_list.append(vol_obj.name()) + logger.info("the volume list is %s" % vol_name_list) + + if check_list_volumes(pool_obj, vol_name_list): + logger.info("get the right volumes list successfully") + else: + logger.error("fail to get the right volumes list") + return 1 + + except libvirtError as e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.7.1

3 2

[libvirt] [PATCH] storage: show compile options in virsh --version=long
by Eric Blake 12 Dec '13

12 Dec '13

Adding output to 'virsh --version=long' makes it easier to tell if a distro built with particular libraries (it doesn't tell you what a remote libvirtd is built with, but is still better than nothing). * tools/virsh.c (vshShowVersion): Add gluster witness. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 5559d71..9d07d3e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3069,6 +3069,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_STORAGE_SHEEPDOG vshPrint(ctl, " Sheepdog"); #endif +#ifdef WITH_STORAGE_GLUSTER + vshPrint(ctl, " Gluster"); +#endif vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -- 1.8.4.2

2 2

[libvirt] Glusterfs Libvirt issue
by Umar Draz 11 Dec '13

11 Dec '13

Hi, I am trying to create glusterfs pool with libvirt but its working, and following is the error *libvirt_storagepool_define_xml(): internal error unknown storage pool type gluster* the Qemu has enabled glusterfs backend support. I can create the glusterfs image using this *qemu-img create gluster://localhost/test/umar 5G* Would you please help what should else i need to require? Br. Umar

2 4

[libvirt] [PATCH python 00/14] Finished port to Python3
by Daniel P. Berrange 11 Dec '13

11 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series finishes the initial port to Python3. The code generator works, the C code compiles without warnings, and the sanitytest passes. The APIs using strings have all switched to PyUnicode except for thos which deal with binary data which now use PyBytes in Python 3 builds. Daniel P. Berrange (14): examples: Invoke print("...") instead of print "..." examples: Ensure we write bytes to the self-pipe override: Fix native module registration to work with Python3 sanitytest: Fix libvirtError class handling for Python 2.4 override: Replace PyString_FromString with libvirt_constcharPtrWrap override: Replace PyString_AsString with libvirt_charPtrUnwrap override: Replace Py{Int,Long}_FromLong with helpers override: Replace PyInt_AsLong with helper typewrappers: Replace use of PyString class typewrappers: PyInt/PyLong merge for Python3 override: Conditionalize use of PyString_Check and PyInt_Check override: Switch virStreamSend wrapper to use libvirt_charPtrSizeUnwrap sanitytest: Fix broken comparison between int and string sanitytest: remove use of string.lower() examples/consolecallback.py | 6 +- examples/dominfo.py | 14 +- examples/domrestore.py | 17 +-- examples/domsave.py | 15 +- examples/domstart.py | 19 ++- examples/esxlist.py | 14 +- examples/event-test.py | 70 ++++----- examples/topology.py | 14 +- libvirt-lxc-override.c | 75 +++++++--- libvirt-override.c | 348 ++++++++++++++++++++++++++------------------ libvirt-qemu-override.c | 77 +++++++--- sanitytest.py | 10 +- typewrappers.c | 97 +++++++++++- typewrappers.h | 3 + 14 files changed, 500 insertions(+), 279 deletions(-) -- 1.8.3.1

2 30