Merge pull request #5614 from psafont/topping

Author: psafont

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 "xen-api@lists.xen.org")

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