CA-67536: Remove unplug_force from vif_operations

The unplug_force operation was recently added to the vif_operations enum.
However, this causes problems during rolling pool upgrade, while the
master has been upgraded, but some of the slaves have not. Operations
such as Db.VIF.get_record on running VMs were be broken by this, which broke
live migrations between un-upgraded hosts.

After this patch, the "unplug" operation is used for both "unplug" as well
as "unplug_force" in VIF.allowed_operations, which is fine, since they are
always allowed at the same time.

Signed-off-by: Rob Hoes <[email protected]>

Author: robhoes

ocaml/idl/datamodel.ml

@@ -4813,7 +4813,6 @@ let vif_operations =
 	[ "attach", "Attempting to attach this VIF to a VM";
 	  "plug", "Attempting to hotplug this VIF";
 	  "unplug", "Attempting to hot unplug this VIF";
-	  "unplug_force", "Attempting to forcibly unplug this VIF";
 	])
 
 let vif_locking_mode =

ocaml/xapi/message_forwarding.ml

@@ -2618,7 +2618,7 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
 					forward_vif_op ~local_fn ~__context ~self (fun session_id rpc -> Client.VIF.plug rpc session_id self))
 
 		let unplug_common ~__context  ~self ~force =
-			let op = if force then `unplug_force else `unplug in
+			let op = `unplug in
 			let name = "VIF." ^ (Record_util.vif_operation_to_string op) in
 			info "%s: VIF = '%s'" name (vif_uuid ~__context self);
 			let local_fn, remote_fn =

ocaml/xapi/xapi_vif_helpers.ml

@@ -22,7 +22,7 @@ open D
 
 open Record_util
 
-let all_ops : API.vif_operations_set = [ `attach; `plug; `unplug; `unplug_force ]
+let all_ops : API.vif_operations_set = [ `attach; `plug; `unplug ]
 
 type table = (API.vif_operations, ((string * (string list)) option)) Hashtbl.t
 
@@ -61,18 +61,18 @@ let valid_operations ~__context record _ref' : table =
   let plugged = record.Db_actions.vIF_currently_attached || record.Db_actions.vIF_reserved in
   (match power_state, plugged with
   | `Running, true -> set_errors Api_errors.device_already_attached [ _ref ] [ `plug ]
-  | `Running, false -> set_errors Api_errors.device_already_detached [ _ref ] [ `unplug; `unplug_force ]
+  | `Running, false -> set_errors Api_errors.device_already_detached [ _ref ] [ `unplug ]
   | _, _ -> 
       let actual = Record_util.power_to_string power_state in
       let expected = Record_util.power_to_string `Running in
-      set_errors Api_errors.vm_bad_power_state [ Ref.string_of vm; expected; actual ] [ `plug; `unplug; `unplug_force ]);
+      set_errors Api_errors.vm_bad_power_state [ Ref.string_of vm; expected; actual ] [ `plug; `unplug ]);
 
   (* HVM guests only support plug/unplug IF they have recent PV drivers *)
   let vm_gm = Db.VM.get_guest_metrics ~__context ~self:vm in
   let vm_gmr = try Some (Db.VM_guest_metrics.get_record_internal ~__context ~self:vm_gm) with _ -> None in
   if power_state = `Running && Helpers.has_booted_hvm ~__context ~self:vm
   then (match Xapi_pv_driver_version.make_error_opt (Xapi_pv_driver_version.of_guest_metrics vm_gmr) vm vm_gm with
-  | Some(code, params) -> set_errors code params [ `plug; `unplug; `unplug_force ]
+  | Some(code, params) -> set_errors code params [ `plug; `unplug ]
   | None -> ());
 
   table