Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Wed, Dec 07, 2016 at 11:19:47AM +0100, Pino Toscano wrote: > On Wednesday, 7 December 2016 10:10:36 CET Richard W.M. Jones wrote: > > On Wed, Dec 07, 2016 at 10:56:05AM +0100, Pino Toscano wrote: > > > On Wednesday, 7 December 2016 08:34:35 CET Richard W.M. Jones wrote: > > > > On Tue, Dec 06, 2016 at 04:41:52PM +0100, Pino Toscano wrote: > > > > > On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > > > > > > You can now use -o rhv (-o rhev is supported for compatibility). > > > > > > > > > > This LGTM -- the only concern is that "output:rhev" will disappear > > > > > from > > > > > the machine-readable output (and thus potentially breaking users). > > > > > I have PoC for handling better aliases for input & output modules, > > > > > I will polish and submit it. > > > > > > > > Hopefully they are parsing the --machine-readable output and so this > > > > won't be a problem :-) > > > > > > Well exactly: newer virt-v2v with "older" ovirt/rhv will not see > > > output:rhev anymore and thus not enable the VM import from VMware/etc. > > > > I think you mean newer virt-p2v and older virt-v2v? > > No, I mean other users of v2v which looks at the machine-readable > output. Not sure whether ovirt/rhv is one of them, but others might. RHV is just using RPM version dependencies. It doesn't look at --machine-readable at all. I don't know about other consumers. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Wednesday, 7 December 2016 10:10:36 CET Richard W.M. Jones wrote: > On Wed, Dec 07, 2016 at 10:56:05AM +0100, Pino Toscano wrote: > > On Wednesday, 7 December 2016 08:34:35 CET Richard W.M. Jones wrote: > > > On Tue, Dec 06, 2016 at 04:41:52PM +0100, Pino Toscano wrote: > > > > On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > > > > > You can now use -o rhv (-o rhev is supported for compatibility). > > > > > > > > This LGTM -- the only concern is that "output:rhev" will disappear from > > > > the machine-readable output (and thus potentially breaking users). > > > > I have PoC for handling better aliases for input & output modules, > > > > I will polish and submit it. > > > > > > Hopefully they are parsing the --machine-readable output and so this > > > won't be a problem :-) > > > > Well exactly: newer virt-v2v with "older" ovirt/rhv will not see > > output:rhev anymore and thus not enable the VM import from VMware/etc. > > I think you mean newer virt-p2v and older virt-v2v? No, I mean other users of v2v which looks at the machine-readable output. Not sure whether ovirt/rhv is one of them, but others might. -- Pino Toscano signature.asc Description: This is a digitally signed message part. ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Wed, Dec 07, 2016 at 10:56:05AM +0100, Pino Toscano wrote: > On Wednesday, 7 December 2016 08:34:35 CET Richard W.M. Jones wrote: > > On Tue, Dec 06, 2016 at 04:41:52PM +0100, Pino Toscano wrote: > > > On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > > > > You can now use -o rhv (-o rhev is supported for compatibility). > > > > > > This LGTM -- the only concern is that "output:rhev" will disappear from > > > the machine-readable output (and thus potentially breaking users). > > > I have PoC for handling better aliases for input & output modules, > > > I will polish and submit it. > > > > Hopefully they are parsing the --machine-readable output and so this > > won't be a problem :-) > > Well exactly: newer virt-v2v with "older" ovirt/rhv will not see > output:rhev anymore and thus not enable the VM import from VMware/etc. I think you mean newer virt-p2v and older virt-v2v? It should populate the combo box with the output of --machine-readable, so it should show the (old) 'rhev' option in this case. For older virt-p2v, newer virt-v2v, '-o rhev' still works. However I noticed there are places in virt-p2v where messages refer to "rhev", so I'll fix those in a follow-up patch. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Wednesday, 7 December 2016 08:34:35 CET Richard W.M. Jones wrote: > On Tue, Dec 06, 2016 at 04:41:52PM +0100, Pino Toscano wrote: > > On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > > > You can now use -o rhv (-o rhev is supported for compatibility). > > > > This LGTM -- the only concern is that "output:rhev" will disappear from > > the machine-readable output (and thus potentially breaking users). > > I have PoC for handling better aliases for input & output modules, > > I will polish and submit it. > > Hopefully they are parsing the --machine-readable output and so this > won't be a problem :-) Well exactly: newer virt-v2v with "older" ovirt/rhv will not see output:rhev anymore and thus not enable the VM import from VMware/etc. -- Pino Toscano signature.asc Description: This is a digitally signed message part. ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Tue, Dec 06, 2016 at 04:41:52PM +0100, Pino Toscano wrote: > On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > > You can now use -o rhv (-o rhev is supported for compatibility). > > This LGTM -- the only concern is that "output:rhev" will disappear from > the machine-readable output (and thus potentially breaking users). > I have PoC for handling better aliases for input & output modules, > I will polish and submit it. Hopefully they are parsing the --machine-readable output and so this won't be a problem :-) virt-p2v should be able to handle it anyhow. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
Re: [Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
On Thursday, 1 December 2016 14:35:07 CET Richard W.M. Jones wrote: > You can now use -o rhv (-o rhev is supported for compatibility). This LGTM -- the only concern is that "output:rhev" will disappear from the machine-readable output (and thus potentially breaking users). I have PoC for handling better aliases for input & output modules, I will polish and submit it. Thanks, -- Pino Toscano signature.asc Description: This is a digitally signed message part. ___ Libguestfs mailing list Libguestfs@redhat.com https://www.redhat.com/mailman/listinfo/libguestfs
[Libguestfs] [PATCH] v2v: Rename RHEV to RHV throughout.
You can now use -o rhv (-o rhev is supported for compatibility).
---
v2v/Makefile.am | 8 +-
v2v/OVF.ml| 30 +++
v2v/OVF.mli | 2 +-
v2v/changeuid.mli | 4 +-
v2v/cmdline.ml| 12 +--
v2v/convert_windows.ml| 2 +-
v2v/{output_rhev.ml => output_rhv.ml} | 26 +++---
v2v/{output_rhev.mli => output_rhv.mli} | 8 +-
v2v/output_vdsm.ml| 4 +-
v2v/test-harness/virt-v2v-test-harness.pod| 4 +-
v2v/test-v2v-no-copy.sh | 6 +-
v2v/{test-v2v-o-rhev.sh => test-v2v-o-rhv.sh} | 10 +--
v2v/types.mli | 2 +-
v2v/virt-v2v.pod | 110 +-
14 files changed, 116 insertions(+), 112 deletions(-)
rename v2v/{output_rhev.ml => output_rhv.ml} (90%)
rename v2v/{output_rhev.mli => output_rhv.mli} (83%)
rename v2v/{test-v2v-o-rhev.sh => test-v2v-o-rhv.sh} (95%)
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 5e3c3eb..2802056 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -49,7 +49,7 @@ SOURCES_MLI = \
output_local.mli \
output_null.mli \
output_qemu.mli \
- output_rhev.mli \
+ output_rhv.mli \
output_vdsm.mli \
OVF.mli \
target_bus_assignment.mli \
@@ -94,7 +94,7 @@ SOURCES_ML = \
output_libvirt.ml \
output_local.ml \
output_qemu.ml \
- output_rhev.ml \
+ output_rhv.ml \
output_vdsm.ml \
inspect_source.ml \
target_bus_assignment.ml \
@@ -283,7 +283,7 @@ TESTS += \
test-v2v-o-libvirt.sh \
test-v2v-o-null.sh \
test-v2v-o-qemu.sh \
- test-v2v-o-rhev.sh \
+ test-v2v-o-rhv.sh \
test-v2v-o-vdsm-options.sh \
test-v2v-oa-option.sh \
test-v2v-of-option.sh \
@@ -373,7 +373,7 @@ EXTRA_DIST += \
test-v2v-o-libvirt.sh \
test-v2v-o-null.sh \
test-v2v-o-qemu.sh \
- test-v2v-o-rhev.sh \
+ test-v2v-o-rhv.sh \
test-v2v-o-vdsm-options.sh \
test-v2v-oa-option.sh \
test-v2v-of-option.sh \
diff --git a/v2v/OVF.ml b/v2v/OVF.ml
index eea1e63..4c93c12 100644
--- a/v2v/OVF.ml
+++ b/v2v/OVF.ml
@@ -108,11 +108,11 @@ and get_ostype = function
| { i_type = "linux" } -> "OtherLinux"
| { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } ->
-"WindowsXP" (* no architecture differentiation of XP on RHEV *)
+"WindowsXP" (* no architecture differentiation of XP on RHV *)
| { i_type = "windows"; i_major_version = 5; i_minor_version = 2;
i_product_name = product } when String.find product "XP" >= 0 ->
-"WindowsXP" (* no architecture differentiation of XP on RHEV *)
+"WindowsXP" (* no architecture differentiation of XP on RHV *)
| { i_type = "windows"; i_major_version = 5; i_minor_version = 2;
i_arch = "i386" } ->
@@ -206,7 +206,7 @@ let origin_of_source_hypervisor = function
(* Generate the .meta file associated with each volume. *)
let create_meta_files output_alloc sd_uuid image_uuids targets =
(* Note: Upper case in the .meta, mixed case in the OVF. *)
- let output_alloc_for_rhev =
+ let output_alloc_for_rhv =
match output_alloc with
| Sparse -> "SPARSE"
| Preallocated -> "PREALLOCATED" in
@@ -220,12 +220,12 @@ let create_meta_files output_alloc sd_uuid image_uuids
targets =
ov.ov_virtual_size;
ov.ov_virtual_size /^ 512L in
- let format_for_rhev =
+ let format_for_rhv =
match t.target_format with
| "raw" -> "RAW"
| "qcow2" -> "COW"
| _ ->
- error (f_"RHEV does not support the output format '%s', only raw or
qcow2") t.target_format in
+ error (f_"RHV does not support the output format '%s', only raw or
qcow2") t.target_format in
let buf = Buffer.create 256 in
let bpf fs = bprintf buf fs in
@@ -239,8 +239,8 @@ let create_meta_files output_alloc sd_uuid image_uuids
targets =
bpf "LEGALITY=LEGAL\n";
bpf "POOL_UUID=\n";
bpf "SIZE=%Ld\n" size_in_sectors;
- bpf "FORMAT=%s\n" format_for_rhev;
- bpf "TYPE=%s\n" output_alloc_for_rhev;
+ bpf "FORMAT=%s\n" format_for_rhv;
+ bpf "TYPE=%s\n" output_alloc_for_rhv;
bpf "DESCRIPTION=%s\n" (String.replace generated_by "=" "_");
bpf "EOF\n";
Buffer.contents buf
@@ -329,7 +329,7 @@ let rec create_ovf source targets guestcaps inspect
e "rasd:ResourceType" [] [PCData "23"];
e "rasd:UsbPolicy" [] [PCData "Disabled"];
];
- (* We always add a qxl device when outputting to RHEV.
+ (* We always add a qxl device when outputting to RHV.
* See RHBZ#1213701 and RHBZ#1211231 for the reasoning
* behind that.
