similar to: [PATCH 0/2] Improve OVA manifest parsing

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

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

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

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 Wed, Oct 05, 2016 at 04:35:20PM +0200, Tomáš Golembiovský wrote: > 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 Looks fine to me now. Pino, any other comments? Rich. -- Richard

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. > > > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> > > --- >

On Mon, 21 Nov 2016 16:21:02 +0100 Pino Toscano <ptoscano@redhat.com> wrote: > 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

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

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

On Thursday, 29 September 2016 14:59:31 CEST Tomáš Golembiovský wrote: > 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> > --- Maybe it would be a better idea to move the Checksums module from virt-builder to e.g. mllib, making it slightly more generic in error

On Thursday, 29 September 2016 14:59:14 CEST Tomáš Golembiovský wrote: > 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. Can you please provide an example of manifest file with more than one line? A real-life

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 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 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 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 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

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

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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 44e41ed..3c1a296 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -133,7 +133,7 @@

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

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 | 2 +- v2v/test-v2v-i-ova-two-disks.expected2 | 4 ++-- 4 files changed, 5 insertions(+), 4