IH-568, fix (dune utop): conflicting module names with compiler libraries

dune-project

@@ -3,6 +3,7 @@
 
 (generate_opam_files true)
 
+(name "xapi")
 (source (github xapi-project/xen-api))
 (license "LGPL-2.1-only WITH OCaml-LGPL-linking-exception")
 (authors "[email protected]")

ocaml/database/block_device_io.ml

@@ -90,6 +90,8 @@
 
 open Xapi_stdext_pervasives.Pervasiveext
 open Xapi_stdext_unix
+module Db_globs = Xapi_database.Db_globs
+module Block_device_io_errors = Xapi_database.Block_device_io_errors
 
 let name = "block_device_io"
 

ocaml/database/database_server_main.ml

@@ -17,7 +17,7 @@ let c = Condition.create ()
 
 (** Handler for the remote database access URL *)
 let remote_database_access_handler_v1 req bio =
-  try Db_remote_cache_access_v1.handler req bio
+  try Xapi_database.Db_remote_cache_access_v1.handler req bio
   with e ->
     Printf.printf "Caught: %s\n" (Printexc.to_string e) ;
     Printexc.print_backtrace stdout ;
@@ -26,14 +26,15 @@ let remote_database_access_handler_v1 req bio =
 
 (** Handler for the remote database access URL *)
 let remote_database_access_handler_v2 req bio =
-  try Db_remote_cache_access_v2.handler req bio
+  try Xapi_database.Db_remote_cache_access_v2.handler req bio
   with e ->
     Printf.printf "Caught: %s\n" (Printexc.to_string e) ;
     Printexc.print_backtrace stdout ;
     flush stdout ;
     raise e
 
-module Local_tests = Database_test.Tests (Db_cache_impl)
+module Local_tests =
+  Xapi_database.Database_test.Tests (Xapi_database.Db_cache_impl)
 
 let schema = Test_schemas.schema
 
@@ -67,6 +68,7 @@ let _ =
     | Slave _ ->
         failwith "unimplemented"
     | Master db_filename ->
+        let open Xapi_database in
         Printf.printf "Database path: %s\n%!" db_filename ;
         let db = Parse_db_conf.make db_filename in
         Db_conn_store.initialise_db_connections [db] ;

ocaml/database/db_cache_test.ml

@@ -12,7 +12,8 @@
  * GNU Lesser General Public License for more details.
  *)
 
-open Db_cache_types
+open Xapi_database
+open Xapi_database.Db_cache_types
 
 let create_test_db () =
   let schema = Test_schemas.many_to_many in

ocaml/database/dune

@@ -21,6 +21,7 @@
 
 (library
   (name xapi_database)
+  (modes best)
   (modules
     (:standard \ database_server_main db_cache_test db_names db_exn
       block_device_io string_marshall_helper string_unmarshall_helper schema
@@ -48,7 +49,6 @@
     xml-light2
     xmlm
   )
-  (wrapped false)
   (preprocess (pps ppx_deriving_rpc))
 )
 

ocaml/database/unit_test_marshall.ml

@@ -11,9 +11,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  *)
-open Db_rpc_common_v1
-open Db_cache_types
-open Db_filter_types
+open Xapi_database.Db_rpc_common_v1
+open Xapi_database.Db_cache_types
+open Xapi_database.Db_filter_types
 
 (* Check, for randomly chosen x's, that (unmarshall (marshall x)) = x *)
 

ocaml/db_process/xapi_db_process.ml

@@ -14,7 +14,8 @@
 module D = Debug.Make (struct let name = "xapi-db-process" end)
 
 open D
-open Db_cache_types
+open Xapi_database
+open Xapi_database.Db_cache_types
 
 let compress = ref false
 

ocaml/idl/ocaml_backend/gen_db_actions.ml

@@ -271,13 +271,14 @@ let ocaml_of_tbl_fields xs =
 let open_db_module =
   [
     "let __t = Context.database_of __context in"
-  ; "let module DB = (val (Db_cache.get __t) : Db_interface.DB_ACCESS) in"
+  ; "let module DB = (val (Xapi_database.Db_cache.get __t) : \
+     Xapi_database.Db_interface.DB_ACCESS) in"
   ]
 
 let db_action api : O.Module.t =
   let api = make_db_api api in
   let expr = "expr" in
-  let expr_arg = O.Named (expr, "Db_filter_types.expr") in
+  let expr_arg = O.Named (expr, "Xapi_database.Db_filter_types.expr") in
   let get_refs_where (obj : obj) =
     let tbl = Escaping.escape_obj obj.DT.name in
     let body =
@@ -526,13 +527,13 @@ let db_action api : O.Module.t =
       | FromObject GetAllRecords ->
           String.concat "\n"
             [
-              "let expr' = Db_filter_types.True in"
+              "let expr' = Xapi_database.Db_filter_types.True in"
             ; "get_records_where ~" ^ Gen_common.context ^ " ~expr:expr'"
             ]
       | FromObject GetAllRecordsWhere ->
           String.concat "\n"
             [
-              "let expr' = Db_filter.expr_of_string expr in"
+              "let expr' = Xapi_database.Db_filter.expr_of_string expr in"
             ; "get_records_where ~" ^ Gen_common.context ^ " ~expr:expr'"
             ]
       | _ ->
@@ -577,7 +578,7 @@ let db_action api : O.Module.t =
   O.Module.make ~name:_db_action
     ~preamble:
       [
-        "open Db_cache_types"
+        "open Xapi_database.Db_cache_types"
       ; "module D=Debug.Make(struct let name=\"db\" end)"
       ; "open D"
       ]

ocaml/libs/ezxenstore/core/dune

@@ -1,7 +1,6 @@
 (library
   (name ezxenstore_core)
   (public_name ezxenstore.core)
-  (wrapped false)
   (libraries
     cmdliner
     logs

ocaml/libs/ezxenstore/lib_test/main.ml

@@ -6,7 +6,7 @@ let set_socket_path path = Xs_transport.xenstored_socket := path
 
 let test socket =
   set_socket_path socket ;
-  let open Xenstore in
+  let open Ezxenstore_core.Xenstore in
   if Unix.geteuid () <> 0 then (* non-root won't have access to xenstore *)
     `Ok 0
   else

ocaml/libs/ezxenstore/watch/ez_xenstore_watch.ml

@@ -19,7 +19,7 @@ end
 
 module Make (Debug : DEBUG) = struct
   open Debug
-  open Xenstore
+  open Ezxenstore_core.Xenstore
 
   exception Watch_overflow
 
@@ -46,7 +46,7 @@ module Make (Debug : DEBUG) = struct
 
     val watch_fired :
          Xenctrl.handle
-      -> Xenstore.Xs.xsh
+      -> Ezxenstore_core.Xenstore.Xs.xsh
       -> string
       -> Xenctrl.domaininfo IntMap.t
       -> IntSet.t
@@ -56,9 +56,11 @@ module Make (Debug : DEBUG) = struct
 
     val found_running_domain : int -> string -> unit
 
-    val domain_appeared : Xenctrl.handle -> Xenstore.Xs.xsh -> int -> unit
+    val domain_appeared :
+      Xenctrl.handle -> Ezxenstore_core.Xenstore.Xs.xsh -> int -> unit
 
-    val domain_disappeared : Xenctrl.handle -> Xenstore.Xs.xsh -> int -> unit
+    val domain_disappeared :
+      Xenctrl.handle -> Ezxenstore_core.Xenstore.Xs.xsh -> int -> unit
   end
 
   let watch ~xs token path =

ocaml/libs/http-lib/dune

@@ -35,6 +35,7 @@
 (library
   (name httpsvr)
   (wrapped false)
+  (modes best)
   (modules http_svr http_proxy server_io)
   (libraries
     astring
@@ -51,6 +52,7 @@
 (tests
   (names http_test radix_tree_test)
   (package http-lib)
+  (modes (best exe))
   (modules http_test radix_tree_test)
   (libraries
     alcotest

ocaml/nbd/lib/local_xapi_session.ml

@@ -13,7 +13,7 @@
  *)
 
 open Lwt.Infix
-module Xen_api = Xen_api_lwt_unix
+module Xen_api = Xen_api_client_lwt.Xen_api_lwt_unix
 
 let wait_for_xapi_and_login () =
   let rpc = Xen_api.make Consts.xapi_unix_domain_socket_uri in

ocaml/nbd/src/cleanup.ml

@@ -13,7 +13,7 @@
  *)
 
 open Lwt.Infix
-module Xen_api = Xen_api_lwt_unix
+module Xen_api = Xen_api_client_lwt.Xen_api_lwt_unix
 
 let ignore_exn_log_error msg t =
   Lwt.catch t (fun e -> Lwt_log.error (msg ^ ": " ^ Printexc.to_string e))

ocaml/nbd/src/main.ml

@@ -15,7 +15,7 @@
 open Lwt.Infix
 
 (* Xapi external interfaces: *)
-module Xen_api = Xen_api_lwt_unix
+module Xen_api = Xen_api_client_lwt.Xen_api_lwt_unix
 
 let ignore_exn_delayed t () = Lwt.catch t (fun _ -> Lwt.return_unit)
 

ocaml/tests/common/alcotest_comparators.ml

@@ -31,9 +31,11 @@ let vdi_nbd_server_info_set =
 let vdi_type : API.vdi_type Alcotest.testable =
   from_rpc_of_t API.rpc_of_vdi_type
 
-let db_cache_structured_op = from_rpc_of_t Db_cache_types.rpc_of_structured_op_t
+let db_cache_structured_op =
+  from_rpc_of_t Xapi_database.Db_cache_types.rpc_of_structured_op_t
 
-let db_rpc_request = from_rpc_of_t Db_rpc_common_v2.Request.rpc_of_t
+let db_rpc_request =
+  from_rpc_of_t Xapi_database.Db_rpc_common_v2.Request.rpc_of_t
 
 let ref () = from_to_string Ref.string_of
 

ocaml/tests/common/dune

@@ -1,6 +1,7 @@
 (library
   (name tests_common)
   (modules :standard)
+  (modes best)
   (wrapped false)
   (libraries
     alcotest

ocaml/tests/common/mock.ml

@@ -13,6 +13,8 @@
  *)
 
 module Database = struct
+  open Xapi_database
+
   let _schema = Datamodel_schema.of_datamodel ()
 
   let conn = [Parse_db_conf.make "./xapi-db.xml"]

ocaml/tests/dune

@@ -1,6 +1,6 @@
 (test
   (name suite_alcotest)
-  (modes exe)
+  (modes (best exe))
   (package xapi)
   (modules
     (:standard \ test_daemon_manager test_vdi_cbt test_event test_clustering
@@ -121,6 +121,7 @@
 (name test_observer)
 (package xapi)
 (modules test_observer)
+(modes (best exe))
 (libraries alcotest tracing xapi_internal tests_common yojson))
 
 (rule

ocaml/tests/test_db_lowlevel.ml

@@ -13,6 +13,7 @@
  *)
 
 open Test_common
+open Xapi_database
 
 (* If we delete a record after making a Db.get_all_records call, but before the
  * call returns, then Db.get_all_records should return successfully (not throw

ocaml/tests/test_ha_vm_failover.ml

@@ -384,7 +384,7 @@ module AssertNewVMPreservesHAPlan = Generic.MakeStateful (struct
   let load_input __context (pool, _) = setup ~__context pool
 
   let extract_output __context (_pool, vm) =
-    let open Db_filter_types in
+    let open Xapi_database.Db_filter_types in
     let local_sr =
       Db.SR.get_refs_where ~__context
         ~expr:(Eq (Field "shared", Literal "false"))

ocaml/tests/test_helpers.ml

@@ -62,7 +62,7 @@ module DetermineGateway = Generic.MakeStateful (struct
     let management_interface =
       Option.map
         (fun device ->
-          let open Db_filter_types in
+          let open Xapi_database.Db_filter_types in
           let pifs =
             Db.PIF.get_refs_where ~__context
               ~expr:(Eq (Field "device", Literal device))

ocaml/xapi-cli-server/cli_util.ml

@@ -242,6 +242,7 @@ let get_default_sr_uuid rpc session_id =
 
 (* Given a string that might be a ref, lookup ref in cache and print uuid/name-label where possible *)
 let ref_convert x =
+  let module Ref_index = Xapi_database.Ref_index in
   match Ref_index.lookup x with
   | None ->
       x

ocaml/xapi-cli-server/dune

@@ -1,5 +1,6 @@
 (library
   (name xapi_cli_server)
+  (modes best)
   (libraries
     astring
     base64

ocaml/xapi-cli-server/records.ml

@@ -139,6 +139,8 @@ let safe_get_field x =
   | e ->
       raise e
 
+module Ref_index = Xapi_database.Ref_index
+
 let get_uuid_from_ref r =
   try
     match Ref_index.lookup (Ref.string_of r) with

ocaml/xapi-guard/lib/server_interface.ml

@@ -32,7 +32,7 @@ type session = [`session] Ref.t
 
 type rpc = call -> response Lwt.t
 
-open Xen_api_lwt_unix
+open Xen_api_client_lwt.Xen_api_lwt_unix
 
 let shutdown = Lwt_switch.create ()
 
@@ -102,10 +102,8 @@ let serve_forever_lwt_callback rpc_fn path _ req body =
 
 let with_xapi_vtpm ~cache vm_uuid =
   let vm_uuid_str = Uuidm.to_string vm_uuid in
-  let* vm =
-    with_xapi ~cache @@ Xen_api_lwt_unix.VM.get_by_uuid ~uuid:vm_uuid_str
-  in
-  let* vTPMs = with_xapi ~cache @@ Xen_api_lwt_unix.VM.get_VTPMs ~self:vm in
+  let* vm = with_xapi ~cache @@ VM.get_by_uuid ~uuid:vm_uuid_str in
+  let* vTPMs = with_xapi ~cache @@ VM.get_VTPMs ~self:vm in
   match vTPMs with
   | [] ->
       D.warn