Merge pull request #178 from psafont/noext

CP-33121: remove stdext's monadic usage

Author: psafont

networkd/dune

@@ -32,7 +32,6 @@
   rpclib
   systemd
   threads
-  xapi-stdext-monadic
   xapi-stdext-pervasives
   xapi-stdext-threads
   xapi-stdext-unix

networkd/network_server.ml

@@ -14,7 +14,6 @@
 
 open Network_utils
 open Network_interface
-open Xapi_stdext_monadic
 
 module S = Network_interface.Interface_API (Idl.Exn.GenServer ())
 
@@ -226,8 +225,8 @@ module Sriov = struct
   let make_vf_config dbg pci_address (vf_info : sriov_pci_t) =
     Debug.with_thread_associated dbg
       (fun () ->
-        let vlan = Opt.map Int64.to_int vf_info.vlan
-        and rate = Opt.map Int64.to_int vf_info.rate
+        let vlan = Option.map Int64.to_int vf_info.vlan
+        and rate = Option.map Int64.to_int vf_info.rate
         and pcibuspath = Xcp_pci.string_of_address pci_address in
         debug "Config VF with pci address: %s" pcibuspath ;
         match make_vf_conf_internal pcibuspath vf_info.mac vlan rate with
@@ -298,13 +297,15 @@ module Interface = struct
               Ip.flush_ip_addr name
             )
         | DHCP4 ->
-            let open Xapi_stdext_monadic in
             let gateway =
-              Opt.default []
-                (Opt.map (fun n -> [`gateway n]) !config.gateway_interface)
+              Option.fold ~none:[]
+                ~some:(fun n -> [`gateway n])
+                !config.gateway_interface
             in
             let dns =
-              Opt.default [] (Opt.map (fun n -> [`dns n]) !config.dns_interface)
+              Option.fold ~none:[]
+                ~some:(fun n -> [`dns n])
+                !config.dns_interface
             in
             let options = gateway @ dns in
             Dhclient.ensure_running name options
@@ -886,9 +887,7 @@ module Bridge = struct
                 )
             in
             let old_igmp_snooping = Ovs.get_mcast_snooping_enable ~name in
-            Xapi_stdext_monadic.Opt.iter
-              (destroy_existing_vlan_ovs_bridge dbg name)
-              vlan ;
+            Option.iter (destroy_existing_vlan_ovs_bridge dbg name) vlan ;
             ignore
               (Ovs.create_bridge ?mac ~fail_mode ?external_id ?disable_in_band
                  ?igmp_snooping vlan vlan_bug_workaround name) ;
@@ -898,7 +897,7 @@ module Bridge = struct
             ignore (Brctl.create_bridge name) ;
             Brctl.set_forwarding_delay name 0 ;
             Sysfs.set_multicast_snooping name false ;
-            Xapi_stdext_monadic.Opt.iter (Ip.set_mac name) mac ;
+            Option.iter (Ip.set_mac name) mac ;
             match vlan with
             | None ->
                 ()

test/test_jsonrpc_client.ml

@@ -13,21 +13,21 @@
  *)
 
 open Test_highlevel
-open Xapi_stdext_monadic.Either
 
 let dir = Filename.concat "test" "jsonrpc_files"
 
-let jsonrpc_printer : Rpc.t Test_printers.printer = Jsonrpc.to_string
+let pp_jsonrpc fmt rpc = Format.fprintf fmt "%s" (Jsonrpc.to_string rpc)
 
 module Input_json_object = Generic.MakeStateless (struct
   module Io = struct
     type input_t = string
 
-    type output_t = (exn, Rpc.t) Xapi_stdext_monadic.Either.t
+    type output_t = (Rpc.t, exn) result
 
     let string_of_input_t = Test_printers.string
 
-    let string_of_output_t = Test_printers.(either exn jsonrpc_printer)
+    let string_of_output_t =
+      Fmt.(str "%a" Dump.(result ~ok:pp_jsonrpc ~error:exn))
   end
 
   let good_call =
@@ -47,12 +47,12 @@ module Input_json_object = Generic.MakeStateless (struct
             5_000_000_000L
         in
         let rpc = Jsonrpc.of_string ~strict:false json in
-        Right rpc
+        Ok rpc
       with
       | End_of_file ->
-          Left End_of_file
+          Error End_of_file
       | _ ->
-          Left Parse_error
+          Error Parse_error
     in
     close_in fin ; response
 
@@ -61,14 +61,14 @@ module Input_json_object = Generic.MakeStateless (struct
       [
         (* A file containing exactly one JSON object. *)
         (* It has got curly braces inside strings to make it interesting. *)
-        ("good_call.json", Right good_call)
+        ("good_call.json", Ok good_call)
       ; (* A file containing a partial JSON object. *)
-        ("short_call.json", Left Parse_error)
+        ("short_call.json", Error Parse_error)
       ; (* A file containing a JSON object, plus some more characters at the
            end. *)
-        ("good_call_plus.json", Right good_call)
+        ("good_call_plus.json", Ok good_call)
       ; (* A file containing some invalid JSON object. *)
-        ("bad_call.json", Left Parse_error)
+        ("bad_call.json", Error Parse_error)
       ]
 end)
 

xapi-networkd.opam

@@ -20,7 +20,6 @@ depends: [
   "systemd"
   "xapi-idl"
   "xapi-inventory"
-  "xapi-stdext-monadic"
   "xapi-stdext-pervasives"
   "xapi-stdext-threads"
   "xapi-stdext-unix"