|
 |
0d20ef |
From 97c8e2ecf7ac619d268c5b927d5fce44778c805c Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Tue, 4 Nov 2014 21:21:20 +0000
|
|
|
0d20ef |
Subject: [PATCH] v2v: -i libvirt vcenter: Change 'esx:' to 'vcenter:' in
|
|
|
0d20ef |
errors/warnings.
|
|
|
0d20ef |
|
|
|
0d20ef |
'esx' is inaccurate.
|
|
|
0d20ef |
|
|
|
0d20ef |
(cherry picked from commit c58d335952194b9556db78abde75637921ab4eca)
|
|
|
0d20ef |
---
|
|
|
0d20ef |
v2v/input_libvirt_vcenter_https.ml | 16 ++++++++--------
|
|
|
0d20ef |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/v2v/input_libvirt_vcenter_https.ml b/v2v/input_libvirt_vcenter_https.ml
|
|
|
0d20ef |
index 3d14a27..783b630 100644
|
|
|
0d20ef |
--- a/v2v/input_libvirt_vcenter_https.ml
|
|
|
0d20ef |
+++ b/v2v/input_libvirt_vcenter_https.ml
|
|
|
0d20ef |
@@ -96,26 +96,26 @@ let rec get_session_cookie =
|
|
|
0d20ef |
let status = !status in
|
|
|
0d20ef |
if status = "" then (
|
|
|
0d20ef |
dump_response stderr;
|
|
|
0d20ef |
- error (f_"esx: no status code in output of 'curl' command. Is 'curl' installed?")
|
|
|
0d20ef |
+ error (f_"vcenter: no status code in output of 'curl' command. Is 'curl' installed?")
|
|
|
0d20ef |
);
|
|
|
0d20ef |
|
|
|
0d20ef |
if status = "401" then (
|
|
|
0d20ef |
dump_response stderr;
|
|
|
0d20ef |
if uri.uri_user <> None then
|
|
|
0d20ef |
- error (f_"esx: incorrect username or password")
|
|
|
0d20ef |
+ error (f_"vcenter: incorrect username or password")
|
|
|
0d20ef |
else
|
|
|
0d20ef |
- error (f_"esx: incorrect username or password. You might need to specify the username in the URI like this: %s://USERNAME@[etc]")
|
|
|
0d20ef |
+ error (f_"vcenter: incorrect username or password. You might need to specify the username in the URI like this: %s://USERNAME@[etc]")
|
|
|
0d20ef |
scheme
|
|
|
0d20ef |
);
|
|
|
0d20ef |
|
|
|
0d20ef |
if status = "404" then (
|
|
|
0d20ef |
dump_response stderr;
|
|
|
0d20ef |
- error (f_"esx: URL not found: %s") url
|
|
|
0d20ef |
+ error (f_"vcenter: URL not found: %s") url
|
|
|
0d20ef |
);
|
|
|
0d20ef |
|
|
|
0d20ef |
if status <> "200" then (
|
|
|
0d20ef |
dump_response stderr;
|
|
|
0d20ef |
- error (f_"esx: invalid response from server")
|
|
|
0d20ef |
+ error (f_"vcenter: invalid response from server")
|
|
|
0d20ef |
);
|
|
|
0d20ef |
|
|
|
0d20ef |
(* Get the cookie. *)
|
|
|
0d20ef |
@@ -130,7 +130,7 @@ let rec get_session_cookie =
|
|
|
0d20ef |
) lines;
|
|
|
0d20ef |
if !session_cookie = "" then (
|
|
|
0d20ef |
dump_response stderr;
|
|
|
0d20ef |
- warning ~prog (f_"esx: could not read session cookie from the vCenter Server, conversion may consume all sessions on the server and fail part way through");
|
|
|
0d20ef |
+ warning ~prog (f_"vcenter: could not read session cookie from the vCenter Server, conversion may consume all sessions on the server and fail part way through");
|
|
|
0d20ef |
None
|
|
|
0d20ef |
)
|
|
|
0d20ef |
else
|
|
|
0d20ef |
@@ -177,7 +177,7 @@ let get_datacenter uri scheme =
|
|
|
0d20ef |
| "vpx" -> (* Hopefully the first part of the path. *)
|
|
|
0d20ef |
(match uri.uri_path with
|
|
|
0d20ef |
| None ->
|
|
|
0d20ef |
- warning ~prog (f_"esx: URI (-ic parameter) contains no path, so we cannot determine the datacenter name");
|
|
|
0d20ef |
+ warning ~prog (f_"vcenter: URI (-ic parameter) contains no path, so we cannot determine the datacenter name");
|
|
|
0d20ef |
default_dc
|
|
|
0d20ef |
| Some path ->
|
|
|
0d20ef |
let path =
|
|
|
0d20ef |
@@ -269,7 +269,7 @@ let map_source_to_uri ?readahead verbose password uri scheme server path =
|
|
|
0d20ef |
| Some cookie -> ("file.cookie", JSON.String cookie) :: json_params in
|
|
|
0d20ef |
|
|
|
0d20ef |
if verbose then
|
|
|
0d20ef |
- printf "esx: json parameters: %s\n" (JSON.string_of_doc json_params);
|
|
|
0d20ef |
+ printf "vcenter: json parameters: %s\n" (JSON.string_of_doc json_params);
|
|
|
0d20ef |
|
|
|
0d20ef |
(* Turn the JSON parameters into a 'json:' protocol string.
|
|
|
0d20ef |
* Note this requires qemu-img >= 2.1.0.
|
|
|
0d20ef |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|