search for: register_output_modul

..._list.register_input_module "local" diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 47da929..f2945ec 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -61,4 +61,7 @@ class output_local dir = object end let output_local = new output_local -let () = Modules_list.register_output_module "local" +let () = + Modules_list.register_output_module "local"; + (* Alias *) + Modules_list.register_output_module "disk" diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..bec5f44 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -282,...

...f --git a/v2v/modules_list.ml b/v2v/modules_list.ml index 36a08c0..5649b02 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -21,11 +21,28 @@ open Common_utils let input_modules = ref [] and output_modules = ref [] -let register_input_module name = push_front name input_modules -and register_output_module name = push_front name output_modules +let rec register_input_module ?alias name = register ?alias name input_modules +and register_output_module ?alias name = register ?alias name output_modules +and register ?alias name l = + push_front (name, false) l; + (match alias with + | None -> () +...

...it a/v2v/modules_list.ml b/v2v/modules_list.ml index 91b029b07..b7accc4f9 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -21,8 +21,15 @@ open Std_utils let input_modules = ref [] and output_modules = ref [] -let register_input_module name = List.push_front name input_modules -and register_output_module name = List.push_front name output_modules +(* Must match the regular expressions in p2v/ssh.c *) +let module_name_re = PCRE.compile ~anchored:true "[-\\w]+" + +let register_input_module name = + assert (PCRE.matches module_name_re name); + List.push_front name input_modules +and regis...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-June/msg00047.html v1 -> v2: - Add a regular expression in the virt-v2v modules code too. - - - I was planning a much more ambitious second version of this patch (half written too) which had: virt-v2v --describe-modules that listed a big chunk of XML which virt-p2v would parse. These would include the names of the

...ect source output rcaps = (* Get the data directory. *) let virt_tools_data_dir = try Sys.getenv "VIRT_TOOLS_DATA_DIR" diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index 13dfee2..3b3cf2e 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -27,9 +27,10 @@ and register_output_module name = push_front name output_modules let input_modules () = List.sort compare !input_modules and output_modules () = List.sort compare !output_modules +type inspection_fn = Types.inspect -> bool + type conversion_fn = - keep_serial_console:bool -> - Guestfs.guestfs -> Types.inspec...

...Name: volume-1\n"; + fpf " volumes:\n"; + fpf " - name: volume-1\n"; + fpf " persistentVolumeClaim:\n"; + fpf " name: %s-disk-1\n" name; + ) +end + +let output_kubevirt = new output_kubevirt +let () = Modules_list.register_output_module "kubevirt" diff --git a/v2v/output_kubevirt.mli b/v2v/output_kubevirt.mli new file mode 100644 index 000000000..3ff0041c7 --- /dev/null +++ b/v2v/output_kubevirt.mli @@ -0,0 +1,24 @@ +(* virt-v2v + * Copyright (C) 2018 Red Hat Inc. + * + * This program is free software; you can redistrib...

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

...let file = dir // name ^ ".json" in > + > + with_open_out file ( > + fun chan -> > + output_string chan doc_string; > + output_char chan '\n' > + ) > +end > + > +let output_json = new output_json > +let () = Modules_list.register_output_module "json" > diff --git a/v2v/output_json.mli b/v2v/output_json.mli > new file mode 100644 > index 000000000..52f58f2d1 > --- /dev/null > +++ b/v2v/output_json.mli > @@ -0,0 +1,31 @@ > +(* virt-v2v > + * Copyright (C) 2019 Red Hat Inc. > + * > + * This program i...

Fixes some of the more egregious problems with v1, and also applies properly to the head of git without needing any other patches. Rich.

...ot;") targets) + target_disk_ids + "vm" in + + (* Add the virtual machine. *) + create_virtual_machine run_python tmpdir conn output_password ovf + +end + +let output_rhv_upload = new output_rhv_upload +let () = Modules_list.register_output_module "rhv-upload" diff --git a/v2v/output_rhv_upload.mli b/v2v/output_rhv_upload.mli new file mode 100644 index 000000000..54999b727 --- /dev/null +++ b/v2v/output_rhv_upload.mli @@ -0,0 +1,26 @@ +(* virt-v2v + * Copyright (C) 2009-2018 Red Hat Inc. + * + * This program is free software; you...

...reate ?backingfile ?backingformat ?preallocation ?compat ?clustersize path format size; (* Make it sufficiently writable so that possibly root, or @@ -277,5 +277,5 @@ object delete_target_directory <- false end -let output_rhev = new output_rhev -let () = Modules_list.register_output_module "rhev" +let output_rhv = new output_rhv +let () = Modules_list.register_output_module "rhv" diff --git a/v2v/output_rhev.mli b/v2v/output_rhv.mli similarity index 83% rename from v2v/output_rhev.mli rename to v2v/output_rhv.mli index 27df737..71ddd0a 100644 --- a/v2v/output_rhe...

...reate ?backingfile ?backingformat ?preallocation ?compat ?clustersize path format size; (* Make it sufficiently writable so that possibly root, or @@ -277,5 +277,5 @@ object delete_target_directory <- false end -let output_rhev = new output_rhev -let () = Modules_list.register_output_module "rhev" +let output_rhv = new output_rhv +let () = Modules_list.register_output_module "rhv" diff --git a/v2v/output_rhev.mli b/v2v/output_rhv.mli similarity index 83% rename from v2v/output_rhev.mli rename to v2v/output_rhv.mli index 27df737..71ddd0a 100644 --- a/v2v/output_rhe...

v2: - Fix virt-p2v messages too. Rich.

...vol_uuids + vm_uuid + OVirt in + + (* Add the virtual machine. *) + create_virtual_machine run_python tmpdir conn output_password ovf + +end + +let output_rhv_upload = new output_rhv_upload +let () = Modules_list.register_output_module "rhv-upload" diff --git a/v2v/output_rhv_upload.mli b/v2v/output_rhv_upload.mli new file mode 100644 index 000000000..3e7086f85 --- /dev/null +++ b/v2v/output_rhv_upload.mli @@ -0,0 +1,27 @@ +(* virt-v2v + * Copyright (C) 2009-2018 Red Hat Inc. + * + * This program is free software; you...

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.

...target_disk_ids > + "vm" in > + > + (* Add the virtual machine. *) > + create_virtual_machine run_python tmpdir conn output_password ovf > + > +end > + > +let output_rhv_upload = new output_rhv_upload > +let () = Modules_list.register_output_module "rhv-upload" > diff --git a/v2v/output_rhv_upload.mli b/v2v/output_rhv_upload.mli > new file mode 100644 > index 000000000..54999b727 > --- /dev/null > +++ b/v2v/output_rhv_upload.mli > @@ -0,0 +1,26 @@ > +(* virt-v2v > + * Copyright (C) 2009-2018 Red Hat Inc. &gt...

...ot;; + ); + + let name = source.s_name in + let file = dir // name ^ ".json" in + + with_open_out file ( + fun chan -> + output_string chan doc_string; + output_char chan '\n' + ) +end + +let output_json = new output_json +let () = Modules_list.register_output_module "json" diff --git a/v2v/output_json.mli b/v2v/output_json.mli new file mode 100644 index 000000000..52f58f2d1 --- /dev/null +++ b/v2v/output_json.mli @@ -0,0 +1,31 @@ +(* virt-v2v + * Copyright (C) 2019 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or mo...

...ot;; + ); + + let name = source.s_name in + let file = dir // name ^ ".json" in + + with_open_out file ( + fun chan -> + output_string chan doc_string; + output_char chan '\n' + ) +end + +let output_json = new output_json +let () = Modules_list.register_output_module "json" diff --git a/v2v/output_json.mli b/v2v/output_json.mli new file mode 100644 index 000000000..52f58f2d1 --- /dev/null +++ b/v2v/output_json.mli @@ -0,0 +1,31 @@ +(* virt-v2v + * Copyright (C) 2019 Red Hat Inc. + * + * This program is free software; you can redistribute it and/or mo...

The first four patches are straightforward. The final patch adds the -o rhv-upload output mode. It is still spooling into a temporary file because I've had some trouble getting streaming conversions working. There are other problems as outlined in the commit message, so this patch is not ready for upstream but is good for discussion. Also I hit this, which I'm assuming for now will be

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with