[Xen-API] [PATCH] make the CLI RT use on-host mode

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1276882807 -3600
# Node ID d7d4d4b58a16bed109311f1d585744954feb71a9
# Parent  2ab7bcee7d0f3b538067da69dfbeadd25e812681
CA-41895: make the CLI RT default to 'on-host' mode since it has 'localhost' 
hardcoded anyway.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 2ab7bcee7d0f -r d7d4d4b58a16 ocaml/xe-cli/rt/test_host.ml
--- a/ocaml/xe-cli/rt/test_host.ml      Mon Jun 07 16:07:06 2010 +0100
+++ b/ocaml/xe-cli/rt/test_host.ml      Fri Jun 18 18:40:07 2010 +0100
@@ -44,7 +44,7 @@
   ("-a",Arg.Set all,"Run all the tests") ]
     (fun _ -> raise (Failure "Invalid argument! (try -help for help)"))
     "VM testing utility";
-  let cli : Util.t_cli = Util.cli_offhost in 
+  let cli : Util.t_cli = Util.cli_onhost in 
   let version = Cliops.get_version cli in
   let short_version = Cliops.get_short_version cli in
   let tests = Parsers.explode !tests ',' in
diff -r 2ab7bcee7d0f -r d7d4d4b58a16 ocaml/xe-cli/rt/util.ml
--- a/ocaml/xe-cli/rt/util.ml   Mon Jun 07 16:07:06 2010 +0100
+++ b/ocaml/xe-cli/rt/util.ml   Fri Jun 18 18:40:07 2010 +0100
@@ -70,6 +70,7 @@
     Some (!result,rc)
 
 type pwspec =
+    | NoPassword
     | Password of string
     | PasswordFile of string
 
@@ -85,28 +86,29 @@
          " -h "^(!host) else "")
     ^" "
     ^(match pwspec with
-       Password s -> "-u "^user^" -pw "^s
-      | PasswordFile s -> "-pwf "^s)
+       | NoPassword -> ""
+       | Password s -> "-u "^user^" -pw "^s
+       | PasswordFile s -> "-pwf "^s)
     ^" "^param_str in
     run_command ~dolog cli_base_string
 
-let cli_offhost_with_pwspec ?(dolog=true) cmd params pwspec =
-  cli_with_pwspec ~dolog true cmd params pwspec
+let cli_offhost_with_pwspec ?dolog cmd params pwspec =
+  cli_with_pwspec ?dolog true cmd params pwspec
 
-let cli_onhost cmd params =
-  cli_with_pwspec false cmd params (Password "ignore")
+let cli_onhost ?dolog cmd params =
+  cli_with_pwspec ?dolog false cmd params (NoPassword)
 
-let cli_onhost_with_pwd pwd cmd params =
-  cli_with_pwspec false cmd params (Password pwd)
+let cli_onhost_with_pwd ?dolog pwd cmd params =
+  cli_with_pwspec ?dolog false cmd params (Password pwd)
 
-let cli_offhost_with_pwd ?(dolog=true) pwd cmd params =
-  cli_offhost_with_pwspec ~dolog cmd params (Password pwd)
+let cli_offhost_with_pwd ?dolog pwd cmd params =
+  cli_offhost_with_pwspec ?dolog cmd params (Password pwd)
 
-let cli_offhost_with_pwf pwf cmd params =
-  cli_offhost_with_pwspec cmd params (PasswordFile pwf)
+let cli_offhost_with_pwf ?dolog pwf cmd params =
+  cli_offhost_with_pwspec ?dolog cmd params (PasswordFile pwf)
 
-let cli_offhost ?(dolog=true) cmd params =
-  cli_offhost_with_pwd ~dolog password cmd params
+let cli_offhost ?dolog cmd params =
+  cli_offhost_with_pwd ?dolog password cmd params
 
   
 
 ocaml/xe-cli/rt/test_host.ml |   2 +-
 ocaml/xe-cli/rt/util.ml      |  30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

xen-api.hg.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api