CA-42031: xe snapshot-destroy [no parameters] fails with internal error --- FIXED.

Signed-off-by: Rok Strnisa <rok.strnisa@citrix.com>

diff --git a/ocaml/xapi/cli_frontend.ml b/ocaml/xapi/cli_frontend.ml
index ff90fc8f7b0ec1865d3e2c6eec57bd81e43daf19..7bf4ecda6aa5954a1045c139649df618bf59c644 100644 (file)
--- a/ocaml/xapi/cli_frontend.ml
+++ b/ocaml/xapi/cli_frontend.ml
@@ -1021,7 +1021,7 @@ let rec cmdtable_data : (string*cmd_spec) list =
    "snapshot-revert", 
    {
       reqd = [];
-      optn = ["uuid"];
+      optn = ["uuid"; "snapshot-uuid"];
       help ="Revert an existing VM to a previous checkpointed or snapshotted state.";
       implementation = No_fd Cli_operations.snapshot_revert;
       flags =[Standard];
@@ -1094,7 +1094,7 @@ let rec cmdtable_data : (string*cmd_spec) list =
    "snapshot-reset-powerstate",
    {
      reqd=[]; 
-     optn=["uuid"; "force"];
+     optn=["uuid"; "snapshot-uuid"; "force"];
      help="Force the VM powerstate to halted in the management toolstack database only. This command is used to recover a snapshot that is marked as 'suspended'. This is a potentially dangerous operation: you must ensure that you do not need the memory image anymore (ie. you will not be able to resume your snapshot anymore).";
      implementation= No_fd Cli_operations.snapshot_reset_powerstate;
      flags=[Standard; Vm_selectors];
@@ -1321,7 +1321,7 @@ there are two or more empty CD devices, please use the command 'vbd-insert' and
    "snapshot-uninstall",
    {
      reqd=[];
-     optn=["uuid"; "force"];
+     optn=["uuid"; "snapshot-uuid"; "force"];
      help="Uninstall a snapshot. This operation will destroy those VDIs that are marked RW and connected to this snapshot only. To simply destroy the VM record, use snapshot-destroy.";
      implementation= With_fd Cli_operations.snapshot_uninstall;
      flags=[Standard];
@@ -1330,7 +1330,7 @@ there are two or more empty CD devices, please use the command 'vbd-insert' and
    "snapshot-destroy",
     {
       reqd=[];
-      optn=["uuid"];
+      optn=["uuid"; "snapshot-uuid"];
       help="Destroy a snapshot. This leaves the storage associated with the snapshot intact. To delete storage too, use snapshot-uninstall.";
       implementation=No_fd Cli_operations.snapshot_destroy;
       flags=[];
@@ -1339,7 +1339,7 @@ there are two or more empty CD devices, please use the command 'vbd-insert' and
    "snapshot-disk-list",
    {
      reqd=[]; 
-     optn=["uuid"; "vbd-params";"vdi-params"];
+     optn=["uuid"; "snapshot-uuid"; "vbd-params"; "vdi-params"];
      help="List the disks on the selected VM(s).";
      implementation= No_fd (Cli_operations.snapshot_disk_list false);
      flags=[Standard; Vm_selectors];