search for: rhv_cafil

...ut-rhv.pod | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index 24a289169..d08502826 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -28,7 +28,7 @@ open Types open Utils type rhv_options = { - rhv_cafile : string; + rhv_cafile : string option; rhv_cluster : string option; rhv_direct : bool; rhv_verifypeer : bool; @@ -76,15 +76,13 @@ let parse_output_options options = error (f_"-o rhv-upload: unknown output option ‘-oo %s’") k ) options; - let rhv_cafile = - mat...

...et_bus_assignment.ml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index d725ae022..c53d1703b 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -65,6 +65,8 @@ let parse_cmdline () = let output_password = ref None in let output_storage = ref None in let password_file = ref None in + let rhv_cafile = ref None in + let rhv_direct = ref false in let vddk_config = ref None in let vddk_cookie = ref None in let vddk_libdir = ref None in @@ -143,6 +145,8 @@ let parse_cmdline () = | "disk" | "local" -> output_mode := `Local | "null" -> output_...

This patch set is still for discussion only. See 3/3 for the current list of problems. However this will upload an image to an oVirt or RHV server, although you must have absolutely the latest snapshot version of 4.2 for it to work. Rich.

.../v2v/rhv-upload-plugin.py > +++ b/v2v/rhv-upload-plugin.py > @@ -207,8 +207,11 @@ def open(readonly): > else: > destination_url = urlparse(transfer.proxy_url) > > - context = ssl.create_default_context() > - context.load_verify_locations(cafile = params['rhv_cafile']) > This line was never needed. In imageio client we use: context = ssl.create_default_context( purpose=ssl.Purpose.SERVER_AUTH, cafile=cafile) if not secure: context.check_hostname = False context.verify_mode = ssl.CERT_NONE See https://github.com/oVirt...

...+ s_"Print target and stop"; > [ L"qemu-boot" ], Getopt.Set qemu_boot, s_"Boot in qemu (-o qemu only)"; > [ L"rhv-cafile" ], Getopt.String ("ca.pem", set_string_option_once "--rhv-cafile" rhv_cafile), > s_"For -o rhv-upload, set ‘ca.pem’ file"; > @@ -330,6 +334,7 @@ read the man page virt-v2v(1). > let output_storage = !output_storage in > let password_file = !password_file in > let print_source = !print_source in > +...

...db36 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -81,8 +81,6 @@ let parse_output_options options = let rhv_direct = !rhv_direct in let rhv_verifypeer = !rhv_verifypeer in let rhv_disk_uuids = Option.map List.rev !rhv_disk_uuids in - if rhv_verifypeer && rhv_cafile = None then - error (f_"-o rhv-upload: must use ‘-oo rhv-cafile’ to supply the path to the oVirt or RHV user’s ‘ca.pem’ file"); { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer; rhv_disk_uuids } -- 2.24.1

v2 -> v3: - Lots of code cleanups. - Documentation. However this is still spooling the file into a temporary before the upload. It turns out that fixing this is going to require a small change to qemu. Rich.

RHV was connecting to the VMware source in order to find out the virtual disk size of the source disk(s), duplicating logic that virt-v2v already provides. This makes that information available using a new ‘virt-v2v --print-target option’. Note in order to get all the information, this has to actually perform the conversion step, so it takes 30 seconds or so before we reach the point where the

Mainly minor fixes and code cleanups over the v4 patch. There are still several problems with this patch, but it is in a reviewable state, especially the Python code. Rich.

...cmdline.ml b/v2v/cmdline.ml > index d725ae022..c53d1703b 100644 > --- a/v2v/cmdline.ml > +++ b/v2v/cmdline.ml > @@ -65,6 +65,8 @@ let parse_cmdline () = > let output_password = ref None in > let output_storage = ref None in > let password_file = ref None in > + let rhv_cafile = ref None in > + let rhv_direct = ref false in > let vddk_config = ref None in > let vddk_cookie = ref None in > let vddk_libdir = ref None in > @@ -143,6 +145,8 @@ let parse_cmdline () = > | "disk" | "local" -> output_mode := `Local >...

...hex = "[a-fA-F0-9]" in >+ let str = sprintf "^%s{8}-%s{4}-%s{4}-%s{4}-%s{12}$" hex hex hex hex hex in >+ PCRE.compile str >+ ) in >+ if uuid = nil_uuid then false >+ else PCRE.matches rex_uuid uuid >+ > let parse_output_options options = > let rhv_cafile = ref None in > let rhv_cluster = ref None in >@@ -71,6 +81,8 @@ let parse_output_options options = > | "rhv-verifypeer", "" -> rhv_verifypeer := true > | "rhv-verifypeer", v -> rhv_verifypeer := bool_of_string v > | "rhv-disk-u...

...virt-v2v-copy-to-local diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index d725ae022..c53d1703b 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -65,6 +65,8 @@ let parse_cmdline () = let output_password = ref None in let output_storage = ref None in let password_file = ref None in + let rhv_cafile = ref None in + let rhv_direct = ref false in let vddk_config = ref None in let vddk_cookie = ref None in let vddk_libdir = ref None in @@ -143,6 +145,8 @@ let parse_cmdline () = | "disk" | "local" -> output_mode := `Local | "null" -> output_...

Fixes the majority of the pycodestyle issues in the Python scripts, and fix the existing test-v2v-python-syntax.sh to use pycodestyle to actually perform style checks. Pino Toscano (6): PEP 8: adapt whitespaces in lines PEP 8: move imports at the top PEP 8: adapt empty lines tests: find all the Python scripts for syntax checks -o rhv-upload: remove unused Python imports Revamp check

...2v/cmdline.ml <http://cmdline.ml> > +++ b/v2v/cmdline.ml <http://cmdline.ml> > @@ -65,6 +65,8 @@ let parse_cmdline () = >    let output_password = ref None in >    let output_storage = ref None in >    let password_file = ref None in > +  let rhv_cafile = ref None in > +  let rhv_direct = ref false in >    let vddk_config = ref None in >    let vddk_cookie = ref None in >    let vddk_libdir = ref None in > @@ -143,6 +145,8 @@ let parse_cmdline () = >      | "disk" | "local" -> o...

...cmdline.ml b/v2v/cmdline.ml > index d725ae022..c53d1703b 100644 > --- a/v2v/cmdline.ml > +++ b/v2v/cmdline.ml > @@ -65,6 +65,8 @@ let parse_cmdline () = > let output_password = ref None in > let output_storage = ref None in > let password_file = ref None in > + let rhv_cafile = ref None in > + let rhv_direct = ref false in > let vddk_config = ref None in > let vddk_cookie = ref None in > let vddk_libdir = ref None in > @@ -143,6 +145,8 @@ let parse_cmdline () = > | "disk" | "local" -> output_mode := `Local >...

v5 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00032.html There is only a single patch in this version because the other patches went upstream. This patch adds the virt-v2v -o rhv-upload mode (https://bugzilla.redhat.com/show_bug.cgi?id=1557273). Compared to v5, this adds the ability to make zero, trim and flush requests to the oVirt imageio server

...test-v2v-sound.xml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 14c5c0dca..1b3c10be8 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -67,6 +67,10 @@ let parse_cmdline () = let output_password = ref None in let output_storage = ref None in let password_file = ref None in + let rhv_cafile = ref None in + let rhv_cluster = ref None in + let rhv_direct = ref false in + let rhv_verifypeer = ref false in let vddk_config = ref None in let vddk_cookie = ref None in let vddk_libdir = ref None in @@ -145,6 +149,8 @@ let parse_cmdline () = | "disk" | "local&q...

This adds a test of -o rhv-upload. Obviously for an upstream test we cannot require a working oVirt server. This test works by faking the ovirtsdk4 Python module, setting PYTHONPATH so that the fake module is picked up instead of the real module (if installed). However it's more complex than that because the nbdkit plugin also expects to talk to a working imageio HTTPS server. Therefore

Previous versions: v3: https://www.redhat.com/archives/libguestfs/2018-March/msg00000.html v2: https://www.redhat.com/archives/libguestfs/2018-February/msg00177.html v1: https://www.redhat.com/archives/libguestfs/2018-February/msg00139.html This completely rethinks the approach taken by the previous patches. Instead of trying to involve qemu's curl driver, this uses a small Python 3

...ut_rhv_upload.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index f5e0e6b1c..d8f608cff 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -78,6 +78,7 @@ let parse_output_options options = { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } +let nbdkit_python_plugin = "python" let pidfile_timeout = 30 let finalization_timeout = 5*60 @@ -139,14 +140,14 @@ class output_rhv_upload output_alloc output_conn *) let error_unless_nbdkit_python_plugin_working () = let cmd...