search for: input_ova

...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 hashes in manifest v2v/input_ova.ml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 2.10.0

Only do this if running as root and if the backend is set to libvirt. --- v2v/input_ova.ml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 4f848e2..bb9cb1b 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -104,6 +104,19 @@ object (* Exploded path must be absolute (RHBZ#1155121). *) let exploded = absolute_pa...

https://bugzilla.redhat.com/show_bug.cgi?id=1448739

Don't assume every disk <Item> has a <Parent> field. For floppy disks this is not the case. Thanks: Junqin Zhou --- v2v/input_ova.ml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 95af2e5..9a9c10a 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -187,14 +187,17 @@ object for i = 0 to nr_nodes-1 do let n = Xml.xpathobj_node do...

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 @@ object (* Read any .mf (manifest) files and verify sha1. *) l...

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 files changed, 18 insertions(+), 12 deletions(-) > > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index b283629..61930f0 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova.ml >...

Shahar: This is the same patch as you posted, but I have rebased it on top of current HEAD. You'll have to do save the next email to a file, and do: git reset --hard HEAD^ git pull git am /path/to/saved_email There are no changes in this patch, except what is needed to make it compile. Will follow-up with comments. Rich.

...es 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 Tomáš Golembiovský (2): v2v: ova: fix checking of the manifest file v2v: ova: support SHA256 hashes in manifest v2v/input_ova.ml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 2.10.0

1. AWS the name tag is not mandatory - using default as a name 2. AWD doesn't prefix 'ovf:' as prefix to disk path There is an open bug for oVirt: https://bugzilla.redhat.com/show_bug.cgi?id=1371843 Signed-off-by: Shahar Havivi <shaharh@redhat.com> --- v2v/input_ova.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index d86c637..974caeb 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -185,7 +185,8 @@ object let name = match xpath_string "/ovf:Envelope/ovf:VirtualSystem/ov...

Use the common function for ensuring a path is absolute; it should not change the behaviour at all. --- sparsify/cmdline.ml | 6 +----- v2v/input_disk.ml | 4 +--- v2v/input_ova.ml | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index 3eb0d5b..523d612 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -142,11 +142,7 @@ read the man page virt-sparsify(1). (* The input disk must be an ab...

...- changed debug/warning messages in first patch according to Richard's suggestions v3 -> v4: - remove unneeded String.replace and the stray argument to warning call Tomáš Golembiovský (2): v2v: ova: fix checking of the manifest file v2v: ova: support SHA256 hashes in manifest v2v/input_ova.ml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.10.0

...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 changed, 7 insertions(+), 1 deletion(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 4f848e2..513fe30 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -133,9 +133,10 @@ object (* Read any .mf (manifest) files and verify sha1. *) let mf = find_fi...

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 +- > 2 files changed, 21 insertions(+), 17 deletions(-) > > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index b283629..db884d9 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova....

1. AWS the name tag is not mandatory - using default as a name 2. AWD doesn't prefix 'ovf:' as prefix to disk path There is an open bug for oVirt: https://bugzilla.redhat.com/show_bug.cgi?id=1371843 Signed-off-by: Shahar Havivi <shaharh@redhat.com> --- v2v/input_ova.ml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index d640d4a..46b6bb6 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -202,9 +202,7 @@ object (* Search for vm name. *) let name = - xpath_to_string "/ov...

Not tested yet, am running the tests now. Rich.

...so this may not be the only thing that we'll have to change. [1] https://www.redhat.com/archives/libguestfs/2017-February/msg00101.html [2] https://www.redhat.com/archives/libvir-list/2017-February/msg00575.html Tomáš Golembiovský (1): v2v: ova: fix generated JSON for libvirt support 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 deletions(-) -- 2.11.1

...lembiovský 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 files changed, 18 insertions(+), 12 deletions(-) > > > > > > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > > > index b283629..61930f0 100644 > > &g...

Some ova files have their ovf and other files inside a folder rather than at the root of the tarball. Consider the paths relative to the ovf file to cover this case too. --- v2v/Makefile.am | 1 + v2v/input_ova.ml | 3 +- v2v/test-v2v-i-ova-subfolders.sh | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100755 v2v/test-v2v-i-ova-subfolders.sh diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 0203317..1d219b6 100644 --- a/v2v/M...

...2] https://www.redhat.com/archives/libvir-list/2017-February/msg00575.html Tomáš Golembiovský (3): v2v: ova: fix generated JSON for libvirt support v2v: ova: check libvirt version before OVA import v2v: tests: restore disabled OVA test v2v/Makefile.am | 4 ++-- v2v/input_ova.ml | 4 +++- 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 ++-- v2v/test-v2v-i-ova.sh | 4 +--- v2v/utils.ml | 14 ++++++++++++++ v...

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 | 2 +- > v2v/test-v2v-i-ova-two-disks.expected2 | 4 ++-- > 4 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/v2v/input_ova.ml b/v2v/inpu...