Refactor Storage_smapiv1.find_vdi

Move this to storage_utils.ml since it is used by storage_smapiv1.ml and
storage_mux.ml

Signed-off-by: Vincent Liu <[email protected]>

Author: Vincent-lau

ocaml/xapi/storage_mux.ml

@@ -19,6 +19,7 @@ module D = Debug.Make (struct let name = "mux" end)
 open D
 open Storage_interface
 open Storage_mux_reg
+open Storage_utils
 
 let s_of_sr = Storage_interface.Sr.string_of
 
@@ -330,27 +331,6 @@ module Mux = struct
       Storage_migrate.update_snapshot_info_src ~dbg:(Debug_info.to_string di)
         ~sr ~vdi ~url ~dest ~dest_vdi ~snapshot_pairs
 
-    exception No_VDI
-
-    (* Find a VDI given a storage-layer SR and VDI *)
-    let find_vdi ~__context sr vdi =
-      let sr = s_of_sr sr in
-      let vdi = s_of_vdi vdi in
-      let open Xapi_database.Db_filter_types in
-      let sr = Db.SR.get_by_uuid ~__context ~uuid:sr in
-      match
-        Db.VDI.get_records_where ~__context
-          ~expr:
-            (And
-               ( Eq (Field "location", Literal vdi)
-               , Eq (Field "SR", Literal (Ref.string_of sr))
-               )
-            )
-      with
-      | x :: _ ->
-          x
-      | _ ->
-          raise No_VDI
 
     let set_is_a_snapshot _context ~dbg ~sr ~vdi ~is_a_snapshot =
       Server_helpers.exec_with_new_task "VDI.set_is_a_snapshot"

ocaml/xapi/storage_smapiv1.ml

@@ -18,8 +18,7 @@ open D
 module Date = Clock.Date
 module XenAPI = Client.Client
 open Storage_interface
-
-exception No_VDI
+open Storage_utils
 
 let s_of_vdi = Vdi.string_of
 
@@ -30,26 +29,6 @@ let with_lock = Xapi_stdext_threads.Threadext.Mutex.execute
 let with_dbg ~name ~dbg f =
   Debug_info.with_dbg ~module_name:"SMAPIv1" ~name ~dbg f
 
-(* Find a VDI given a storage-layer SR and VDI *)
-let find_vdi ~__context sr vdi =
-  let sr = s_of_sr sr in
-  let vdi = s_of_vdi vdi in
-  let open Xapi_database.Db_filter_types in
-  let sr = Db.SR.get_by_uuid ~__context ~uuid:sr in
-  match
-    Db.VDI.get_records_where ~__context
-      ~expr:
-        (And
-           ( Eq (Field "location", Literal vdi)
-           , Eq (Field "SR", Literal (Ref.string_of sr))
-           )
-        )
-  with
-  | x :: _ ->
-      x
-  | _ ->
-      raise No_VDI
-
 (* Find a VDI reference given a name *)
 let find_content ~__context ?sr name =
   (* PR-1255: the backend should do this for us *)

ocaml/xapi/storage_smapiv1.mli

@@ -20,7 +20,4 @@ val vdi_read_write : (Sr.t * Vdi.t, bool) Hashtbl.t
 
 val vdi_info_of_vdi_rec : Context.t -> API.vDI_t -> Storage_interface.vdi_info
 
-val find_vdi : __context:Context.t -> Sr.t -> Vdi.t -> [`VDI] Ref.t * API.vDI_t
-(** Find a VDI given a storage-layer SR and VDI *)
-
 module SMAPIv1 : Server_impl

ocaml/xapi/storage_utils.ml

@@ -14,6 +14,10 @@
 
 open Storage_interface
 
+let s_of_sr = Storage_interface.Sr.string_of
+
+let s_of_vdi = Storage_interface.Vdi.string_of
+
 let string_of_vdi_type vdi_type =
   Rpc.string_of_rpc (API.rpc_of_vdi_type vdi_type)
 
@@ -173,3 +177,24 @@ let transform_storage_exn f =
         (Api_errors.Server_error
            (Api_errors.internal_error, [Printexc.to_string e])
         )
+
+exception No_VDI
+
+let find_vdi ~__context sr vdi =
+  let sr = s_of_sr sr in
+  let vdi = s_of_vdi vdi in
+  let open Xapi_database.Db_filter_types in
+  let sr = Db.SR.get_by_uuid ~__context ~uuid:sr in
+  match
+    Db.VDI.get_records_where ~__context
+      ~expr:
+        (And
+           ( Eq (Field "location", Literal vdi)
+           , Eq (Field "SR", Literal (Ref.string_of sr))
+           )
+        )
+  with
+  | x :: _ ->
+      x
+  | _ ->
+      raise No_VDI

ocaml/xapi/storage_utils.mli

@@ -64,3 +64,12 @@ val rpc :
 
 val transform_storage_exn : (unit -> 'a) -> 'a
 (** [transform_storage_exn f] runs [f], rethrowing any storage error as a nice XenAPI error *)
+
+exception No_VDI
+
+val find_vdi :
+     __context:Context.t
+  -> Storage_interface.sr
+  -> Storage_interface.vdi
+  -> [`VDI] Ref.t * API.vDI_t
+(** Find a VDI given a storage-layer SR and VDI *)

ocaml/xapi/xapi_services.ml

@@ -196,7 +196,7 @@ let put_handler (req : Http.Request.t) s _ =
           http_proxy_to_plugin req s name
       | [""; services; "SM"; "data"; sr; vdi] when services = _services ->
           let vdi, _ =
-            Storage_smapiv1.find_vdi ~__context
+            Storage_utils.find_vdi ~__context
               (Storage_interface.Sr.of_string sr)
               (Storage_interface.Vdi.of_string vdi)
           in