[Libguestfs] [PATCH] v2v: adding input -i ova
Shahar Havivi
shaharh at redhat.com
Sun Aug 24 10:20:46 UTC 2014
On 21.08.14 15:26, Richard W.M. Jones wrote:
> On Thu, Aug 21, 2014 at 03:22:27PM +0100, Richard W.M. Jones wrote:
> > Might be easier to use:
>
> Or even easier and not using awk ...
>
> let cmd = sprintf "sha1sum %s" (quote (dir // file)) in
>
> ...
> > (match out with
> > | [] -> error (f_"no output from sha1sum command, see previous errors")
> > | [line] ->
>
> let hash, _ = string_split " " line in
> if hash <> sha1 then
> (etc)
>
> Rich.
>
> --
> Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
> Read my programming and virtualization blog: http://rwmj.wordpress.com
> virt-p2v converts physical machines to virtual machines. Boot with a
> live CD or over the network (PXE) and turn machines into KVM guests.
> http://libguestfs.org/virt-v2v
After applying the patch I have a logical error at the check:
if hash <> sha1 then
its looks like the sha1 is not a string but a unit
let sha1 = Str.matched_group 2 line in
(sha1 : string);
Do you have an idea why?
(attached the new patch)
Shahar.
-------------- next part --------------
>From 9e9f75796a6c0560a13b583fa77a1b91fe81c9db Mon Sep 17 00:00:00 2001
From: Shahar Havivi <shaharh at redhat.com>
Date: Thu, 21 Aug 2014 15:54:38 +0300
Subject: [PATCH] v2v: adding input -i ova
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
po/POTFILES-ml | 1 +
v2v/Makefile.am | 2 ++
v2v/cmdline.ml | 14 ++++++--
v2v/input_ova.ml | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
v2v/input_ova.mli | 22 +++++++++++++
5 files changed, 134 insertions(+), 2 deletions(-)
create mode 100644 v2v/input_ova.ml
create mode 100644 v2v/input_ova.mli
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 2001f47..35a94d3 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -88,6 +88,7 @@ v2v/convert_linux.ml
v2v/convert_windows.ml
v2v/input_disk.ml
v2v/input_libvirt.ml
+v2v/input_ova.ml
v2v/lib_esx.ml
v2v/lib_linux.ml
v2v/output_RHEV.ml
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 3eec99a..5f2fa74 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -32,6 +32,7 @@ SOURCES_MLI = \
lib_linux.mli \
input_disk.mli \
input_libvirt.mli \
+ input_ova.mli \
output_libvirt.mli \
output_local.mli \
output_RHEV.mli \
@@ -48,6 +49,7 @@ SOURCES_ML = \
lib_linux.ml \
input_disk.ml \
input_libvirt.ml \
+ input_ova.ml \
convert_linux.ml \
convert_windows.ml \
output_libvirt.ml \
diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
index bec6d51..7842a4f 100644
--- a/v2v/cmdline.ml
+++ b/v2v/cmdline.ml
@@ -54,6 +54,7 @@ let parse_cmdline () =
| "disk" | "local" -> input_mode := `Disk
| "libvirt" -> input_mode := `Libvirt
| "libvirtxml" -> input_mode := `LibvirtXML
+ | "ova" -> input_mode := `OVA
| s ->
error (f_"unknown -i option: %s") s
in
@@ -105,7 +106,7 @@ let parse_cmdline () =
let argspec = Arg.align [
"--bridge", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'";
"--debug-gc",Arg.Set debug_gc, " " ^ s_"Debug GC and memory allocations";
- "-i", Arg.String set_input_mode, "disk|libvirt|libvirtxml " ^ s_"Set input mode (default: libvirt)";
+ "-i", Arg.String set_input_mode, "disk|libvirt|libvirtxml|ova " ^ s_"Set input mode (default: libvirt)";
"-ic", Arg.Set_string input_conn, "uri " ^ s_"Libvirt URI";
"-if", Arg.Set_string input_format,
"format " ^ s_"Input format (for -i disk)";
@@ -231,7 +232,16 @@ read the man page virt-v2v(1).
| [filename] -> filename
| _ ->
error (f_"expecting a libvirt XML file name on the command line") in
- Input_libvirt.input_libvirtxml verbose filename in
+ Input_libvirt.input_libvirtxml verbose filename
+
+ | `OVA ->
+ (* -i ova: Expecting an ova filename (tar file). *)
+ let filename =
+ match args with
+ | [filename] -> filename
+ | _ ->
+ error (f_"expecting an OVA file name on the command line") in
+ Input_ova.input_ova verbose filename in
(* Parse the output mode. *)
let output =
diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
new file mode 100644
index 0000000..d1f1229
--- /dev/null
+++ b/v2v/input_ova.ml
@@ -0,0 +1,97 @@
+(* virt-v2v
+ * Copyright (C) 2009-2014 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Printf
+
+open Common_gettext.Gettext
+open Common_utils
+
+open Types
+open Utils
+
+let parse_ovf dir ovf =
+ let source = {
+ s_dom_type = "kvm";
+ s_name = "";
+ s_orig_name = "";
+ s_memory = 0L;
+ s_vcpu = 1;
+ s_arch = "";
+ s_features = [""];
+ s_display = None;
+ s_disks = [];
+ s_removables = [];
+ s_nics = [];
+ } in
+ source
+
+class input_ova verbose ova =
+object
+ inherit input verbose
+
+ method as_options = "-i ova " ^ ova
+
+ method source () =
+ (* get ova directory *)
+ let dir = Filename.dirname (absolute_path ova) in
+ (* extract ova (tar) file *)
+ let cmd = sprintf "tar -xf %s -C %s" (quote ova) (quote dir) in
+
+ if Sys.command cmd <> 0 then
+ error (f_"error running command: %s") cmd;
+
+ let files = Sys.readdir dir in
+ let mf = ref "" in
+ let ovf = ref "" in
+ (* search for the ovf file *)
+ Array.iter (fun file ->
+ let len = String.length file in
+ if len >= 4 && String.lowercase (String.sub file (len-4) 4) = ".ovf" then
+ ovf := file
+ else if len >= 3 && String.lowercase (String.sub file (len-3) 3) = ".mf" then
+ mf := file
+ ) files;
+
+ (* verify sha1 from manifest file *)
+ let mf = dir // !mf in
+ let rex = Str.regexp "SHA1(\\(.*\\))= *\\(.*?\\).*$" in
+ let lines = read_whole_file mf in
+ let lines = string_nsplit "\n" lines in
+ List.iter (
+ fun line ->
+ if Str.string_match rex line 0 then
+ let file = Str.matched_group 1 line in
+ let sha1 = Str.matched_group 2 line in
+ let cmd = sprintf "sha1sum %s" (quote (dir // file)) in
+ let out = external_command ~prog cmd in
+ (match out with
+ | [] -> error (f_"no output from sha1sum command, see previous errors")
+ | [line] ->
+ let hash, _ = string_split " " line in
+ print_endline hash;
+ print_endline sha1;
+ if hash <> sha1 then
+ error (f_"Checksum of %s does not match manifest sha1 %s") file sha1;
+ | _::_ -> error (f_"cannot parse output of sha1sum command")
+ );
+ ) lines;
+
+ parse_ovf dir ovf
+end
+
+let input_ova = new input_ova
diff --git a/v2v/input_ova.mli b/v2v/input_ova.mli
new file mode 100644
index 0000000..d4c347e
--- /dev/null
+++ b/v2v/input_ova.mli
@@ -0,0 +1,22 @@
+(* virt-v2v
+ * Copyright (C) 2009-2014 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(** [-i ova] source. *)
+
+val input_ova : bool -> string -> Types.input
+(** [input_ova filename] sets up an input from vmware ova file. *)
--
1.9.3
More information about the Libguestfs
mailing list