Merge 68df708 into c264219

Author: Vincent-lau

ocaml/database/database_test.ml

@@ -580,6 +580,24 @@ functor
           let (_ : string) = Client.db_get_by_uuid t "VM" invalid_uuid in
           failwith "db_get_by_uuid <invalid uuid>"
       ) ;
+      Printf.printf "db_get_by_uuid_opt <valid uuid>\n" ;
+      let r = Client.db_get_by_uuid_opt t "VM" valid_uuid in
+      ( if r <> Some valid_ref then
+          let rs = Option.fold ~none:"None" ~some:Fun.id r in
+          failwith
+            (Printf.sprintf
+               "db_get_by_uuid_opt <valid uuid>: got %s; expected %s" rs
+               valid_ref
+            )
+      ) ;
+      Printf.printf "db_get_by_uuid_opt <invalid uuid>\n" ;
+      let r = Client.db_get_by_uuid_opt t "VM" invalid_uuid in
+      if not (Option.is_none r) then
+        failwith
+          (Printf.sprintf
+             "db_get_by_uuid_opt <invalid uuid>: got %s; expected None"
+             valid_ref
+          ) ;
       Printf.printf "get_by_name_label <invalid name label>\n" ;
       if Client.db_get_by_name_label t "VM" invalid_name <> [] then
         failwith "db_get_by_name_label <invalid name label>" ;

ocaml/database/db_remote_cache_access_v1.ml

@@ -102,6 +102,12 @@ module DBCacheRemoteListener = struct
           let s, e = unmarshall_db_get_by_uuid_args args in
           success
             (marshall_db_get_by_uuid_response (DBCache.db_get_by_uuid t s e))
+      | "db_get_by_uuid_opt" ->
+          let s, e = unmarshall_db_get_by_uuid_args args in
+          success
+            (marshall_db_get_by_uuid_opt_response
+               (DBCache.db_get_by_uuid_opt t s e)
+            )
       | "db_get_by_name_label" ->
           let s, e = unmarshall_db_get_by_name_label_args args in
           success

ocaml/database/db_remote_cache_access_v2.ml

@@ -36,6 +36,8 @@ let process_rpc (req : Rpc.t) =
             Response.Read_field_where (DB.read_field_where t w)
         | Request.Db_get_by_uuid (a, b) ->
             Response.Db_get_by_uuid (DB.db_get_by_uuid t a b)
+        | Request.Db_get_by_uuid_opt (a, b) ->
+            Response.Db_get_by_uuid_opt (DB.db_get_by_uuid_opt t a b)
         | Request.Db_get_by_name_label (a, b) ->
             Response.Db_get_by_name_label (DB.db_get_by_name_label t a b)
         | Request.Create_row (a, b, c) ->

ocaml/database/db_rpc_client_v2.ml

@@ -78,7 +78,7 @@ functor
           raise Remote_db_server_returned_bad_message
 
     let db_get_by_uuid_opt _ t u =
-      match process (Request.Db_get_by_uuid (t, u)) with
+      match process (Request.Db_get_by_uuid_opt (t, u)) with
       | Response.Db_get_by_uuid_opt y ->
           y
       | _ ->

ocaml/database/db_rpc_common_v1.ml

@@ -192,6 +192,8 @@ let unmarshall_db_get_by_uuid_args xml = unmarshall_2strings xml
 
 let marshall_db_get_by_uuid_response s = XMLRPC.To.string s
 
+let marshall_db_get_by_uuid_opt_response = marshall_stringopt
+
 let unmarshall_db_get_by_uuid_response xml = XMLRPC.From.string xml
 
 let unmarshall_db_get_by_uuid_opt_response xml = unmarshall_stringopt xml

ocaml/database/db_rpc_common_v2.ml

@@ -23,6 +23,7 @@ module Request = struct
     | Find_refs_with_filter of string * Db_filter_types.expr
     | Read_field_where of Db_cache_types.where_record
     | Db_get_by_uuid of string * string
+    | Db_get_by_uuid_opt of string * string
     | Db_get_by_name_label of string * string
     | Create_row of string * (string * string) list * string
     | Delete_row of string * string