search for: uri_path

...n. --- v2v/input_vmx.ml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/v2v/input_vmx.ml b/v2v/input_vmx.ml index 5441bccb9..4a82a867f 100644 --- a/v2v/input_vmx.ml +++ b/v2v/input_vmx.ml @@ -61,6 +61,13 @@ let server_of_uri { Xml.uri_server } = let path_of_uri { Xml.uri_path } = match uri_path with None -> assert false | Some p -> p +let scp_supports_T_option = lazy ( + let cmd = "LANG=C scp -T |& grep \"unknown option\"" in + if verbose () then + eprintf "%s\n%!" cmd; + Sys.command cmd <> 0 +) + (* 'scp'...

On Friday, 8 December 2017 17:02:30 CET Richard W.M. Jones wrote: > This enhances the existing VMX input support allowing it to be > used over SSH to the ESXi server. > > The original command (for local .vmx files) was: > > $ virt-v2v -i vmx guest.vmx -o local -os /var/tmp > > Adding ‘-it ssh’ and using an SSH remote path gives the new syntax: > > $ virt-v2v \

...he guest's. *) + if architecture <> arch then + false + else + try + (* Ignore invalid URLs, and non-file ones. *) + (match Xml.parse_uri location with + | { Xml.uri_scheme = Some scheme; + Xml.uri_path = Some _ } when scheme = "file" -> true + | _ -> false + ) + with Invalid_argument _ -> false + ) (os#get_device_drivers ()) in + let uri = Xml.parse_uri driver.Libosinfo.location in + let dir = + match uri.Xml.uri_path with +...

...ibosinfo.architecture; location; pre_installable } -> + if architecture <> arch || not pre_installable then + false + else + try + (match Xml.parse_uri location with + | { Xml.uri_scheme = Some scheme; + Xml.uri_path = Some _ } when scheme = "file" -> true + | _ -> false + ) + with Invalid_argument _ -> false + ) drivers in + (* Sort the drivers by priority, like libosinfo does. *) + let drivers = + List.sort ( + fun { Libosinfo.prio...

Calculate dcPath correctly for vCenter conversions. Rich.

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

...let uri = Xml.parse_uri oc in + if uri.Xml.uri_scheme <> Some "https" then + error (f_"rhv-upload: -oc: URI must start with https://..."); + if uri.Xml.uri_server = None then + error (f_"rhv-upload: -oc: no remote server name in the URI"); + if uri.Xml.uri_path = None || uri.Xml.uri_path = Some "/" then + error (f_"rhv-upload: -oc: URI path component looks incorrect"); + let username = + match uri.Xml.uri_user with + | None -> + warning (f_"rhv-upload: -oc: username was missing from URI, assuming ‘admin@internal...

...let uri = Xml.parse_uri oc in + if uri.Xml.uri_scheme <> Some "https" then + error (f_"rhv-upload: -oc: URI must start with https://..."); + if uri.Xml.uri_server = None then + error (f_"rhv-upload: -oc: no remote server name in the URI"); + if uri.Xml.uri_path = None || uri.Xml.uri_path = Some "/" then + error (f_"rhv-upload: -oc: URI path component looks incorrect"); + let username = + match uri.Xml.uri_user with + | None -> + warning (f_"rhv-upload: -oc: username was missing from URI, assuming ‘admin@internal...

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.

...oc in > + if uri.Xml.uri_scheme <> Some "https" then > + error (f_"rhv-upload: -oc: URI must start with https://..."); > + if uri.Xml.uri_server = None then > + error (f_"rhv-upload: -oc: no remote server name in the URI"); > + if uri.Xml.uri_path = None || uri.Xml.uri_path = Some "/" then > + error (f_"rhv-upload: -oc: URI path component looks incorrect"); > + let username = > + match uri.Xml.uri_user with > + | None -> > + warning (f_"rhv-upload: -oc: username was missing from URI,...

This patch series integrates libosinfo in virt-v2v to get the list of files for Windows from libosinfo, if possible. The actual data is still from virtio-win, just unpacked. Pino Toscano (3): build: require libosinfo v2v: add a minimal libosinfo interface v2v: try to get windows driver files from libosinfo m4/guestfs-v2v.m4 | 3 + v2v/Makefile.am | 9 +-

...(doc, node) = node_ptr_unlink_node node +let unlink_node (doc, node_ptr) = node_ptr_unlink_node node_ptr type uri = { - uri_scheme : string option; - uri_opaque : string option; - uri_authority : string option; - uri_server : string option; - uri_user : string option; - uri_port : int; - uri_path : string option; - uri_fragment : string option; - uri_query_raw : string option; -} + uri_scheme : string option; + uri_opaque : string option; + uri_authority : string option; + uri_server : string option; + uri_user : string option; + uri_port : int; + uri_path : string op...

This patch series integrates libosinfo in virt-v2v to get the list of files for Windows from libosinfo, if possible. The actual data is still from virtio-win, just unpacked. Changes from v1: - adapt to use the priority in libosinfo 1.7.0+ - filter out non-pre-installable drivers - collect all the drivers matching the requirements, not just the first, sorting them by priority like libosinfo does

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.

...; then ( @@ -113,51 +113,6 @@ let get_session_cookie password scheme uri sslverify url = Some !session_cookie ) -let multiple_slash = PCRE.compile "/{2,}" -let default_dc = "ha-datacenter" - -let guess_dcPath uri = function - | "vpx" -> - (match uri.uri_path with - | None -> - warning (f_"vcenter: URI (-ic parameter) contains no path, so we cannot determine the dcPath (datacenter name)"); - default_dc - | Some path -> - (* vCenter: URIs are *usually* '/Folder/Datacenter/esxi' so we can -...

See earlier thread on libvir-list: https://www.redhat.com/archives/libvir-list/2015-September/thread.html#00201 Libvirt >= 1.2.20 supplies the correct dcPath parameter. If it is available in the libvirt XML, use it, otherwise fall back to the old method of trying to guess it from the vpx:// path. Patches 1, 2 and 4 are just refactoring around this change. Rich.

The first commit removes the --dcpath parameter, which just makes the following stuff simpler. Since libvirt has supported getting datacenterpath from VMware since Oct 2015, it's time to drop this hairy parameter. The rest is quite a complicated series of refactorings, followed by a very simple change to add handling of snapshots taken from old virt-v2v. Rich.