- Devel - libvirt List Archives

[libvirt] [test-API][PATCH] Add the volume clone case
by Wayne Sun 15 Jan '13

15 Jan '13

This is for volume clone testing by using createXMLFrom API * add the vol_clone case under storage it is general for all pool types * add cases into confs: cases/storage_dir.conf cases/storage_logical.conf cases/storage_netfs.conf * add variable 'defaultvolclonename' in global.cfg Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir.conf | 14 +++++++ cases/storage_logical.conf | 14 +++++++ cases/storage_netfs.conf | 14 +++++++ global.cfg | 2 + repos/storage/vol_clone.py | 81 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 repos/storage/vol_clone.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index dcac700..38b349d 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,20 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_dir_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_dir_volume poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index 3334abd..d374dfa 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,20 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_logical_volume poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index e764813..f486ff4 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,20 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_netfs_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_netfs_volume poolname $defaultpoolname diff --git a/global.cfg b/global.cfg index 9e28614..182acbd 100644 --- a/global.cfg +++ b/global.cfg @@ -156,6 +156,8 @@ defaultpoolname = test_api_pool defaultpoolpath = /var/lib/libvirt/images/dir_pool # default volume name for creating new volume defaultvolumename = test_api_volume +# default clone volume name for clone a volume +defaultvolclonename = test_clone_volume # default volume type for creating a new volume defaultvolumetype = raw # default volume capacity for creating a new volume diff --git a/repos/storage/vol_clone.py b/repos/storage/vol_clone.py new file mode 100644 index 0000000..abf5644 --- /dev/null +++ b/repos/storage/vol_clone.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# volume clone testing + +import os +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname', 'clonevolname',) +optional_params = {} + +def prepare_clone_xml(xmlstr, volname): + """prepare clone xmldesc by replace name element + with clone souce volume xml + """ + doc = minidom.parseString(xmlstr) + oldname = doc.getElementsByTagName("name")[0] + + newname = doc.createElement('name') + newnameval = doc.createTextNode(volname) + newname.appendChild(newnameval) + + volume = doc.getElementsByTagName('volume')[0] + + volume.replaceChild(newname, oldname) + newxmlstr = doc.toxml() + + return newxmlstr + +def vol_clone(params): + """volume clone testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + clonevolname = params['clonevolname'] + + logger.info("the poolname is %s, volname is %s" % (poolname, volname)) + logger.info("the clone volume name is %s" % clonevolname) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + old_vol = poolobj.storageVolLookupByName(volname) + + xmlstr = old_vol.XMLDesc(0) + newxmlstr = prepare_clone_xml(xmlstr, clonevolname) + logger.debug("volume xml:\n%s" % newxmlstr) + + logger.info("clone volume %s from source volume %s" % + (clonevolname, volname)) + + old_volnum = poolobj.numOfVolumes() + + new_vol = poolobj.createXMLFrom(newxmlstr, old_vol, 0) + poolobj.refresh(0) + + new_volnum = poolobj.numOfVolumes() + + logger.debug("new cloned volume path is: %s" % new_vol.path()) + if os.access(new_vol.path(), os.R_OK): + logger.info("cloned volume path exist") + else: + logger.error("cloned volume path not exist") + return 1 + + if new_volnum > old_volnum: + logger.info("clone succeed") + else: + logger.error("clone failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.7.1

2 1

[libvirt] [PATCH] docs: remove extra "
by Eric Blake 15 Jan '13

15 Jan '13

* tools/virsh.pod: Fix typo. --- Pushing under the trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 3687a4d..c9ebc8f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2095,7 +2095,7 @@ destroy and re-start the network. I<command> is one of "add-first", "add-last", "add" (a synonym for add-last), "delete", or "modify". -I<section> is one of ""bridge", "domain", "ip", "ip-dhcp-host", +I<section> is one of "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", "forward-pf", "portgroup", "dns-host", "dns-txt", or "dns-srv", each section being named by a concatenation of the xml element hierarchy leading to the -- 1.8.0.2

1 0

[libvirt] [PATCH v2] Build breaker securityselinuxhelper.c
by John Ferlan 15 Jan '13

15 Jan '13

v2: syntax-check - need space on # include Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.11.7

3 2

[libvirt] [PATCH] Don't try to include xattr.h if not available
by Guido Günther 14 Jan '13

14 Jan '13

--- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index abe4d7c..bd5ea87 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#ifdef WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.10.4

1 0

[libvirt] [ANNOUNCE] libvirt-glib 0.1.5 release
by Daniel P. Berrange 14 Jan '13

14 Jan '13

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.5, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add support for bridge interface types in guest XML - Add API to open a read-only connection - Add support for smartcard devices in guest XML - Remove storage volume from pool list after deleting it libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. 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 :|

1 0

[libvirt] [PATCH] Build breaker securityselinuxhelper.c
by John Ferlan 14 Jan '13

14 Jan '13

Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..206d936 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> +#if WITH_ATTR #include <attr/xattr.h> +#endif /* -- 1.7.11.7

1 0

[libvirt] [PATCH] build: work around broken kernel header
by Eric Blake 14 Jan '13

14 Jan '13

I got this scary warning during ./configure on rawhide: checking linux/if_bridge.h usability... no checking linux/if_bridge.h presence... yes configure: WARNING: linux/if_bridge.h: present but cannot be compiled configure: WARNING: linux/if_bridge.h: check for missing prerequisite headers? configure: WARNING: linux/if_bridge.h: see the Autoconf documentation configure: WARNING: linux/if_bridge.h: section "Present But Cannot Be Compiled" configure: WARNING: linux/if_bridge.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------- ## configure: WARNING: ## Report this to libvir-list(a)redhat.com ## configure: WARNING: ## ------------------------------------- ## checking for linux/if_bridge.h... no * configure.ac (AC_CHECK_HEADERS): Provide struct in6_addr, since linux/if_bridge.h uses it without declaring it. --- Pushing under the build-breaker rule. I also plan on opening a BZ against the kernel headers. configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 753916c..31e7f80 100644 --- a/configure.ac +++ b/configure.ac @@ -978,7 +978,9 @@ dnl if test "$with_linux" = "yes"; then if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],, - AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])) + [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])], + [[#include <netinet/ip6.h> + ]]) fi fi -- 1.7.1

1 2

[libvirt] [PATCH] maint: typo fix
by Eric Blake 14 Jan '13

14 Jan '13

I noticed this typo while configuring on a freshly-installed machine. * m4/virt-udev.m4: Correct pciaccess name. --- Pushing under the trivial rule. m4/virt-udev.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 index bf4623d..55673bf 100644 --- a/m4/virt-udev.m4 +++ b/m4/virt-udev.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_CHECK_UDEV],[ LIBVIRT_CHECK_PKG([UDEV], [libudev], [145]) if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then - AC_MSG_ERROR([You must install the pciaccesss module to build with udev]) + AC_MSG_ERROR([You must install the pciaccess module to build with udev]) fi ]) -- 1.7.1

1 0

[libvirt] [PATCH 00/28] Convert more of configure.ac to use helper macros
by Daniel P. Berrange 14 Jan '13

14 Jan '13

This is a follow-on series from https://www.redhat.com/archives/libvir-list/2013-January/msg00647.html It converts all the remaining easy library/package checks to use the new helper macros. What's let are some tricky cases where we first check via pkg-config and then fallback to a manual check, or cases where we use a custom pkg-config like program

2 61

[libvirt] [PATCH] docs: generate links from plain text documentation
by Claudio Bley 14 Jan '13

14 Jan '13

There are two forms used throughout libvirt code comments, which are both supported by this patch. * plain links like e.g. http://www.libvirt.org/ * links enclosed in <> characters, e.g. <http://www.libvirt.org/> Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/newapi.xsl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 24831ee..6d20358 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -62,6 +62,19 @@ <a href="libvirt-{$ref/@file}.html#{$ref/@name}"><xsl:value-of select="$stem"/></a> <xsl:value-of select="substring-after($token, $stem)"/> </xsl:when> + <xsl:when test="starts-with($token, 'http://')"> + <a href="{$token}"> + <xsl:value-of select="$token"/> + </a> + </xsl:when> + <xsl:when test="starts-with($token, '<http://') and contains($token, '>')"> + <xsl:variable name="link" + select="substring(substring-before($token, '>'), 2)"/> + <a href="{$link}"> + <xsl:value-of select="$link"/> + </a> + <xsl:value-of select="substring-after($token, '>')"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="$token"/> </xsl:otherwise> @@ -547,7 +560,11 @@ <h2 style="font-weight:bold;color:red;text-align:center">This module is deprecated</h2> </xsl:if> <xsl:if test="description"> - <p><xsl:value-of select="description"/></p> + <p> + <xsl:call-template name="dumptext"> + <xsl:with-param name="text" select="description"/> + </xsl:call-template> + </p> </xsl:if> </xsl:template> -- 1.7.9.5

1 0