nbd: use URI type for /var/xapi/xapi socket

Signed-off-by: Christian Pardillo Laursen <[email protected]>

Author: cplaursen

ocaml/nbd/lib/consts.ml

@@ -1,5 +1,6 @@
 (** Xapi's local Unix domain socket *)
-let xapi_unix_domain_socket_uri = "file:///var/xapi/xapi"
+let xapi_unix_domain_socket_uri =
+  Uri.make ~scheme:"file" ~path:"/var/xapi/xapi" ()
 
 (** Location of the xensource-inventory file on XenServer *)
 let xensource_inventory_filename = "/etc/xensource-inventory"

ocaml/nbd/lib/dune

@@ -1,6 +1,7 @@
 (library
  (name consts)
  (modes best)
+ (libraries uri)
  (modules consts)
 )
 

ocaml/xapi-guard/test/xapi_guard_test.ml

@@ -86,8 +86,8 @@ let with_rpc f switch () =
     Server_interface.make_server_varstored push_nothing ~cache path vm_uuid
   in
   (* rpc simulates what varstored would do *)
-  let uri = Uri.make ~scheme:"file" ~path () |> Uri.to_string in
-  D.debug "Connecting to %s" uri ;
+  let uri = Uri.make ~scheme:"file" ~path () in
+  D.debug "Connecting to %s" (Uri.to_string uri) ;
   let rpc = make uri in
   Lwt.finalize
     (fun () ->

ocaml/xen-api-client/lwt/xen_api_lwt_unix.ml

@@ -129,7 +129,6 @@ let exn_to_string = function
       Printexc.to_string e
 
 let do_it uri string =
-  let uri = Uri.of_string uri in
   let connection = M.make uri in
   Lwt.finalize
     (fun () ->
@@ -179,7 +178,7 @@ module SessionCache = struct
 
   let make_rpc ?timeout target =
     let uri = Uri.with_path target "/jsonrpc" in
-    make_json ?timeout @@ Uri.to_string @@ uri
+    make_json ?timeout uri
 
   let create_rpc ?timeout rpc ~uname ~pwd ~version ~originator () =
     let acquire () =

ocaml/xen-api-client/lwt/xen_api_lwt_unix.mli

@@ -12,11 +12,11 @@
  * GNU Lesser General Public License for more details.
  *)
 
-val make : ?timeout:float -> string -> Rpc.call -> Rpc.response Lwt.t
+val make : ?timeout:float -> Uri.t -> Rpc.call -> Rpc.response Lwt.t
 (** [make ?timeout uri] returns an 'rpc' function which can be
     passed to Client.* functions *)
 
-val make_json : ?timeout:float -> string -> Rpc.call -> Rpc.response Lwt.t
+val make_json : ?timeout:float -> Uri.t -> Rpc.call -> Rpc.response Lwt.t
 (** [make ?timeout uri] returns an 'rpc' function which can be
     passed to Client.* functions *)