Change API call to 'get_SRs_required_for_recovery'

Author: akshayramani

ocaml/idl/datamodel.ml

@@ -2224,14 +2224,14 @@ let vm_assert_can_be_recovered = call
   ~allowed_roles:_R_READ_ONLY
   ()
 
-let vm_required_list_of_SRs = call
-	~name:"required_list_of_SRs"
+let vm_get_SRs_required_for_recovery = call
+	~name:"get_SRs_required_for_recovery"
 	~in_product_since:rel_clearwater
 	~doc:"List all the SR's that are required for the VM to be recovered"
 	~params:[Ref _vm , "self" , "The VM for which the SRs have to be recovered";
 					Ref _session , "session_to" , "The session to which the SRs of the VM have to be recovered."]
 	~result:(Set(Ref _sr),"refs for SRs required to recover the VM")
-	~errs:[Api_errors.vm_requires_sr]
+	~errs:[]
 	~allowed_roles:_R_READ_ONLY
 	()
 
@@ -6707,7 +6707,7 @@ let vm =
 		vm_set_order;
 		vm_set_suspend_VDI;
 		vm_assert_can_be_recovered;
-		vm_required_list_of_SRs;
+		vm_get_SRs_required_for_recovery;
 		vm_recover;
 		vm_import_convert;
 		vm_set_appliance;

ocaml/xapi/message_forwarding.ml

@@ -1942,9 +1942,9 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
 			info "VM.assert_can_be_recovered: self = '%s';" (vm_uuid ~__context self);
 			Local.VM.assert_can_be_recovered ~__context ~self ~session_to
 
-		let required_list_of_SRs ~__context ~self ~session_to =
-			info "VM.required_list_of_SRs: self = '%s';" (vm_uuid ~__context self);
-			Local.VM.required_list_of_SRs ~__context ~self ~session_to
+		let get_SRs_required_for_recovery ~__context ~self ~session_to =
+			info "VM.get_SRs_required_for_recovery: self = '%s';" (vm_uuid ~__context self);
+			Local.VM.get_SRs_required_for_recovery ~__context ~self ~session_to
 
 		let recover ~__context ~self ~session_to ~force =
 			info "VM.recover: self = '%s'; force = %b;" (vm_uuid ~__context self) force;

ocaml/xapi/xapi_vm.ml

@@ -778,8 +778,8 @@ let set_order ~__context ~self ~value =
 let assert_can_be_recovered ~__context ~self ~session_to =
 	Xapi_vm_helpers.assert_can_be_recovered ~__context ~self ~session_to
 
-let required_list_of_SRs ~__context ~self ~session_to =
-	Xapi_vm_helpers.required_list_of_SRs ~__context ~self ~session_to
+let get_SRs_required_for_recovery ~__context ~self ~session_to =
+	Xapi_vm_helpers.get_SRs_required_for_recovery ~__context ~self ~session_to
 
 let recover ~__context ~self ~session_to ~force =
 	Xapi_dr.assert_session_allows_dr ~session_id:session_to ~action:"VM.recover";

ocaml/xapi/xapi_vm.mli

@@ -229,7 +229,7 @@ val set_shutdown_delay : __context:Context.t -> self:API.ref_VM -> value:int64 -
 val set_order : __context:Context.t -> self:API.ref_VM -> value:int64 -> unit
 
 val assert_can_be_recovered : __context:Context.t -> self:API.ref_VM -> session_to:API.ref_session -> unit
-val required_list_of_SRs : __context:Context.t -> self:API.ref_VM -> session_to:API.ref_session ->API.ref_SR list
+val get_SRs_required_for_recovery : __context:Context.t -> self:API.ref_VM -> session_to:API.ref_session ->API.ref_SR list
 val recover : __context:Context.t -> self:API.ref_VM ->
 	session_to:API.ref_session -> force:bool -> unit
 val set_suspend_VDI : __context:Context.t -> self:API.ref_VM ->

ocaml/xapi/xapi_vm_helpers.ml

@@ -767,13 +767,12 @@ let assert_can_be_recovered ~__context ~self ~session_to =
 		raise (Api_errors.Server_error(Api_errors.vm_requires_sr,
 			[Ref.string_of self; Ref.string_of sr]))
 
-let required_list_of_SRs ~__context ~self ~session_to =
+let get_SRs_required_for_recovery ~__context ~self ~session_to =
 	let required_SR_list = list_required_SRs ~__context ~self in
 	let required_SR_uuids = List.map( fun sr ->Db.SR.get_uuid ~__context ~self:sr) required_SR_list
 	in
 	try
 		let sr_uuids_list=
-			debug "AKSHAY";
 		Server_helpers.exec_with_new_task ~session_id:session_to
 			"Looking for the required SRs"
 				(fun __context_to ->  List.filter
@@ -792,11 +791,6 @@ let required_list_of_SRs ~__context ~self ~session_to =
 				in
 				List.map(fun sr -> Db.SR.get_by_uuid ~__context ~uuid:sr)sr_uuids_list
 	with e -> raise e;;
-				(*(*Finally pass a reference of the SRs*)
-				List.map(fun sr-> Db.SR.get_by_uuid ~__context ~uuid:sr_uuid)required_SR_uuids
-	with Db_exn.Read_missing_uuid(_ , _ , sr_uuid) ->
-		(*Add that SR to the required_SR_list*)
-		List.map(fun sr -> Db.SR.get_by_uuid ~__context ~uuid:sr_uuid)required_SR_uuids*)
 
 
 (* BIOS strings *)