CP-10532: Change name for virtual hardware platform version

Change from VM.virt_hw_vn and Host.virt_hw_vns to VM.hardware_platform_version and Host.virtual_hardware_platform_versions

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>

Author: cheng-z

ocaml/client_records/records.ml

@@ -880,8 +880,8 @@ let vm_record rpc session_id vm =
 				~get:(fun () -> Int64.to_string (x ()).API.vM_version) ();
 			make_field ~name:"generation-id"
 				~get:(fun () -> (x ()).API.vM_generation_id) ();
-			make_field ~name:"virt-hw-vn"
-				~get:(fun () -> Int64.to_string (x ()).API.vM_virt_hw_vn) ();
+			make_field ~name:"hardware-platform-version"
+				~get:(fun () -> Int64.to_string (x ()).API.vM_hardware_platform_version) ();
 		]}
 
 let host_crashdump_record rpc session_id host = 
@@ -1050,9 +1050,9 @@ let host_record rpc session_id host =
 				~get_map:(fun () -> (x ()).API.host_guest_VCPUs_params) 
 				~add_to_map:(fun k v -> Client.Host.add_to_guest_VCPUs_params rpc session_id host k v)
 				~remove_from_map:(fun k -> Client.Host.remove_from_guest_VCPUs_params rpc session_id host k) ();
-			make_field ~name:"virt_hw_vns" 
-				~get:(fun () -> String.concat "; " (List.map Int64.to_string (x ()).API.host_virt_hw_vns)) 
-				~get_set:(fun () -> List.map Int64.to_string (x ()).API.host_virt_hw_vns) ();
+			make_field ~name:"virtual_hardware_platform_versions" 
+				~get:(fun () -> String.concat "; " (List.map Int64.to_string (x ()).API.host_virtual_hardware_platform_versions)) 
+				~get_set:(fun () -> List.map Int64.to_string (x ()).API.host_virtual_hardware_platform_versions) ();
 		]}
 
 let vdi_record rpc session_id vdi =

ocaml/idl/datamodel.ml

@@ -4361,7 +4361,7 @@ let host =
 	field ~qualifier:DynamicRO ~lifecycle:[Published, rel_boston, ""] ~ty:(Set (Ref _pci)) "PCIs" "List of PCI devices in the host";
 	field ~qualifier:DynamicRO ~lifecycle:[Published, rel_boston, ""] ~ty:(Set (Ref _pgpu)) "PGPUs" "List of physical GPUs in the host";
 	field ~qualifier:RW ~in_product_since:rel_tampa ~default_value:(Some (VMap [])) ~ty:(Map (String, String)) "guest_VCPUs_params" "VCPUs params to apply to all resident guests";
-	field ~qualifier:DynamicRO ~in_product_since:rel_creedence ~default_value:(Some (VSet [VInt 0L])) ~ty:(Set (Int)) "virt_hw_vns" "The set of versions of the virtual hardware platform that the host can offer to its guests";
+	field ~qualifier:DynamicRO ~in_product_since:rel_creedence ~default_value:(Some (VSet [VInt 0L])) ~ty:(Set (Int)) "virtual_hardware_platform_versions" "The set of versions of the virtual hardware platform that the host can offer to its guests";
  ])
 	()
 
@@ -6887,7 +6887,7 @@ let vm =
 	field ~writer_roles:_R_VM_ADMIN ~qualifier:RW ~in_product_since:rel_boston ~default_value:(Some (VRef (Ref.string_of Ref.null))) ~ty:(Ref _sr) "suspend_SR" "The SR on which a suspend image is stored";
 	field ~qualifier:StaticRO ~in_product_since:rel_boston ~default_value:(Some (VInt 0L)) ~ty:Int "version" "The number of times this VM has been recovered";
 	field ~qualifier:StaticRO ~in_product_since:rel_clearwater ~default_value:(Some (VString "0:0")) ~ty:(String) "generation_id" "Generation ID of the VM";
-	field ~writer_roles:_R_VM_ADMIN ~qualifier:RW ~in_product_since:rel_creedence ~default_value:(Some (VInt 0L)) ~ty:Int "virt_hw_vn" "The host virtual hardware platform version the VM can run on";
+	field ~writer_roles:_R_VM_ADMIN ~qualifier:RW ~in_product_since:rel_creedence ~default_value:(Some (VInt 0L)) ~ty:Int "hardware_platform_version" "The host virtual hardware platform version the VM can run on";
       ])
 	()
 

ocaml/test/test_common.ml

@@ -77,7 +77,7 @@ let make_vm ~__context ?(name_label="name_label") ?(name_description="descriptio
 		?(other_config=[]) ?(xenstore_data=[]) ?(recommendations="") ?(ha_always_run=false)
 		?(ha_restart_priority="") ?(tags=[]) ?(blocked_operations=[]) ?(protection_policy=Ref.null)
 		?(is_snapshot_from_vmpp=false) ?(appliance=Ref.null) ?(start_delay=0L)
-		?(shutdown_delay=0L) ?(order=0L) ?(suspend_SR=Ref.null) ?(version=0L) ?(generation_id="0:0") ?(virt_hw_vn=0L) () =
+		?(shutdown_delay=0L) ?(order=0L) ?(suspend_SR=Ref.null) ?(version=0L) ?(generation_id="0:0") ?(hardware_platform_version=0L) () =
 	Xapi_vm.create ~__context ~name_label ~name_description ~user_version ~is_a_template
 		~affinity ~memory_target ~memory_static_max ~memory_dynamic_max ~memory_dynamic_min
         ~memory_static_min ~vCPUs_params ~vCPUs_max ~vCPUs_at_startup ~actions_after_shutdown 
@@ -86,7 +86,7 @@ let make_vm ~__context ?(name_label="name_label") ?(name_description="descriptio
 		~hVM_shadow_multiplier ~platform ~pCI_bus ~other_config ~xenstore_data ~recommendations
 		~ha_always_run ~ha_restart_priority ~tags ~blocked_operations ~protection_policy
 		~is_snapshot_from_vmpp ~appliance ~start_delay ~shutdown_delay ~order ~suspend_SR
-		~version ~generation_id ~virt_hw_vn
+		~version ~generation_id ~hardware_platform_version
 
 let make_host ~__context ?(uuid=make_uuid ()) ?(name_label="host")
 		?(name_description="description") ?(hostname="localhost") ?(address="127.0.0.1")

ocaml/xapi/cli_operations.ml

@@ -1553,7 +1553,7 @@ let vm_create printer rpc session_id params =
 		~suspend_SR:Ref.null
 		~version:0L
 		~generation_id:""
-		~virt_hw_vn:0L in
+		~hardware_platform_version:0L in
 	let uuid=Client.VM.get_uuid rpc session_id vm in
 	printer (Cli_printer.PList [uuid])
 

ocaml/xapi/create_misc.ml

@@ -194,7 +194,7 @@ and create_domain_zero_record ~__context ~domain_zero_ref (host_info: host_info)
 		~suspend_SR:Ref.null
 		~version:0L
 		~generation_id:""
-		~virt_hw_vn:0L;
+		~hardware_platform_version:0L;
 	Xapi_vm_helpers.update_memory_overhead ~__context ~vm:domain_zero_ref
 
 and create_domain_zero_console_record_with_protocol ~__context ~domain_zero_ref ~dom0_console_protocol =

ocaml/xapi/dbsync_slave.ml

@@ -82,7 +82,7 @@ let refresh_localhost_info ~__context info =
     Db.Host.set_software_version ~__context ~self:host ~value:software_version;
     Db.Host.set_API_version_major ~__context ~self:host ~value:Xapi_globs.api_version_major;
     Db.Host.set_API_version_minor ~__context ~self:host ~value:Xapi_globs.api_version_minor;
-    Db.Host.set_virt_hw_vns ~__context ~self:host ~value:Xapi_globs.host_virt_hw_vns;
+    Db.Host.set_virtual_hardware_platform_versions ~__context ~self:host ~value:Xapi_globs.host_virtual_hardware_platform_versions;
     Db.Host.set_hostname ~__context ~self:host ~value:info.hostname;
     let caps = String.split ' ' (Xenctrl.with_intf (fun xc -> Xenctrl.version_capabilities xc)) in
     Db.Host.set_capabilities ~__context ~self:host ~value:caps;

ocaml/xapi/import_xva.ml

@@ -90,7 +90,7 @@ let make __context rpc session_id srid (vms, vdis) =
 				~suspend_SR:Ref.null
 				~version:0L
 				~generation_id:""
-				~virt_hw_vn:0L
+				~hardware_platform_version:0L
 			      in
 
                  TaskHelper.operate_on_db_task ~__context

ocaml/xapi/xapi_globs.ml

@@ -851,4 +851,4 @@ let win_auto_update_support = 1L
  * reconsider the place(s) from which we call it. *)
 
 (* This set is used as an indicator to show the virtual hardware platform versions the current host offers to its guests *)
-let host_virt_hw_vns = [0L; win_auto_update_support]
+let host_virtual_hardware_platform_versions = [0L; win_auto_update_support]

ocaml/xapi/xapi_host.ml

@@ -607,7 +607,7 @@ let create ~__context ~uuid ~name_label ~name_description ~hostname ~address ~ex
 	~power_on_config:[]
 	~local_cache_sr
 	~guest_VCPUs_params:[]
-	~virt_hw_vns:(if host_is_us then Xapi_globs.host_virt_hw_vns else [0L])
+	~virtual_hardware_platform_versions:(if host_is_us then Xapi_globs.host_virtual_hardware_platform_versions  else [0L])
   ;
   (* If the host we're creating is us, make sure its set to live *)
   Db.Host_metrics.set_last_updated ~__context ~self:metrics ~value:(Date.of_float (Unix.gettimeofday ()));

ocaml/xapi/xapi_vm.ml

@@ -395,7 +395,7 @@ let create ~__context
 		~suspend_SR
 		~version
 		~generation_id
-		~virt_hw_vn
+		~hardware_platform_version
 		: API.ref_VM =
 	let gen_mac_seed () = Uuid.to_string (Uuid.make_uuid ()) in
 	(* Add random mac_seed if there isn't one specified already *)
@@ -447,7 +447,7 @@ let create ~__context
 		~suspend_SR
 		~version
 		~generation_id
-		~virt_hw_vn
+		~hardware_platform_version
 
 let destroy  ~__context ~self =
 	let parent = Db.VM.get_parent ~__context ~self in

ocaml/xapi/xapi_vm.mli

@@ -151,7 +151,7 @@ val create :
   suspend_SR:[ `SR ] Ref.t ->
   version:int64 ->
   generation_id:string ->
-  virt_hw_vn:int64
+  hardware_platform_version:int64
 -> API.ref_VM
 val destroy : __context:Context.t -> self:[ `VM ] Ref.t -> unit
 val clone :

ocaml/xapi/xapi_vm_clone.ml

@@ -330,7 +330,7 @@ let copy_vm_record ?(snapshot_info_record) ~__context ~vm ~disk_op ~new_name ~ne
 		~suspend_SR:Ref.null
 		~version:0L
 		~generation_id
-		~virt_hw_vn:0L
+		~hardware_platform_version:0L
 	;
 
 	(* update the VM's parent field in case of snapshot. Note this must be done after "ref"

ocaml/xapi/xapi_vm_helpers.ml

@@ -77,7 +77,7 @@ let create ~__context ~name_label ~name_description
 		~suspend_SR
 		~version
 		~generation_id
-		~virt_hw_vn
+		~hardware_platform_version
 		: API.ref_VM =
 
 	(* NB parameter validation is delayed until VM.start *)
@@ -144,7 +144,7 @@ let create ~__context ~name_label ~name_description
 		~suspend_SR
 		~version
 		~generation_id
-		~virt_hw_vn
+		~hardware_platform_version
 		;
 	Db.VM.set_power_state ~__context ~self:vm_ref ~value:`Halted;
 	Xapi_vm_lifecycle.update_allowed_operations ~__context ~self:vm_ref;
@@ -247,31 +247,31 @@ let validate_basic_parameters ~__context ~self ~snapshot:x =
 	  ~hVM_shadow_multiplier:x.API.vM_HVM_shadow_multiplier;
 	validate_actions_after_crash ~__context ~self ~value:x.API.vM_actions_after_crash
 
-let assert_virt_hw_support ~__context ~vm ~host =
-	let vm_virt_hw_vn = Db.VM.get_virt_hw_vn ~__context ~self:vm in
-	let host_virt_hw_vns = 
+let assert_hardware_platform_support ~__context ~vm ~host =
+	let vm_hardware_platform_version = Db.VM.get_hardware_platform_version ~__context ~self:vm in
+	let host_virtual_hardware_platform_versions = 
 		try
 			match host with
 				| Helpers.LocalObject host_ref ->
-					Db.Host.get_virt_hw_vns ~__context ~self:host_ref
+					Db.Host.get_virtual_hardware_platform_versions ~__context ~self:host_ref
 				| Helpers.RemoteObject (rpc, session_id, host_ref) ->
-					Client.Client.Host.get_virt_hw_vns ~rpc ~session_id ~self:host_ref
+					Client.Client.Host.get_virtual_hardware_platform_versions ~rpc ~session_id ~self:host_ref
 		with Not_found ->
 			(* An old host that does not understand the concept
 			 * has implicit support for version 0 *)
 			[0L]
 	in
-	if not (List.mem vm_virt_hw_vn host_virt_hw_vns) then
+	if not (List.mem vm_hardware_platform_version host_virtual_hardware_platform_versions) then
 		let host_r = match host with
 			| Helpers.LocalObject host_ref -> host_ref
 			| Helpers.RemoteObject (rpc, session_id, host_ref) -> host_ref
 		in
 		raise (Api_errors.Server_error (
 			Api_errors.vm_host_incompatible_virtual_hardware_platform_version, [
 				Ref.string_of host_r;
-				"["^(String.concat "; " (List.map Int64.to_string host_virt_hw_vns))^"]";
+				"["^(String.concat "; " (List.map Int64.to_string host_virtual_hardware_platform_versions))^"]";
 				Ref.string_of vm;
-				Int64.to_string vm_virt_hw_vn]))
+				Int64.to_string vm_hardware_platform_version]))
 
 let assert_host_is_enabled ~__context ~host =
 	(* Check the host is enabled first *)
@@ -501,7 +501,7 @@ let assert_can_boot_here ~__context ~self ~host ~snapshot ?(do_sr_check=true) ?(
 	assert_host_is_live ~__context ~host;
 	assert_host_is_enabled ~__context ~host;
 	(* Check the host can support the VM's required version of virtual hardware platform *)
-	assert_virt_hw_support ~__context ~vm:self ~host:(Helpers.LocalObject host);
+	assert_hardware_platform_support ~__context ~vm:self ~host:(Helpers.LocalObject host);
 	if do_sr_check then
 		assert_can_see_SRs ~__context ~self ~host;
 	assert_can_see_networks ~__context ~self ~host;
@@ -1064,6 +1064,6 @@ let update_vm_virtual_hardware_platform_version ~__context ~vm =
 		else
 			0L
 	in
-	let current_version = vm_record.API.vM_virt_hw_vn in
+	let current_version = vm_record.API.vM_hardware_platform_version in
 	if visibly_required_version > current_version then
-		Db.VM.set_virt_hw_vn ~__context ~self:vm ~value:visibly_required_version
+		Db.VM.set_hardware_platform_version ~__context ~self:vm ~value:visibly_required_version

ocaml/xapi/xapi_vm_migrate.ml

@@ -757,7 +757,7 @@ let assert_can_migrate  ~__context ~vm ~dest ~live ~vdi_map ~vif_map ~options =
 			~host_from:(Helpers.LocalObject source_host_ref)
 			~host_to;
 		(* Check the host can support the VM's required version of virtual hardware platform *)
-		Xapi_vm_helpers.assert_virt_hw_support ~__context ~vm ~host:host_to;
+		Xapi_vm_helpers.assert_hardware_platform_support ~__context ~vm ~host:host_to;
 
 		(*Check that the remote host is enabled and not in maintenance mode*)
 		let check_host_enabled = XenAPI.Host.get_enabled remote_rpc session_id (dest_host_ref) in