CP-14790: No licence check for VM.revert and import

Even when creation of Windows-Update VMs is not allowed by the
licence, we want to allow it when it is done in the course of an
import or revert-to-snapshot.

In both cases, we avoid the check for the Windows-Update vendor-device
licence feature by using the relevant helper function instead of
calling Client.VM.create_from_record directly.

Signed-off-by: Thomas Sanders <[email protected]>

Author: thomassa

ocaml/xapi/import.ml

@@ -423,7 +423,9 @@ module VM : HandlerTools = struct
 			let vm = log_reraise
 				("failed to create VM with name-label " ^ vm_record.API.vM_name_label)
 				(fun value ->
-					let vm = Client.VM.create_from_record rpc session_id value in
+					let vm = Xapi_vm_helpers.create_from_record_without_checking_licence_feature_for_vendor_device
+						~__context rpc session_id value
+					in
 					if config.full_restore then Db.VM.set_uuid ~__context ~self:vm ~value:value.API.vM_uuid;
 					vm)
 				vm_record in

ocaml/xapi/xapi_vm_snapshot.ml

@@ -475,8 +475,9 @@ let	create_vm_from_snapshot ~__context ~snapshot =
 		let snap_record = Db.VM.get_record ~__context ~self:snapshot in
 
 		Helpers.call_api_functions ~__context 
-			(fun rpc session_id -> 
-				 let new_vm = Client.VM.create_from_record rpc session_id snap_record in
+			(fun rpc session_id ->
+				 let new_vm = Xapi_vm_helpers.create_from_record_without_checking_licence_feature_for_vendor_device
+					 ~__context rpc session_id snap_record in
 				 begin try
 					 Db.VM.set_uuid ~__context ~self:new_vm ~value:vm_uuid;
 					 copy_vm_fields ~__context ~metadata:snap_metadata ~dst:new_vm ~do_not_copy:do_not_copy ~default_values;