search for: set_string_option_once

This makes them visible in the help text of -i and -o. --- v2v/input_disk.ml | 5 ++++- v2v/output_local.ml | 5 ++++- v2v/output_rhev.ml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..508f16a 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -101,4 +101,7 @@ class input_disk input_format disk = object

...Getopt.String ("in:out", add_bridge), s_"Map bridge 'in' to 'out'"; - [ "--compressed" ], Getopt.Set compressed, s_"Compress output file"; - [ "--dcpath"; "--dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath), + [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge 'in' to 'out'"; + [ L"compressed" ], Getopt.Set compressed, s_"Compress output file"; + [ L&quo...

...-> - error (f_"unknown -oa option: %s") s + | s -> assert false (* Already checked by Getopt.Symbol. *) in let root_choice = ref AskRoot in @@ -171,7 +170,7 @@ let parse_cmdline () = [ L"dcpath"; L"dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath), s_"Override dcPath (for vCenter)"; [ L"debug-overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; - [ S 'i' ], Getopt.String (i_opti...

...-> - error (f_"unknown -oa option: %s") s + | _ -> assert false (* Already checked by Getopt.Symbol. *) in let root_choice = ref AskRoot in @@ -171,7 +168,7 @@ let parse_cmdline () = [ L"dcpath"; L"dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath), s_"Override dcPath (for vCenter)"; [ L"debug-overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; - [ S 'i' ], Getopt.String (i_opti...

...out " ^ s_"Map bridge 'in' to 'out'"; - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; - "--dcpath", Arg.String (set_string_option_once "--dcpath" dcpath), - "path " ^ s_"Override dcPath (for vCenter)"; - "--dcPath", Arg.String (set_string_option_once "--dcPath" dcpath), - "path " ^ d...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

...n @@ -156,6 +157,8 @@ let rec main () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge ?in? to ?out?"; + [ L"block-driver" ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'virtio-scsi'"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"...

...n @@ -156,6 +157,8 @@ let rec main () = let argspec = [ [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge ?in? to ?out?"; + [ L"block-driver" ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'virtio-scsi'"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"...

...(* default "." *) - - let vdsm_compat = ref "0.10" in - let set_vdsm_compat s = vdsm_compat := s in - - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in - let set_vdsm_ovf_flavour arg = - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in let set_string_option_once optname optref arg = match !optref with @@ -110,6 +92,15 @@ let parse_cmdline () = error (f_"unknown -i option: %s") s in + let input_options = ref [] in + let set_input_option_compat k v = + input_options := (k, v) :: !input_options + in + let set_input_option opt...

Proposed small change to the command line of virt-v2v when specifying that you want VDDK mode. Rich.

..."Map bridge 'in' to 'out'"; > - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; > - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; > - "--dcpath", Arg.String (set_string_option_once "--dcpath" dcpath), > - "path " ^ s_"Override dcPath (for vCenter)"; > - "--dcPath", Arg.String (set_string_option_once "--dcPath" dcpath), > - "...

...et vdsm_compat = ref "0.10" in > - let set_vdsm_compat s = vdsm_compat := s in > - > - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in > - let set_vdsm_ovf_flavour arg = > - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in > > let set_string_option_once optname optref arg = > match !optref with > @@ -110,6 +92,15 @@ let parse_cmdline () = > error (f_"unknown -i option: %s") s > in > > + let input_options = ref [] in > + let set_input_option_compat k v = > + input_options := (k, v) :: !input_o...

This patch isn't quite complete (see ‘assert false’). Currently we have a bunch of ad hoc options like --vddk* and --vdsm* (and proposed to add --rhv*) to handle extra parameters for input and output modes/transports. This complicates the command line parsing and also the clarity of the command line (becauseit's not very obvious which options apply to which side of the conversion).

..._libdir = ref None in let vddk_nfchostport = ref None in let vddk_port = ref None in let vddk_snapshot = ref None in @@ -191,6 +192,8 @@ let parse_cmdline () = s_"Libvirt URI"; [ M"if" ], Getopt.String ("format", set_string_option_once "-if" input_format), s_"Input format (for -i disk)"; + [ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport), + s_"Input transport&q...

Use -ip instead of --password-file, and various refactorings. It strikes me that we should probably deprecate and eventually remove virt-v2v-copy-to-local. With the introduction of the new SSH and VDDK transports, and with RHEL 5 Xen becoming more irrelevant, it's no longer needed. Rich.

Extend Modules_list to handle also aliases for input and output modules, and use this to register the existing aliases. --- v2v/input_disk.ml | 2 +- v2v/modules_list.ml | 25 +++++++++++++++++++++---- v2v/modules_list.mli | 8 ++++---- v2v/output_local.ml | 2 +- v2v/output_rhev.ml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/v2v/input_disk.ml

...out " ^ s_"Map bridge 'in' to 'out'"; - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; - "--dcpath", Arg.String (set_string_option_once "--dcpath" dcpath), - "path " ^ s_"Override dcPath (for vCenter)"; - "--dcPath", Arg.String (set_string_option_once "--dcPath" dcpath), - "path " ^ d...

...out " ^ s_"Map bridge 'in' to 'out'"; - "--bridge", Arg.String add_bridge, "in:out " ^ ditto; - "--compressed", Arg.Set compressed, " " ^ s_"Compress output file"; - "--dcpath", Arg.String (set_string_option_once "--dcpath" dcpath), - "path " ^ s_"Override dcPath (for vCenter)"; - "--dcPath", Arg.String (set_string_option_once "--dcPath" dcpath), - "path " ^ d...