10 a.m.
Currently -i libvirtxml mode only works for local files or NBD disks.
The purpose of NBD is to support virt-p2v.
This change adds support for network disks over http or https, ie:
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
<source protocol="http" name="/scratch/disk.img">
<host name="server.example.com" port="80"/>
</source>
<target dev='hda' bus='ide'/>
</disk>
This is just for testing. It's especially useful for exercising curl
support in qemu without requiring VMware to be available.
---
v2v/parse_libvirt_xml.ml | 51 +++++++++++++++++++++++++++++++++++++++---------
v2v/utils.ml | 15 ++++++++++++++
v2v/utils.mli | 3 +++
v2v/vCenter.ml | 16 +--------------
4 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml
index 4ac9b51a5..ed2266232 100644
--- a/v2v/parse_libvirt_xml.ml
+++ b/v2v/parse_libvirt_xml.ml
@@ -23,6 +23,7 @@ open Common_utils
open Types
open Xpath_helpers
+open Utils
type parsed_disk = {
p_source_disk : source_disk;
@@ -43,12 +44,38 @@ let get_drive_slot str offset =
warning (f_"could not parse device name ‘%s’ from the source libvirt
XML") str;
None
+(* Create a JSON URI for qemu referring to a remote CURL (http/https)
+ * resource. See also [v2v/vCenter.ml].
+ *)
+let create_curl_qemu_uri driver host port path =
+ let url =
+ let port =
+ match driver, port with
+ | _, None -> ""
+ | "https", Some 443 -> ""
+ | "http", Some 80 -> ""
+ | _, Some port when port >= 1 -> ":" ^ string_of_int port
+ | _, Some port -> invalid_arg "invalid port number in libvirt XML" in
+ sprintf "%s://%s%s%s" driver host port (uri_quote path) in
+
+ let json_params = [
+ "file.driver", JSON.String driver; (* "http" or
"https" *)
+ "file.url", JSON.String url;
+ "file.timeout", JSON.Int 2000;
+ "file.readahead", JSON.Int (1024 * 1024);
+ (* "file.sslverify", JSON.String "off"; XXX *)
+ ] in
+
+ (* Turn the JSON parameters into a 'json:' protocol string. *)
+ "json: " ^ JSON.string_of_doc json_params
+
let parse_libvirt_xml ?conn xml =
debug "libvirt xml is:\n%s" xml;
let doc = Xml.parse_memory xml in
let xpathctx = Xml.xpath_new_context doc in
let xpath_string = xpath_string xpathctx
+ and xpath_string_default = xpath_string_default xpathctx
and xpath_int = xpath_int xpathctx
(*and xpath_int_default = xpath_int_default xpathctx*)
and xpath_int64_default = xpath_int64_default xpathctx in
@@ -273,21 +300,27 @@ let parse_libvirt_xml ?conn xml =
| None -> ()
);
| Some "network" ->
- (* We only handle <source protocol="nbd"> here, and that is
- * intended only for virt-p2v.
- *)
(match (xpath_string "source/@protocol",
xpath_string "source/host/@name",
xpath_int "source/host/@port") with
| None, _, _ ->
- warning (f_"<disk type='%s'> was ignored")
"network"
+ warning (f_"<disk type='%s'> was ignored")
"network"
| Some "nbd", Some ("localhost" as host), Some port when port
> 0 ->
- (* virt-p2v: Generate a qemu nbd URL. *)
- let path = sprintf "nbd:%s:%d" host port in
- add_disk path format controller P_dont_rewrite
+ (* <source protocol="nbd"> with host localhost is used by
+ * virt-p2v. Generate a qemu 'nbd:' URL.
+ *)
+ let path = sprintf "nbd:%s:%d" host port in
+ add_disk path format controller P_dont_rewrite
+ | Some ("http"|"https" as driver), Some (_ as host), port
->
+ (* This is for testing curl, eg for testing VMware conversions
+ * without needing VMware around.
+ *)
+ let path = xpath_string_default "source/@name" "" in
+ let qemu_uri = create_curl_qemu_uri driver host port path in
+ add_disk qemu_uri format controller P_dont_rewrite
| Some protocol, _, _ ->
- warning (f_"<disk type='network'> with <source
protocol='%s'> was ignored")
- protocol
+ warning (f_"<disk type='network'> with <source
protocol='%s'> was ignored")
+ protocol
)
| Some "volume" ->
(match xpath_string "source/@pool", xpath_string
"source/@volume" with
diff --git a/v2v/utils.ml b/v2v/utils.ml
index e0275db53..e20159019 100644
--- a/v2v/utils.ml
+++ b/v2v/utils.ml
@@ -28,6 +28,21 @@ external drive_index : string -> int =
"v2v_utils_drive_index"
external shell_unquote : string -> string = "v2v_utils_shell_unquote"
+(* URI quoting. *)
+let uri_quote str =
+ let len = String.length str in
+ let xs = ref [] in
+ for i = 0 to len-1 do
+ xs :=
+ (match str.[i] with
+ | ('A'..'Z' | 'a'..'z' | '0'..'9' |
'/' | '.' | '-') as c ->
+ String.make 1 c
+ | c ->
+ sprintf "%%%02x" (Char.code c)
+ ) :: !xs
+ done;
+ String.concat "" (List.rev !xs)
+
(* Map guest architecture found by inspection to the architecture
* that KVM must emulate. Note for x86 we assume a 64 bit hypervisor.
*)
diff --git a/v2v/utils.mli b/v2v/utils.mli
index 4906f0023..47335cca5 100644
--- a/v2v/utils.mli
+++ b/v2v/utils.mli
@@ -29,6 +29,9 @@ val shell_unquote : string -> string
(like ones under /etc/sysconfig), and it doesn't deal with some
situations such as $variable interpolation. *)
+val uri_quote : string -> string
+(** Take a string and perform %xx escaping as used in some parts of URLs. *)
+
val kvm_arch : string -> string
(** Map guest architecture found by inspection to the architecture
that KVM must emulate. Note for x86 we assume a 64 bit hypervisor. *)
diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml
index 468261d3d..f21324611 100644
--- a/v2v/vCenter.ml
+++ b/v2v/vCenter.ml
@@ -22,21 +22,7 @@ open Common_utils
open Common_gettext.Gettext
open Xml
-
-(* URI quoting. *)
-let uri_quote str =
- let len = String.length str in
- let xs = ref [] in
- for i = 0 to len-1 do
- xs :=
- (match str.[i] with
- | ('A'..'Z' | 'a'..'z' | '0'..'9' |
'/' | '.' | '-') as c ->
- String.make 1 c
- | c ->
- sprintf "%%%02x" (Char.code c)
- ) :: !xs
- done;
- String.concat "" (List.rev !xs)
+open Utils
(* Memoized session cookie. *)
let session_cookie = ref ""
--
2.13.2