CA-384979 replace XenMotion with storage live migration (#5237)

* CA-384979 replace XenMotion with storage live migration * Also update comments feature description. Signed-off-by: Christian Lindig <[email protected]> --------- Signed-off-by: Christian Lindig <[email protected]> Co-authored-by: Christian Lindig <[email protected]>
xapi-project · Nov 9, 2023 · 4233875 · 4233875
1 parent 407a9a9
commit 4233875
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ocaml/xapi-cli-server/cli_operations.ml b/ocaml/xapi-cli-server/cli_operations.ml
@@ -4531,8 +4531,8 @@ let vm_migrate printer rpc session_id params =
   if use_sxm_migration then (
     printer
       (Cli_printer.PMsg
-         "Performing a Storage XenMotion migration. Your VM's VDIs will be \
-          migrated with the VM."
+         "Performing a storage live migration. Your VM's VDIs will be migrated \
+          with the VM."
       ) ;
     if
       not
@@ -4542,7 +4542,7 @@ let vm_migrate printer rpc session_id params =
         )
     then
       failwith
-        "Storage XenMotion requires remote-master, remote-username, and \
+        "Storage live migration requires remote-master, remote-username, and \
          remote-password to be specified. Please see 'xe help vm-migrate' for \
          help." ;
     let ip = List.assoc "remote-master" params in

diff --git a/ocaml/xapi-types/features.ml b/ocaml/xapi-types/features.ml
@@ -104,7 +104,7 @@ let keys_of_features =
   ; ( PCI_device_for_auto_update
     , ("restrict_pci_device_for_auto_update", Negative, "PciAU")
     )
-  ; (Xen_motion, ("restrict_xen_motion", Negative, "XenMotion"))
+  ; (Xen_motion, ("restrict_xen_motion", Negative, "Live_migration"))
   ; (Guest_ip_setting, ("restrict_guest_ip_setting", Negative, "GuestIP"))
   ; (AD, ("restrict_ad", Negative, "AD"))
   ; (Nested_virt, ("restrict_nested_virt", Negative, "Nested_virt"))

diff --git a/ocaml/xapi-types/features.mli b/ocaml/xapi-types/features.mli
@@ -42,15 +42,15 @@ type feature =
   | DR  (** Enable disaster recovery *)
   | VIF_locking
       (** Enable locking of VIFs to specific MAC addresses and IP addresses. *)
-  | Storage_motion  (** Enable Storage XenMotion feature *)
+  | Storage_motion  (** Enable Storage Live Migration feature *)
   | VGPU  (** Enable use of virtual GPUs *)
   | Integrated_GPU  (** Enable use of integrated GPU passthrough *)
   | VSS  (** Enable use of VSS *)
   | Guest_agent_auto_update
       (** Enable use of the Windows guest agent auto-update feature. *)
   | PCI_device_for_auto_update
       (** Enable making new VMs with the PCI device that triggers Windows Update. *)
-  | Xen_motion  (** Enable XenMotion feature *)
+  | Xen_motion  (** Enable live migration feature *)
   | Guest_ip_setting  (** Enable use of Guest ip seting *)
   | AD  (** Enable use of Active Directory *)
   | Nested_virt  (** Enable the use of nested virtualisation *)