similar to: Re: Extracting files from OVA is bad

The OVF standard allows the use of SHA256 hashes in the manifest file. Adding support for this. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/input_ova.ml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 513fe30..5420c85 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -133,7 +133,7

On Wednesday, 7 December 2016 17:13:06 CET Tomáš Golembiovský wrote: > The information whether the disk is gzip compressed or not is stored > in the OVF. There is no reason to do the detection. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > v2v/input_ova.ml | 28 +++++++++++++++++----------- > v2v/test-v2v-i-ova-gz.ovf | 2 +- > 2

The regular expression for parsing the manifest line was wrong. There is a mandatory space between '=' and the hash. Another problem was that only the first line of the manifest file was actually processed. Also added some debugging info and warning to catch problems with parsing. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/input_ova.ml | 8 +++++++- 1 file

This series fixes and enhances parsing of the OVA manifest file. The changes are: - Added mandatory space to the regexp - Process all lines in the file, not just one - Warn on improperly formated lines - Support SHA256 hashes v1 -> v2: rebased on to master to make use of the Checksums module Tomáš Golembiovský (2): v2v: ova: fix checking of the manifest file v2v: ova: support SHA256

On Saturday, 12 November 2016 16:37:50 CET Tomáš Golembiovský wrote: > The information whether the disk is gzip compressed or not is stored > in the OVF. There is no reason to do the detection. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > v2v/input_ova.ml | 36 ++++++++++++++++++++---------------- > v2v/test-v2v-i-ova-gz.ovf | 2 +- >

On Wednesday, 23 November 2016 16:40:59 CET Tomáš Golembiovský wrote: > On Mon, 21 Nov 2016 16:41:49 +0100 > Pino Toscano <ptoscano@redhat.com> wrote: > > > On Saturday, 12 November 2016 16:37:53 CET Tomáš Golembiovský wrote: > > > The virt-v2v behaviour for OVA input now depends on QEMU version > > > available. The tests affected by this now have two

This series fixes and enhances parsing of the OVA manifest file. The changes are: - Added mandatory space to the regexp - Process all lines in the file, not just one - Warn on improperly formated lines - Support SHA256 hashes v1 -> v2: rebased on to master to make use of the Checksums module v2 -> v3: - changed debug/warning messages in first patch according to Richard's suggestions

v2: - 1/3: same as in previous version - 2/3: add check for libvirt version - 3/3: restore the disabled test The libvirt patch [2] that should fix our problem with 'raw' driver that is mentioned in [1] was merged. To realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. [1]

This series fixes and enhances parsing of the OVA manifest file. The changes are: - Added mandatory space to the regexp - Process all lines in the file, not just one - Warn on improperly formated lines - Support SHA256 hashes v1 -> v2: rebased on to master to make use of the Checksums module v2 -> v3: - changed debug/warning messages in first patch according to Richard's suggestions

On Saturday, 12 November 2016 16:37:53 CET Tomáš Golembiovský wrote: > The virt-v2v behaviour for OVA input now depends on QEMU version > available. The tests affected by this now have two *.expect files and > the expected result now also depends on the QEMU used. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- This IMHO should be part of patch #4 as

On Tue, Feb 14, 2017 at 01:26:40AM +0100, Tomáš Golembiovský wrote: > We have to be explicit about the drivers in backing file JSON in order > for libvirt to work. > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > --- > v2v/input_ova.ml | 1 + > v2v/test-v2v-i-ova-subfolders.expected2 | 2 +- > v2v/test-v2v-i-ova-tar.expected2

On Saturday, 12 November 2016 16:37:52 CET Tomáš Golembiovský wrote: > We don't have to always extract all files from the OVA archive. The OVA, > as defined in the standard, is plain tar. We can work directly over the > tar archive if we use correct 'offset' and 'size' options when defining > the backing file for QEMU. > > This leads to improvements in speed

I've sent a patch to libvirt that should fix our problem with 'raw' driver that is mentioned in [1]. The libvirt patch is here [2]. However, to realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. Note that the libvirt patch has not yet been reviewed nor merged, so this may not be the only thing

This is still a draft, not ready for commit yet. But feedback is welcomed. This series is related to the problem of inefficient import of OVA files. The needed enhancements of QEMU was merged into the codebase and should be available in QEMU 2.8. From there we can use 'size' and 'offset' options in raw driver to tell QEMU to use only subset of a file as an image. The first three

This series fixes and enhances parsing of the OVA manifest file. The changes are: - Added mandatory space to the regexp - Process all lines in the file, not just one - Warn on improperly formated lines - Support SHA256 hashes v4 -> v5: - fix tests - change one test to include the SHA256 checksum Tomáš Golembiovský (2): v2v: ova: fix checking of the manifest file v2v: ova: support SHA256

On Wed, Oct 05, 2016 at 01:40:52PM +0200, Tomáš Golembiovský wrote: > + else > + warning (f_"unable to parse line from manifest file: %S") line > + (String.replace line "\r" "") Does this even compile? Anyway you don't need the String.replace because %S does quoting. Rich. -- Richard Jones, Virtualization Group, Red

v3: Addressed Pino's comments, namely: - input_ova.ml - untar takes list of paths - renamed untar_partial to untar_metadata - replaced uggly regex with nsplit - tests - test changes are part of the main commit - renamed test-data/guestfs-hashsums.sh to test-data/test-utils.sh - renamed qemu_version to qemu_is_version and moved it to test-data/test-utils.sh - normalize paths

On Saturday, 10 December 2016 13:50:08 CET Tomas Golembiovsky wrote: > On Fri, 09 Dec 2016 14:01:40 +0100 > Pino Toscano <ptoscano@redhat.com> wrote: > > > On Wednesday, 7 December 2016 17:13:06 CET Tomáš Golembiovský wrote: > > > The information whether the disk is gzip compressed or not is stored > > > in the OVF. There is no reason to do the detection.

On Mon, Jan 30, 2017 at 10:43:16PM +0100, Tomáš Golembiovský wrote: > + QV=$(expr match "$(qemu-img --version)" 'qemu-img version \([0-9]\+\.[0-9]\+\)') Maybe consider using bash's internal regexp functions? We already use them in many other places, try doing: $ git grep '=~' -- \*.sh > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index

v4: - rebase to more recent master - 1/6: using just "quote" instead of "Filename.quote" - 2/6: reformated block of code according to Richards suggestion - 4/6: added tests for nsplit v3: Addressed Pino's comments, namely: - input_ova.ml - untar takes list of paths - renamed untar_partial to untar_metadata - replaced uggly regex with nsplit - tests - test changes