Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] v2v: -i libvirtxml: Map empty network or bridge name to a default (RHBZ#1257895).
When importing from VMware via the libvirt driver, the libvirt driver
can add an empty source bridge name:
<interface type='bridge'>
<mac address='00:01:02:03:04:05:06'/>
<source bridge=''/>
</interface>
Replicate what we do on the -i ova path, and map these to "eth0",
"eth1" etc.
This also includes a bunch of changes to how we do xpath parsing to
make it type-safe.
Rich.
Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] [PATCH 1/5] v2v: Add convenience functions for parsing xpath expressions.
--- v2v/Makefile.am | 2 +- v2v/utils.ml | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 93d225b..fc893bd 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -69,8 +69,8 @@ SOURCES_MLI = \ SOURCES_ML = \ stringMap.ml \ types.ml \ - utils.ml \ xml.ml \ + utils.ml \ domainxml.ml \ DOM.ml \ kvmuid.ml \ diff --git a/v2v/utils.ml b/v2v/utils.ml index 4e6befc..e07f7a9 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -58,6 +58,40 @@ let uri_quote str done; String.concat "" (List.rev !xs) +(* Parse an xpath expression and return a string/int. Returns + * Some v or None if the expression doesn't match. + *) +let xpath_string xpathctx expr + let obj = Xml.xpath_eval_expression xpathctx expr in + if Xml.xpathobj_nr_nodes obj < 1 then None + else ( + let node = Xml.xpathobj_node obj 0 in + Some (Xml.node_as_string node) + ) +let xpath_int xpathctx expr + let obj = Xml.xpath_eval_expression xpathctx expr in + if Xml.xpathobj_nr_nodes obj < 1 then None + else ( + let node = Xml.xpathobj_node obj 0 in + let str = Xml.node_as_string node in + try Some (int_of_string str) + with Failure "int_of_string" -> + error (f_"expecting XML expression to return an integer (expression: %s, matching string: %s)") + expr str + ) + +(* Parse an xpath expression and return a string/int; if the expression + * doesn't match, return the default. + *) +let xpath_string_default xpathctx expr default + match xpath_string xpathctx expr with + | None -> default + | Some s -> s +let xpath_int_default xpathctx expr default + match xpath_int xpathctx expr with + | None -> default + | Some i -> i + external drive_name : int -> string = "v2v_utils_drive_name" external drive_index : string -> int = "v2v_utils_drive_index" -- 2.5.0
Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] [PATCH 2/5] v2v: -i libvirtxml: Convert xpath_to_* to use xpath convenience functions.
---
v2v/input_libvirtxml.ml | 284 +++++++++++++++++++++++-------------------------
1 file changed, 133 insertions(+), 151 deletions(-)
diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml
index 653bfc5..b464857 100644
--- a/v2v/input_libvirtxml.ml
+++ b/v2v/input_libvirtxml.ml
@@ -52,39 +52,23 @@ let parse_libvirt_xml ?conn xml
let doc = Xml.parse_memory xml in
let xpathctx = Xml.xpath_new_context doc in
+ let xpath_string = xpath_string xpathctx
+ and xpath_int = xpath_int xpathctx
+ and xpath_int_default = xpath_int_default xpathctx in
- let xpath_to_string expr default - let obj = Xml.xpath_eval_expression
xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- Xml.node_as_string node
- )
- and xpath_to_int expr default - let obj = Xml.xpath_eval_expression
xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- let str = Xml.node_as_string node in
- try int_of_string str
- with Failure "int_of_string" ->
- error (f_"expecting XML expression to return an integer
(expression: %s)")
- expr
- )
- in
-
- let hypervisor = xpath_to_string "/domain/@type" "" in
- let name = xpath_to_string "/domain/name/text()" "" in
- let memory = xpath_to_int "/domain/memory/text()" (1024 * 1024) in
+ let hypervisor + match xpath_string "/domain/@type" with
+ | Some s -> source_hypervisor_of_string s
+ | None ->
+ error (f_"in the libvirt XML metadata, <domain
type='...'> is missing or empty") in
+ let name + match xpath_string "/domain/name/text()" with
+ | Some s -> s
+ | None ->
+ error (f_"in the libvirt XML metadata, <name> is missing or
empty") in
+ let memory = xpath_int_default "/domain/memory/text()" (1024 *
1024) in
let memory = Int64.of_int memory *^ 1024L in
- let vcpu = xpath_to_int "/domain/vcpu/text()" 1 in
-
- if hypervisor = "" then
- error (f_"in the libvirt XML metadata, <domain
type='...'> is missing or empty");
- let hypervisor = source_hypervisor_of_string hypervisor in
-
- if name = "" then
- error (f_"in the libvirt XML metadata, <name> is missing or
empty");
+ let vcpu = xpath_int_default "/domain/vcpu/text()" 1 in
let features let features = ref [] in
@@ -104,54 +88,53 @@ let parse_libvirt_xml ?conn xml (* Ignore everything
except the first <graphics> device. *)
let node = Xml.xpathobj_node obj 0 in
Xml.xpathctx_set_current_context xpathctx node;
- let keymap - match xpath_to_string "@keymap"
"" with "" -> None | k -> Some k in
- let password - match xpath_to_string "@passwd"
"" with "" -> None | pw -> Some pw in
+ let keymap = xpath_string "@keymap" in
+ let password = xpath_string "@passwd" in
let listen let obj = Xml.xpath_eval_expression xpathctx
"listen" in
let nr_nodes = Xml.xpathobj_nr_nodes obj in
if nr_nodes < 1 then (
- match xpath_to_string "@listen" "" with
"" -> LNone | a -> LAddress a
+ match xpath_string "@listen" with
+ | None -> LNone | Some a -> LAddress a
) else (
(* Use only the first <listen> configuration. *)
- match xpath_to_string "listen[1]/@type" "" with
- | "" -> LNone
- | "address" ->
- (match xpath_to_string "listen[1]/@address" ""
with
- | "" -> LNone
- | a -> LAddress a
+ match xpath_string "listen[1]/@type" with
+ | None -> LNone
+ | Some "address" ->
+ (match xpath_string "listen[1]/@address" with
+ | None -> LNone
+ | Some a -> LAddress a
)
- | "network" ->
- (match xpath_to_string "listen[1]/@network" ""
with
- | "" -> LNone
- | n -> LNetwork n
+ | Some "network" ->
+ (match xpath_string "listen[1]/@network" with
+ | None -> LNone
+ | Some n -> LNetwork n
)
- | t ->
+ | Some t ->
warning (f_"<listen type='%s'> in the input
libvirt XML was ignored") t;
LNone
) in
let port - match xpath_to_string "@autoport"
"yes" with
- | "no" ->
- let port = xpath_to_int "@port" (-1) in
- if port >= 0 then Some port
- else None
+ match xpath_string "@autoport" with
+ | Some "no" ->
+ (match xpath_int "@port" with
+ | Some port when port > 0 -> Some port
+ | Some _ | None -> None)
| _ -> None in
- match xpath_to_string "@type" "" with
- | "" -> None
- | "vnc" ->
+ match xpath_string "@type" with
+ | None -> None
+ | Some "vnc" ->
Some { s_display_type = VNC;
s_keymap = keymap; s_password = password; s_listen = listen;
s_port = port }
- | "spice" ->
+ | Some "spice" ->
Some { s_display_type = Spice;
s_keymap = keymap; s_password = password; s_listen = listen;
s_port = port }
- | "sdl"|"desktop" as t ->
+ | Some ("sdl"|"desktop" as t) ->
warning (f_"virt-v2v does not support local displays, so
<graphics type='%s'> in the input libvirt XML was ignored")
t;
None
- | t ->
+ | Some t ->
warning (f_"display <graphics type='%s'> in the
input libvirt XML was ignored") t;
None
) in
@@ -166,16 +149,16 @@ let parse_libvirt_xml ?conn xml let node =
Xml.xpathobj_node obj 0 in
Xml.xpathctx_set_current_context xpathctx node;
- match xpath_to_string "@model" "" with
- | "" -> None
- | "ac97" -> Some { s_sound_model = AC97 }
- | "es1370" -> Some { s_sound_model = ES1370 }
- | "ich6" -> Some { s_sound_model = ICH6 }
- | "ich9" -> Some { s_sound_model = ICH9 }
- | "pcspk" -> Some { s_sound_model = PCSpeaker }
- | "sb16" -> Some { s_sound_model = SB16 }
- | "usb" -> Some { s_sound_model = USBAudio }
- | model ->
+ match xpath_string "@model" with
+ | None -> None
+ | Some "ac97" -> Some { s_sound_model = AC97 }
+ | Some "es1370" -> Some { s_sound_model = ES1370 }
+ | Some "ich6" -> Some { s_sound_model = ICH6 }
+ | Some "ich9" -> Some { s_sound_model = ICH9 }
+ | Some "pcspk" -> Some { s_sound_model = PCSpeaker }
+ | Some "sb16" -> Some { s_sound_model = SB16 }
+ | Some "usb" -> Some { s_sound_model = USBAudio }
+ | Some model ->
warning (f_"unknown sound model %s ignored") model;
None
) in
@@ -206,80 +189,79 @@ let parse_libvirt_xml ?conn xml
Xml.xpathctx_set_current_context xpathctx node;
let controller - let target_bus = xpath_to_string
"target/@bus" "" in
+ let target_bus = xpath_string "target/@bus" in
match target_bus with
- | "" -> None
- | "ide" -> Some Source_IDE
- | "scsi" -> Some Source_SCSI
- | "virtio" -> Some Source_virtio_blk
- | _ -> None in
+ | None -> None
+ | Some "ide" -> Some Source_IDE
+ | Some "scsi" -> Some Source_SCSI
+ | Some "virtio" -> Some Source_virtio_blk
+ | Some _ -> None in
let format - match xpath_to_string "driver/@type"
"" with
- | "aio" -> Some "raw" (* Xen wierdness *)
- | "" -> None
- | format -> Some format in
+ match xpath_string "driver/@type" with
+ | Some "aio" -> Some "raw" (* Xen wierdness *)
+ | None -> None
+ | Some format -> Some format in
(* The <disk type='...'> attribute may be 'block',
'file',
* 'network' or 'volume'. We ignore any other types.
*)
- match xpath_to_string "@type" "" with
- | "block" ->
- let path = xpath_to_string "source/@dev" "" in
- if path <> "" then
- add_disk path format controller (P_source_dev path)
- | "file" ->
- let path = xpath_to_string "source/@file" "" in
- if path <> "" then
- add_disk path format controller (P_source_file path)
- | "network" ->
+ match xpath_string "@type" with
+ | None ->
+ warning (f_"<disk> element with no type attribute
ignored")
+ | Some "block" ->
+ (match xpath_string "source/@dev" with
+ | Some path ->
+ add_disk path format controller (P_source_dev path)
+ | None -> ()
+ );
+ | Some "file" ->
+ (match xpath_string "source/@file" with
+ | Some path ->
+ add_disk path format controller (P_source_file path)
+ | None -> ()
+ );
+ | Some "network" ->
(* We only handle <source protocol="nbd"> here, and
that is
* intended only for virt-p2v.
*)
- (match (xpath_to_string "source/@protocol" "",
- xpath_to_string "source/host/@name" "",
- xpath_to_int "source/host/@port" 0) with
- | "", _, _ ->
+ (match (xpath_string "source/@protocol",
+ xpath_string "source/host/@name",
+ xpath_int "source/host/@port") with
+ | None, _, _ ->
warning (f_"<disk type=network> was ignored")
- | "nbd", ("localhost" as host), port when port >
0 ->
+ | 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
- | protocol, _, _ ->
+ | Some protocol, _, _ ->
warning (f_"<disk type='network'> with <source
protocol='%s'> was ignored")
protocol
)
- | "volume" ->
- let pool = xpath_to_string "source/@pool" "" in
- let vol = xpath_to_string "source/@volume" "" in
- if pool <> "" && vol <> "" then
(
+ | Some "volume" ->
+ (match xpath_string "source/@pool", xpath_string
"source/@volume" with
+ | None, None | Some _, None | None, Some _ -> ()
+ | Some pool, Some vol ->
let xml = Domainxml.vol_dumpxml ?conn pool vol in
let doc = Xml.parse_memory xml in
let xpathctx = Xml.xpath_new_context doc in
-
- let xpath_to_string expr default - let obj =
Xml.xpath_eval_expression xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- Xml.node_as_string node
- ) in
+ let xpath_string = Utils.xpath_string xpathctx in
(* Use the format specified in the volume itself. *)
- let format - match xpath_to_string
"/volume/target/format/@type" "" with
- | "" -> None
- | format -> Some format in
+ let format = xpath_string "/volume/target/format/@type" in
- match xpath_to_string "/volume/@type" "" with
- | "" | "file" ->
- let path = xpath_to_string "/volume/target/path/text()"
"" in
- if path <> "" then
- add_disk path format controller (P_source_file path)
- | vol_type ->
+ (match xpath_string "/volume/@type" with
+ | None | Some "file" ->
+ (match xpath_string "/volume/target/path/text()" with
+ | Some path ->
+ add_disk path format controller (P_source_file path)
+ | None -> ()
+ );
+ | Some vol_type ->
warning (f_"<disk type='volume'> with <volume
type='%s'> was ignored") vol_type
+ )
)
- | disk_type ->
+ | Some disk_type ->
warning (f_"<disk type='%s'> was ignored")
disk_type
done;
get_disks () in
@@ -296,30 +278,30 @@ let parse_libvirt_xml ?conn xml
Xml.xpathctx_set_current_context xpathctx node;
let controller - let target_bus = xpath_to_string
"target/@bus" "" in
+ let target_bus = xpath_string "target/@bus" in
match target_bus with
- | "" -> None
- | "ide" -> Some Source_IDE
- | "scsi" -> Some Source_SCSI
- | "virtio" -> Some Source_virtio_blk
- | _ -> None in
+ | None -> None
+ | Some "ide" -> Some Source_IDE
+ | Some "scsi" -> Some Source_SCSI
+ | Some "virtio" -> Some Source_virtio_blk
+ | Some _ -> None in
let slot - let target_dev = xpath_to_string
"target/@dev" "" in
+ let target_dev = xpath_string "target/@dev" in
match target_dev with
- | "" -> None
- | s when string_prefix s "hd" -> get_drive_slot s 2
- | s when string_prefix s "sd" -> get_drive_slot s 2
- | s when string_prefix s "vd" -> get_drive_slot s 2
- | s when string_prefix s "xvd" -> get_drive_slot s 3
- | s ->
+ | None -> None
+ | Some s when string_prefix s "hd" -> get_drive_slot s 2
+ | Some s when string_prefix s "sd" -> get_drive_slot s 2
+ | Some s when string_prefix s "vd" -> get_drive_slot s 2
+ | Some s when string_prefix s "xvd" -> get_drive_slot s 3
+ | Some s ->
warning (f_"<target dev='%s'> was ignored because
the device name could not be recognized") s;
None in
let typ - match xpath_to_string "@device" ""
with
- | "cdrom" -> CDROM
- | "floppy" -> Floppy
+ match xpath_string "@device" with
+ | Some "cdrom" -> CDROM
+ | Some "floppy" -> Floppy
| _ -> assert false (* libxml2 error? *) in
let disk @@ -339,31 +321,31 @@ let parse_libvirt_xml ?conn xml let
node = Xml.xpathobj_node obj i in
Xml.xpathctx_set_current_context xpathctx node;
- let mac = xpath_to_string "mac/@address" "" in
+ let mac = xpath_string "mac/@address" in
let mac match mac with
- | ""
- | "00:00:00:00:00:00" (* thanks, VMware *) -> None
- | mac -> Some mac in
+ | None
+ | Some "00:00:00:00:00:00" (* thanks, VMware *) -> None
+ | Some mac -> Some mac in
let vnet_type - match xpath_to_string "@type"
"" with
- | "network" -> Some Network
- | "bridge" -> Some Bridge
- | _ -> None in
+ match xpath_string "@type" with
+ | Some "network" -> Some Network
+ | Some "bridge" -> Some Bridge
+ | None | Some _ -> None in
match vnet_type with
| None -> ()
| Some vnet_type ->
- let vnet = xpath_to_string "source/@network | source/@bridge"
"" in
- if vnet <> "" then (
- let nic = {
- s_mac = mac;
- s_vnet = vnet;
- s_vnet_orig = vnet;
- s_vnet_type = vnet_type
- } in
- nics := nic :: !nics
- )
+ match xpath_string "source/@network | source/@bridge" with
+ | None -> ()
+ | Some vnet ->
+ let nic = {
+ s_mac = mac;
+ s_vnet = vnet;
+ s_vnet_orig = vnet;
+ s_vnet_type = vnet_type
+ } in
+ nics := nic :: !nics
done;
List.rev !nics in
--
2.5.0
Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] [PATCH 3/5] v2v: -i libvirtxml: Map empty network or bridge name to default (RHBZ#1257895).
As with the -i ova driver, if an unnamed network is found, map it to
"eth0", "eth1" etc.
---
v2v/input_libvirtxml.ml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml
index b464857..8c913a5 100644
--- a/v2v/input_libvirtxml.ml
+++ b/v2v/input_libvirtxml.ml
@@ -336,9 +336,7 @@ let parse_libvirt_xml ?conn xml match vnet_type with
| None -> ()
| Some vnet_type ->
- match xpath_string "source/@network | source/@bridge" with
- | None -> ()
- | Some vnet ->
+ let add_nic vnet let nic = {
s_mac = mac;
s_vnet = vnet;
@@ -346,6 +344,16 @@ let parse_libvirt_xml ?conn xml s_vnet_type =
vnet_type
} in
nics := nic :: !nics
+ in
+ match xpath_string "source/@network | source/@bridge" with
+ | None -> ()
+ | Some "" ->
+ (* The libvirt VMware driver produces at least <source
+ * bridge=''/> XML - see RHBZ#1257895.
+ *)
+ add_nic (sprintf "eth%d" i)
+ | Some vnet ->
+ add_nic vnet
done;
List.rev !nics in
--
2.5.0
Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] [PATCH 4/5] v2v: -o libvirt: Convert xpath_to_* to use xpath convenience functions.
---
v2v/output_libvirt.ml | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml
index f5d82b0..0255e15 100644
--- a/v2v/output_libvirt.ml
+++ b/v2v/output_libvirt.ml
@@ -342,23 +342,18 @@ class output_libvirt oc output_pool = object
let xml = Domainxml.pool_dumpxml ?conn:oc output_pool in
let doc = Xml.parse_memory xml in
let xpathctx = Xml.xpath_new_context doc in
-
- let xpath_to_string expr default - let obj = Xml.xpath_eval_expression
xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- Xml.node_as_string node
- )
- in
+ let xpath_string = xpath_string xpathctx in
(* We can only output to a pool of type 'dir' (directory). *)
- let pool_type = xpath_to_string "/pool/@type" "" in
- if pool_type <> "dir" then
+ if xpath_string "/pool/@type" <> Some "dir" then
error (f_"-o libvirt: output pool '%s' is not a directory
(type='dir'). See virt-v2v(1) section \"OUTPUT TO
LIBVIRT\"") output_pool;
- let target_path = xpath_to_string "/pool/target/path/text()"
"" in
- if target_path = "" || not (is_directory target_path) then
- error (f_"-o libvirt: output pool '%s' has
type='dir' but the /pool/target/path element either does not exist or is
not a local directory. See virt-v2v(1) section \"OUTPUT TO
LIBVIRT\"") output_pool;
+ let target_path + match xpath_string
"/pool/target/path/text()" with
+ | None ->
+ error (f_"-o libvirt: output pool '%s' does not have
/pool/target/path element. See virt-v2v(1) section \"OUTPUT TO
LIBVIRT\"") output_pool
+ | Some dir when not (is_directory dir) ->
+ error (f_"-o libvirt: output pool '%s' has
type='dir' but the /pool/target/path element is not a local directory.
See virt-v2v(1) section \"OUTPUT TO LIBVIRT\"") output_pool
+ | Some dir -> dir in
(* Set up the targets. *)
List.map (
--
2.5.0
Richard W.M. Jones
2015-Aug-28 13:19 UTC
[Libguestfs] [PATCH 5/5] v2v: -i ova: Convert xpath_to_* to use xpath convenience functions.
---
v2v/input_ova.ml | 88 ++++++++++++++++++++++++++------------------------------
1 file changed, 40 insertions(+), 48 deletions(-)
diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index d640d4a..aeb7ae6 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -180,41 +180,27 @@ object
Xml.xpath_register_ns xpathctx
"vssd"
"http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData";
- let xpath_to_string expr default - let obj = Xml.xpath_eval_expression
xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- Xml.node_as_string node
- )
- and xpath_to_int expr default - let obj = Xml.xpath_eval_expression
xpathctx expr in
- if Xml.xpathobj_nr_nodes obj < 1 then default
- else (
- let node = Xml.xpathobj_node obj 0 in
- let str = Xml.node_as_string node in
- try int_of_string str
- with Failure "int_of_string" ->
- error (f_"expecting XML expression to return an integer
(expression: %s)")
- expr
- )
- in
+ let xpath_string = xpath_string xpathctx
+ and xpath_int = xpath_int xpathctx
+ and xpath_string_default = xpath_string_default xpathctx
+ and xpath_int_default = xpath_int_default xpathctx in
(* Search for vm name. *)
let name - xpath_to_string
"/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" "" in
- if name = "" then
- error (f_"could not parse ovf:Name from OVF document");
+ match xpath_string
"/ovf:Envelope/ovf:VirtualSystem/ovf:Name/text()" with
+ | None | Some "" ->
+ error (f_"could not parse ovf:Name from OVF document")
+ | Some name -> name in
(* Search for memory. *)
- let memory = xpath_to_int
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType/text()=4]/rasd:VirtualQuantity/text()"
(1024 * 1024) in
+ let memory = xpath_int_default
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType/text()=4]/rasd:VirtualQuantity/text()"
(1024 * 1024) in
let memory = Int64.of_int (memory * 1024 * 1024) in
(* Search for number of vCPUs. *)
- let vcpu = xpath_to_int
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType/text()=3]/rasd:VirtualQuantity/text()"
1 in
+ let vcpu = xpath_int_default
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:ResourceType/text()=3]/rasd:VirtualQuantity/text()"
1 in
(* BIOS or EFI firmware? *)
- let firmware = xpath_to_string
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/vmw:Config[@vmw:key=\"firmware\"]/@vmw:value"
"bios" in
+ let firmware = xpath_string_default
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/vmw:Config[@vmw:key=\"firmware\"]/@vmw:value"
"bios" in
let firmware match firmware with
| "bios" -> BIOS
@@ -225,16 +211,16 @@ object
(* Helper function to return the parent controller of a disk. *)
let parent_controller id let expr = sprintf
"/ovf:Envelope/ovf:VirtualSystem/ovf:VirtualHardwareSection/ovf:Item[rasd:InstanceID/text()=%d]/rasd:ResourceType/text()"
id in
- let controller = xpath_to_int expr 0 in
+ let controller = xpath_int expr in
(* 6: iscsi controller, 5: ide *)
match controller with
- | 6 -> Some Source_SCSI
- | 5 -> Some Source_IDE
- | 0 ->
+ | Some 6 -> Some Source_SCSI
+ | Some 5 -> Some Source_IDE
+ | None ->
warning (f_"ova disk has no parent controller, please report this
as a bug supplying the *.ovf file extracted from the ova");
None
- | _ ->
+ | Some controller ->
warning (f_"ova disk has an unknown VMware controller type (%d),
please report this as a bug supplying the *.ovf file extracted from the
ova")
controller;
None
@@ -251,27 +237,32 @@ object
Xml.xpathctx_set_current_context xpathctx n;
(* XXX We assume the OVF lists these in order.
- let address = xpath_to_int "rasd:AddressOnParent/text()" 0 in
+ let address = xpath_int "rasd:AddressOnParent/text()" in
*)
(* Find the parent controller. *)
- let parent_id = xpath_to_int "rasd:Parent/text()" 0 in
+ let parent_id = xpath_int "rasd:Parent/text()" in
let controller match parent_id with
- | 0 -> None
- | id -> parent_controller id in
+ | None -> None
+ | Some id -> parent_controller id in
Xml.xpathctx_set_current_context xpathctx n;
- let file_id = xpath_to_string "rasd:HostResource/text()"
"" in
+ let file_id = xpath_string_default "rasd:HostResource/text()"
"" in
let rex = Str.regexp "^ovf:/disk/\\(.*\\)" in
if Str.string_match rex file_id 0 then (
(* Chase the references through to the actual file name. *)
let file_id = Str.matched_group 1 file_id in
let expr = sprintf
"/ovf:Envelope/ovf:DiskSection/ovf:Disk[@ovf:diskId='%s']/@ovf:fileRef"
file_id in
- let file_ref = xpath_to_string expr "" in
- if file_ref == "" then error (f_"error parsing disk
fileRef");
+ let file_ref + match xpath_string expr with
+ | None -> error (f_"error parsing disk fileRef")
+ | Some s -> s in
let expr = sprintf
"/ovf:Envelope/ovf:References/ovf:File[@ovf:id='%s']/@ovf:href"
file_ref in
- let filename = xpath_to_string expr "" in
+ let filename + match xpath_string expr with
+ | None -> error (f_"no href in ovf:File (id=%s)")
file_ref
+ | Some s -> s in
(* Does the file exist and is it readable? *)
let filename = exploded // filename in
@@ -318,20 +309,20 @@ object
for i = 0 to nr_nodes-1 do
let n = Xml.xpathobj_node obj i in
Xml.xpathctx_set_current_context xpathctx n;
- let id = xpath_to_int "rasd:ResourceType/text()" 0 in
- assert (id = 14 || id = 15 || id = 16);
+ let id + match xpath_int "rasd:ResourceType/text()"
with
+ | None -> assert false
+ | Some (14|15|16 as i) -> i
+ | Some _ -> assert false in
- let slot - match xpath_to_int
"rasd:AddressOnParent/text()" (-1) with
- | -1 -> None
- | i -> Some i in
+ let slot = xpath_int "rasd:AddressOnParent/text()" in
(* Find the parent controller. *)
- let parent_id = xpath_to_int "rasd:Parent/text()" 0 in
+ let parent_id = xpath_int "rasd:Parent/text()" in
let controller match parent_id with
- | 0 -> None
- | id -> parent_controller id in
+ | None -> None
+ | Some id -> parent_controller id in
let typ match id with
@@ -354,7 +345,8 @@ object
for i = 0 to nr_nodes-1 do
let n = Xml.xpathobj_node obj i in
Xml.xpathctx_set_current_context xpathctx n;
- let vnet = xpath_to_string "rasd:ElementName/text()"
(sprintf"eth%d" i) in
+ let vnet + xpath_string_default
"rasd:ElementName/text()" (sprintf"eth%d" i) in
let nic = {
s_mac = None;
s_vnet = vnet;
--
2.5.0
Pino Toscano
2015-Aug-28 14:00 UTC
Re: [Libguestfs] v2v: -i libvirtxml: Map empty network or bridge name to a default (RHBZ#1257895).
In data venerdì 28 agosto 2015 14:19:05, Richard W.M. Jones ha scritto:> When importing from VMware via the libvirt driver, the libvirt driver > can add an empty source bridge name: > > <interface type='bridge'> > <mac address='00:01:02:03:04:05:06'/> > <source bridge=''/> > </interface> > > Replicate what we do on the -i ova path, and map these to "eth0", > "eth1" etc.LGTM.> This also includes a bunch of changes to how we do xpath parsing to > make it type-safe.Could patches 2/4/5 be squashed together? -- Pino Toscano
Richard W.M. Jones
2015-Aug-28 16:52 UTC
Re: [Libguestfs] v2v: -i libvirtxml: Map empty network or bridge name to a default (RHBZ#1257895).
On Fri, Aug 28, 2015 at 04:00:34PM +0200, Pino Toscano wrote:> In data venerdì 28 agosto 2015 14:19:05, Richard W.M. Jones ha scritto: > > When importing from VMware via the libvirt driver, the libvirt driver > > can add an empty source bridge name: > > > > <interface type='bridge'> > > <mac address='00:01:02:03:04:05:06'/> > > <source bridge=''/> > > </interface> > > > > Replicate what we do on the -i ova path, and map these to "eth0", > > "eth1" etc. > > LGTM. > > > This also includes a bunch of changes to how we do xpath parsing to > > make it type-safe. > > Could patches 2/4/5 be squashed together?Yup - totally they could. I just thought they'd be a bit easier to review this way. I'll squash them before committing. Thanks, Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/
Seemingly Similar Threads
- [PATCH 0/2] v2v: -i ova: A couple of cleanup patches.
- [PATCH] v2v: -i ova: Remove incorrect warning for disks that have no parent controller (RHBZ#1167302).
- [PATCH v2] v2v: Free XML objects in the correct order.
- [PATCH v2 0/9] v2v: -i ova: Handle OVAs containing snapshots.
- [PATCH 0/3] common/mlstdutils: Add Std_utils List and Option modules.