fixup! fixup! fixup! fixup! CP-54444: Return MAC addresses to host installer

Signed-off-by: Ming Lu <[email protected]>

Author: minglumlu

ocaml/networkd/bin_db/networkd_db.ml

@@ -38,11 +38,9 @@ let _ =
     let r =
       let* bridge = if !bridge = "" then Error Skip else Ok !bridge in
       let* bridge_config =
-        match List.assoc_opt bridge config.bridge_config with
-        | Some bridge_config ->
-            Ok bridge_config
-        | None ->
-            Error (Msg (Printf.sprintf "Could not find bridge %s\n" bridge))
+        let error = Msg (Printf.sprintf "Could not find bridge %s\n" bridge) in
+        List.assoc_opt bridge config.bridge_config
+        |> Option.to_result ~none:error
       in
       let ifaces =
         List.concat_map (fun (_, port) -> port.interfaces) bridge_config.ports
@@ -78,11 +76,10 @@ let _ =
       in
       Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ;
       Printf.printf "hwaddrs=%s\n" (String.concat "," macs) ;
-      match bridge_config.vlan with
-      | None ->
-          Ok ()
-      | Some (parent, id) ->
-          Ok (Printf.printf "vlan=%d\nparent=%s\n" id parent)
+      Option.iter
+        (fun (parent, id) -> Printf.printf "vlan=%d\nparent=%s\n" id parent)
+        bridge_config.vlan ;
+      Ok ()
     in
     ( match r with
     | Ok () | Error Skip ->