- Devel - libvirt List Archives

[libvirt] [PATCH] Fix preprocessor indentation in nodeinfo.c
by Matthias Bolte 20 Jun '11

20 Jun '11

--- I'm pushing this under the build breaker rule. src/nodeinfo.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c6dbb84..9e0f906 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -685,23 +685,23 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } } else { -#if HAVE_NUMACTL +# if HAVE_NUMACTL if (numa_available() < 0) { -#endif +# endif nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA not supported on this host")); return -1; -#if HAVE_NUMACTL +# if HAVE_NUMACTL } -#endif +# endif -#if HAVE_NUMACTL +# if HAVE_NUMACTL if (cellNum > numa_max_node()) { nodeReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid cell number")); return -1; } -#endif +# endif if (virAsprintf(&meminfo_path, "%s/node%d/meminfo", NODE_SYS_PATH, cellNum) < 0) { -- 1.7.0.4

2 2

Re: [libvirt] [libvirt-php] - zend_mm_heap corrupted
by Michal Novotny 20 Jun '11

20 Jun '11

Hi Henrik, what exactly did you to do to get the error page? I never run into those in any version I'm having in libvirt-php git repository since I always check but it may be Apache & PHP version connected and I'm running it as a module. Could you please provide me more information about this or at least provide me the results of `make check` command in the libvirt-php directory as cloned from git? Please note that to try to `make check` you need to install it first so you need to do `make`, then `(sudo) make install` and then `make check`. The `make check` command is running the tests and you shouldn't be seeing any segmentation fault there otherwise there's some bug in the code which obviously seems to be reproducible only on your environment since it's not reproducible on my environment at all. All the tests pass in my case: $ make check ... Making check in tests make[1]: Entering directory `tests' ./runtests.sh Test test-connect.phpt has been completed successfully Test test-version-check.phpt has been completed successfully Test test-version-get.phpt has been completed successfully Test test-domain-define-undefine.phpt has been completed successfully Test test-domain-define-create-destroy.phpt has been completed successfully Test test-domain-create.phpt has been completed successfully Test test-domain-create-and-get-xpath.phpt has been completed successfully Test test-domain-create-and-coredump.phpt has been completed successfully Test test-domain-snapshot.phpt has been completed successfully All tests passed successfully ... $ Could you please provide me with the Apache logs as well and also the Apache and PHP version numbers? You mention Drupal, did you integrate libvirt-php functionality into Drupal? The backtraces using xdebug should be sufficient. Please provide me with them. Thanks, Michal On 06/18/2011 06:51 PM, Henrik Jönsson wrote: > > I basicly just got an erronous page load and checked the apache logs. > After some further testing it seems the problem only occurs when ran > within Drupal and not when ran as a standalone script. I will do some > further testing in a different cms to see if it is Drupal specific. I > can also do backtraces with xdebug and coredump apache if that will help. > > Best Regards > > /Henrik > Den 15 jun 2011 09:03 skrev "Michal Novotny" <minovotn(a)redhat.com > <mailto:minovotn@redhat.com>>: > > > > Hi Henrik, > > thanks a lot for your observations. How did you find out about the PHP > > memory usage and about zend_mm_heap corrupted at the first place? > > > > This could help me debug this issue. > > > > Thanks, > > Michal > > > > On 06/12/2011 06:05 PM, Henrik Jönsson wrote: > > > [libvirt-php] > > > > > > Hello! > > > > > > I am using Libvirt-php for a private project, i do however have a > > > problem that seems to occur when i call any function that returns a > > > domain resource. I have gotten 3 different errors so far. First i had > > > a problem with php memory usage going extreme(2gb), then i have had > > > some apache segmentation fault ending up in apache killing the > > > process. I have also had zend_mm_heap corrupted which i think is the > > > most common one. > > > > > > I have tried with Ubuntu 10.04, 10.10 and 11.04 repository versions of > > > Apache. Other than that i am using libvirt version 0.9.1 and > > > libvirt-php version 0.4.1. This is within the contexts of Drupal as i > > > am using the code in a Drupal module. > > > > > > I have checked out the source code for libvirt-php but since i am no > > > C/C++ developer i have a hard time figuring out what the issue might > > > be. Some help would be greatly appreciated. :) > > > > > > Best Regards! > > > > > > /Henrik > > > > > > > > > -- > > > libvir-list mailing list > > > libvir-list(a)redhat.com <mailto:libvir-list@redhat.com> > > > https://www.redhat.com/mailman/listinfo/libvir-list > > > > > > -- > > Michal Novotny <minovotn(a)redhat.com <mailto:minovotn@redhat.com>>, RHCE > > Virtualization Team (xen userspace), Red Hat > > > -- Michal Novotny <minovotn(a)redhat.com>, RHCE Virtualization Team (xen userspace), Red Hat

1 0

[libvirt] [PATCH] Move XenAPI driver to correct spec file section
by Matthias Bolte 20 Jun '11

20 Jun '11

The XenAPI driver works like the ESX and PHyp driver by using its own HTTPS based remote protocol. --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 97ebd65..75b145a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -44,13 +44,13 @@ %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} -%define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} %define with_vmware 0%{!?_without_vmware:%{server_drivers}} # Then the hypervisor drivers that talk a native remote protocol %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} +%define with_xenapi 0%{!?_without_xenapi:1} # Then the secondary host drivers %define with_network 0%{!?_without_network:%{server_drivers}} -- 1.7.0.4

2 2

[libvirt] [PATCH v4 RESEND 0/3] Add filesystem pool formatting
by Osier Yang 20 Jun '11

20 Jun '11

Hi, The following patches add the ability to format filesystem pools when the appropriate flags are passed to pool build. This patch set introduces two new flags: VIR_STORAGE_POOL_BUILD_NO_OVERWRITE causes the build to probe for an existing pool of the requested type. The build operation formats the filesystem if it does not find an existing filesystem of that type. VIR_STORAGE_POOL_BUILD_OVERWRITE causes the build to format unconditionally. [PATCH 1/3] storage: Add mkfs and libblkid to build system [PATCH 2/3] storage: Add fs pool formatting [PATCH 3/3] storage: Add virsh support for fs pool formating Regards Osier

1 4

[libvirt] [PATCH] build: fix building error when building without libvirtd
by Wen Congyang 20 Jun '11

20 Jun '11

When building libvirt without libvirtd, we will receive the following error message: make[3]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.2/tools' CC virsh-virsh.o CC virsh-console.o GEN virt-xml-validate GEN virt-pki-validate CCLD virsh ../src/.libs/libvirt.so: undefined reference to `numa_available' ../src/.libs/libvirt.so: undefined reference to `numa_max_node' collect2: ld returned 1 exit status The reason is that: we check numactl only when building qemu driver, and qemu driver will not be built when bulding without libvirtd. So with_numactl's value is check and we will not link libnuma.so. In the other function, we call numa_available() and numa_max_node() only when HAVE_NUMACTL is 1. We should do the same check in the function nodeGetMemoryStats(). --- src/nodeinfo.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 647cb1e..c6dbb84 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -685,17 +685,23 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } } else { +#if HAVE_NUMACTL if (numa_available() < 0) { +#endif nodeReportError(VIR_ERR_NO_SUPPORT, "%s", _("NUMA not supported on this host")); return -1; +#if HAVE_NUMACTL } +#endif +#if HAVE_NUMACTL if (cellNum > numa_max_node()) { nodeReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid cell number")); return -1; } +#endif if (virAsprintf(&meminfo_path, "%s/node%d/meminfo", NODE_SYS_PATH, cellNum) < 0) { -- 1.7.1

2 2

[libvirt] [PATCH v3 0/3] add support for changing blkio parameters for inactive domains
by Hu Tao 20 Jun '11

20 Jun '11

This series enables user to change blkio parameters for inactive domains from virsh command line. CHANGES: v2-v3: - based on new macros VIR_DOMAIN_AFFECT_XXX Hu Tao (3): Add new parameters for blkiotune update qemuDomainGetBlkioParameters to use flags Update qemuDomainSetBlkioParameters to use flags src/qemu/qemu_driver.c | 250 ++++++++++++++++++++++++++++++++++-------------- tools/virsh.c | 26 +++++- tools/virsh.pod | 7 ++ 3 files changed, 206 insertions(+), 77 deletions(-) -- 1.7.3.1

3 8

[libvirt] Schedule for 0.9.3 release
by Daniel Veillard 20 Jun '11

20 Jun '11

As stated before I really want the next release schedule to be aligned with month end, so I would like to get 0.9.3 out around Friday 1st July, which means that there is one week left before we enter the feature freeze. Make sure your patches get reviewed in time this week if they need to make 0.9.3 :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] apparmor: implement AppArmorSetFDLabel()
by Jamie Strandboge 20 Jun '11

20 Jun '11

During a savevm operation, libvirt will now use fd migration if qemu supports it. When the AppArmor driver is enabled, AppArmorSetFDLabel() is used but since this function simply returns '0', the dynamic AppArmor profile is not updated and AppArmor blocks access to the save file. This patch implements AppArmorSetFDLabel() to get the pathname of the file by resolving the fd symlink in /proc, and then gives that pathname to reload_profile(), which fixes 'virsh save' when AppArmor is enabled. Passes 'check' and 'syntax-check' (though po_check failed for unrelated reasons). Reference: https://launchpad.net/bugs/795800 -- Jamie Strandboge | http://www.canonical.com

3 2

[libvirt] [PATCH v3]: set and restore MAC address of a NIC when using PASSTHROUGH mode
by Gerhard Stenzel 19 Jun '11

19 Jun '11

This is a another rework of the patch Dirk sent out last week taking into account most propsosed changes The following patch addresses the problem that when a PASSTHROUGH mode DIRECT NIC connection is made the MAC address of the NIC is not automatically set and reset to the configured VM MAC and back again. The attached patch fixes this problem by setting and resetting the MAC while remembering the previous setting while the VM is running. This also works if libvirtd is restarted while the VM is running. the patch passes make syntax-check Signed-off-by: Dirk Herrendoerfer <d.herrendoerfer at herrendoerfer.name> Signed-off-by: Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> --- Index: libvirt/src/libvirt_macvtap.syms =================================================================== --- libvirt.orig/src/libvirt_macvtap.syms +++ libvirt/src/libvirt_macvtap.syms @@ -5,6 +5,8 @@ # macvtap.h delMacvtap; +getMacaddr; openMacvtapTap; +setMacaddr; vpAssociatePortProfileId; vpDisassociatePortProfileId; Index: libvirt/src/qemu/qemu_command.c =================================================================== --- libvirt.orig/src/qemu/qemu_command.c +++ libvirt/src/qemu/qemu_command.c @@ -128,7 +128,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def rc = openMacvtapTap(net->ifname, net->mac, net->data.direct.linkdev, net->data.direct.mode, vnet_hdr, def->uuid, &net->data.direct.virtPortProfile, &res_ifname, - vmop); + vmop, driver->stateDir); if (rc >= 0) { qemuAuditNetDevice(def, net, res_ifname, true); VIR_FREE(net->ifname); @@ -149,7 +149,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def if (err) { VIR_FORCE_CLOSE(rc); delMacvtap(net->ifname, net->mac, net->data.direct.linkdev, - &net->data.direct.virtPortProfile); + net->data.direct.mode, &net->data.direct.virtPortProfile, driver->stateDir); VIR_FREE(net->ifname); } } Index: libvirt/src/qemu/qemu_process.c =================================================================== --- libvirt.orig/src/qemu/qemu_process.c +++ libvirt/src/qemu/qemu_process.c @@ -2707,7 +2707,8 @@ void qemuProcessStop(struct qemud_driver virDomainNetDefPtr net = def->nets[i]; if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) { delMacvtap(net->ifname, net->mac, net->data.direct.linkdev, - &net->data.direct.virtPortProfile); + net->data.direct.mode, + &net->data.direct.virtPortProfile, driver->stateDir); VIR_FREE(net->ifname); } } Index: libvirt/src/util/macvtap.c =================================================================== --- libvirt.orig/src/util/macvtap.c +++ libvirt/src/util/macvtap.c @@ -87,6 +87,7 @@ # define LLDPAD_PID_FILE "/var/run/lldpad.pid" +#define MACADDRSIZE 6 enum virVirtualPortOp { ASSOCIATE = 0x1, @@ -191,6 +192,149 @@ err_exit: # if WITH_MACVTAP +/** + * getMacaddr: + * Get the MAC address of a network device + * + * @macaddress: Pointer where the MAC address will be stored + * @srcdev: The interface name of the NIC to get the MAC from + * + * Returns zero in case of success, + * negative value otherwise with error reported. + * + */ +int +getMacaddr(const unsigned char *macaddress, const char *srcdev ) +{ + int sockfd; + int io; + struct ifreq ifr; + + strcpy(ifr.ifr_name, srcdev); + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if(sockfd < 0){ + return -1; + } + + io = ioctl(sockfd, SIOCGIFHWADDR, (char *)&ifr); + if(io < 0){ + return -1; + } + + memcpy(macaddress, ifr.ifr_ifru.ifru_hwaddr.sa_data, MACADDRSIZE); + + return 0; +} + +/** + * setMacaddr: + * Set the MAC address of a network device + * + * @macaddress: MAC address to assign to the NIC + * @srcdev: The interface name of the NIC + * + * Returns zero in case of success, + * negative value otherwise with error reported. + * + */ +int +setMacaddr(const unsigned char *macaddress, const char *srcdev ) +{ + int rc = 0; + struct nlmsghdr *resp; + struct nlmsgerr *err; + struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; + int ifindex; + unsigned char *recvbuf = NULL; + unsigned int recvbuflen; + struct nl_msg *nl_msg; + + if (ifaceGetIndex(true, srcdev, &ifindex) != 0) + return -1; + + nl_msg = nlmsg_alloc_simple(RTM_SETLINK, NLM_F_REQUEST); + + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (nla_put_u32(nl_msg, IFLA_LINK, ifindex) < 0) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_ADDRESS, MACADDRSIZE, macaddress) < 0) + goto buffer_too_small; + + if (srcdev && + nla_put(nl_msg, IFLA_IFNAME, strlen(srcdev)+1, srcdev) < 0) + goto buffer_too_small; + + if (nlComm(nl_msg, &recvbuf, &recvbuflen, 0) < 0) { + rc = -1; + goto err_exit; + } + + if (recvbuflen < NLMSG_LENGTH(0) || recvbuf == NULL) + goto malformed_resp; + + resp = (struct nlmsghdr *)recvbuf; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + switch (err->error) { + + case 0: + break; + + case -EEXIST: + rc = -1; + break; + + default: + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("error setting device mac address")); + rc = -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + +err_exit: + nlmsg_free(nl_msg); + + VIR_FREE(recvbuf); + + return rc; + +malformed_resp: + nlmsg_free(nl_msg); + + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + VIR_FREE(recvbuf); + return -1; + +buffer_too_small: + nlmsg_free(nl_msg); + + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + static int link_add(const char *type, const unsigned char *macaddress, int macaddrsize, @@ -575,7 +719,8 @@ openMacvtapTap(const char *tgifname, const unsigned char *vmuuid, virVirtualPortProfileParamsPtr virtPortProfile, char **res_ifname, - enum virVMOperationType vmOp) + enum virVMOperationType vmOp, + char *stateDir) { const char *type = "macvtap"; int c, rc; @@ -589,6 +734,54 @@ openMacvtapTap(const char *tgifname, VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virVMOperationTypeToString(vmOp)); + /** Note: When using PASSTHROUGH mode with MACVTAP devices the link + * device's MAC address must be set to the VMs MAC address. In + * order to not confuse the first switch or bridge in line this MAC + * address must be reset when the VM is shut down. + * This is especially important when using SRIOV capable cards that + * emulate their switch in firmware. + */ + if (mode == VIR_DOMAIN_NETDEV_MACVTAP_MODE_PASSTHRU) { + unsigned char oldmac[6]; + + rc = getMacaddr(&oldmac, linkdev); + if (rc) { + virReportSystemError(rc, + _("Getting MAC address from '%s' " + "to '%02x:%02x:%02x:%02x:%02x:%02x' failed."), + linkdev, + oldmac[0], oldmac[1], oldmac[2], + oldmac[3], oldmac[4], oldmac[5]); + } else { + char *path = NULL; + + char macstr[VIR_MAC_STRING_BUFLEN]; + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) { + virReportOOMError(); + return errno; + } + virFormatMacAddr(oldmac, macstr); + if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) { + virReportSystemError(errno, _("Unable to preserve mac for %s"), + linkdev); + return errno; + } + } + + rc = setMacaddr(macaddress, linkdev); + if (rc) { + virReportSystemError(errno, + _("Setting MAC address on '%s' to " + "'%02x:%02x:%02x:%02x:%02x:%02x' failed."), + linkdev, + macaddress[0], macaddress[1], macaddress[2], + macaddress[3], macaddress[4], macaddress[5]); + } + } + + if (tgifname) { if(ifaceGetIndex(false, tgifname, &ifindex) == 0) { if (STRPREFIX(tgifname, @@ -684,8 +886,43 @@ void delMacvtap(const char *ifname, const unsigned char *macaddr, const char *linkdev, - virVirtualPortProfileParamsPtr virtPortProfile) -{ + int mode, + virVirtualPortProfileParamsPtr virtPortProfile, + char *stateDir) +{ + if (mode == VIR_DOMAIN_NETDEV_MACVTAP_MODE_PASSTHRU) { + int ret; + char *oldmacname = NULL; + char *macstr = NULL; + char *path = NULL; + unsigned char oldmac[6]; + + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) { + virReportOOMError(); + goto disassociate_exit; + } + + if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0) { + virReportSystemError(errno, _("Unable to preserve mac for %s"), + linkdev); + goto disassociate_exit; + } + + if (virParseMacAddr(macstr, &oldmac[0]) != 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse MAC address from '%s'"), + oldmacname); + } + + /*reset mac and remove file-ignore results*/ + ret = setMacaddr(oldmac, linkdev); + ret = unlink(path); + VIR_FREE(macstr); + } + +disassociate_exit: if (ifname) { vpDisassociatePortProfileId(ifname, macaddr, linkdev, Index: libvirt/src/util/macvtap.h =================================================================== --- libvirt.orig/src/util/macvtap.h +++ libvirt/src/util/macvtap.h @@ -75,6 +75,10 @@ enum virVMOperationType { # include "internal.h" +int getMacaddr(const unsigned char *macaddress, const char *srcdev ); + +int setMacaddr(const unsigned char *macaddress, const char *srcdev ); + int openMacvtapTap(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -83,12 +87,15 @@ int openMacvtapTap(const char *ifname, const unsigned char *vmuuid, virVirtualPortProfileParamsPtr virtPortProfile, char **res_ifname, - enum virVMOperationType vmop); + enum virVMOperationType vmop, + char *stateDir); void delMacvtap(const char *ifname, const unsigned char *macaddress, const char *linkdev, - virVirtualPortProfileParamsPtr virtPortProfile); + int mode, + virVirtualPortProfileParamsPtr virtPortProfile, + char *stateDir); int vpAssociatePortProfileId(const char *macvtap_ifname, const unsigned char *macvtap_macaddr, Index: libvirt/src/qemu/qemu_hotplug.c =================================================================== --- libvirt.orig/src/qemu/qemu_hotplug.c +++ libvirt/src/qemu/qemu_hotplug.c @@ -1610,7 +1610,7 @@ int qemuDomainDetachNetDevice(struct qem #if WITH_MACVTAP if (detach->type == VIR_DOMAIN_NET_TYPE_DIRECT) { delMacvtap(detach->ifname, detach->mac, detach->data.direct.linkdev, - &detach->data.direct.virtPortProfile); + detach->data.direct.mode, &detach->data.direct.virtPortProfile, driver->stateDir); VIR_FREE(detach->ifname); } #endif =================================================================== Best regards, Gerhard Stenzel ------------------------------------------------------------------------------------- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschaeftsfuehrung: Dirk Wittkopp Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 1

[libvirt] [Libvirt-test-API][PATCH] Add a pair of keywords in parser.py for supportting testcases loop
by Nan Zhang 19 Jun '11

19 Jun '11

For example: ----------------- domain:start guestname vm1 domain:save start_loop guestname vm1 domain:restore end_loop 10 guestname vm1 domain:destroy guestname vm1 ----------------- --- parser.py | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/parser.py b/parser.py index 5b3ce58..e9cce58 100644 --- a/parser.py +++ b/parser.py @@ -31,13 +31,18 @@ class CaseFileParser(object): """ Parser the case configuration file to generate a data list. """ def __init__(self, casefile=None, debug=False): - """ Initialize the list and optionally parse case file. """ self.list = [[]] self.variables = {} self.missing_variables = [] self.debug = debug self.casefile = casefile self.env = env_parser.Envparser("env.cfg") + self.loop_finish = False + self.loop_start = 0 + self.loop_end = 0 + self.loop_times = 0 + self.loop_list = [] + if casefile: self.parse_file(casefile) @@ -306,6 +311,7 @@ class CaseFileParser(object): def parse(self, fh, list): """ For the testcase name parsing. """ + while True: if self.debug: self.debug_print("the list is", list) @@ -330,6 +336,44 @@ class CaseFileParser(object): self.debug_print("we begin to handle the case", tripped_casename) + if self.loop_finish: + for i in range(len(list)): + self.loop_list.append([]) + + i = 0 + for caselist in list: + for j in range(self.loop_start, self.loop_end): + self.loop_list[i].append(caselist.pop()) + + self.loop_list[i].reverse() + self.debug_print("loop_list is", self.loop_list) + caselist.extend(self.loop_list[i] * self.loop_times) + i += 1 + + self.loop_finish = False + + if len(tripped_caselist) == 2 and \ + tripped_caselist[1] == "start_loop": + for caselist in list: + newdict = {} + newdict[tripped_casename] = {} + caselist.append(newdict) + self.loop_start = len(caselist) - 1 + continue + + if len(tripped_caselist) == 3 and \ + tripped_caselist[1] == "end_loop": + looptimes = tripped_caselist[2] + self.debug_print("looptimes is", looptimes) + self.loop_times = int(looptimes) + self.loop_finish = True + for caselist in list: + newdict = {} + newdict[tripped_casename] = {} + caselist.append(newdict) + self.loop_end = len(caselist) + continue + if len(tripped_caselist) == 3 and \ tripped_caselist[1] == "times": times = tripped_caselist[2] -- 1.7.4.4

3 6