# HG changeset patch
# User Rob Hoes <rob.hoes@xxxxxxxxxx>
# HG changeset patch
# User Rob Hoes <rob.hoes@xxxxxxxxxx>
Use uuid (not host-uuid) in host-*-cpu CLI commands

Signed-off-by: Rob Hoes <rob.hoes@xxxxxxxxxx>

diff -r f9547851dfc0 ocaml/xapi/cli_frontend.ml
--- a/ocaml/xapi/cli_frontend.ml	Wed Feb 17 14:53:39 2010 +0000
+++ b/ocaml/xapi/cli_frontend.ml	Wed Feb 17 14:56:23 2010 +0000
@@ -705,7 +705,7 @@
    "host-cpu-info",
     {
       reqd=[];
-      optn=["host-uuid"];
+      optn=["uuid"];
       help="Lists information about the host's physical CPUs.";
       implementation= No_fd Cli_operations.host_cpu_info;
       flags=[];
@@ -714,7 +714,7 @@
    "host-get-cpu-features",
     {
       reqd=[];
-      optn=["host-uuid"];
+      optn=["uuid"];
       help="Prints a hexadecimal representation of the host's physical-CPU features.";
       implementation= No_fd Cli_operations.host_get_cpu_features;
       flags=[];
@@ -723,7 +723,7 @@
    "host-set-cpu-features",
     {
       reqd=["features"];
-      optn=["host-uuid"];
+      optn=["uuid"];
       help="Attempts to mask the host's physical-CPU features to match the given features. The given string must be a 32-digit hexadecimal number (optionally containing spaces), as given by host-get-cpu-features.";
       implementation= No_fd Cli_operations.host_set_cpu_features;
       flags=[];
@@ -732,7 +732,7 @@
    "host-reset-cpu-features",
     {
       reqd=[];
-      optn=["host-uuid"];
+      optn=["uuid"];
       help="Removes the feature mask of the host's physical CPU (if any).";
       implementation= No_fd Cli_operations.host_reset_cpu_features;
       flags=[];
diff -r f9547851dfc0 ocaml/xapi/cli_operations.ml
--- a/ocaml/xapi/cli_operations.ml	Wed Feb 17 14:53:39 2010 +0000
+++ b/ocaml/xapi/cli_operations.ml	Wed Feb 17 14:56:23 2010 +0000
@@ -3537,8 +3537,8 @@
 
 let host_cpu_info printer rpc session_id params =
   let host = 
-    if List.mem_assoc "host-uuid" params then
-      Client.Host.get_by_uuid rpc session_id (List.assoc "host-uuid" params) 
+    if List.mem_assoc "uuid" params then
+      Client.Host.get_by_uuid rpc session_id (List.assoc "uuid" params) 
     else
       get_host_from_session rpc session_id in
   let cpu_info = Client.Host.get_cpu_info rpc session_id host in
@@ -3546,8 +3546,8 @@
   
 let host_get_cpu_features printer rpc session_id params =
   let host = 
-    if List.mem_assoc "host-uuid" params then
-      Client.Host.get_by_uuid rpc session_id (List.assoc "host-uuid" params) 
+    if List.mem_assoc "uuid" params then
+      Client.Host.get_by_uuid rpc session_id (List.assoc "uuid" params) 
     else
       get_host_from_session rpc session_id in
   let cpu_info = Client.Host.get_cpu_info rpc session_id host in
@@ -3556,8 +3556,8 @@
 
 let host_set_cpu_features printer rpc session_id params =
   let host = 
-    if List.mem_assoc "host-uuid" params then
-      Client.Host.get_by_uuid rpc session_id (List.assoc "host-uuid" params) 
+    if List.mem_assoc "uuid" params then
+      Client.Host.get_by_uuid rpc session_id (List.assoc "uuid" params) 
     else
       get_host_from_session rpc session_id in
   let features = List.assoc "features" params in
@@ -3565,8 +3565,8 @@
 
 let host_reset_cpu_features printer rpc session_id params =
   let host = 
-    if List.mem_assoc "host-uuid" params then
-      Client.Host.get_by_uuid rpc session_id (List.assoc "host-uuid" params) 
+    if List.mem_assoc "uuid" params then
+      Client.Host.get_by_uuid rpc session_id (List.assoc "uuid" params) 
     else
       get_host_from_session rpc session_id in
   Client.Host.reset_cpu_features rpc session_id host