Skip to content

CP-54444: Return MAC addresses to host installer #6466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: feature/host-network-device-ordering
Choose a base branch
from
Open

CP-54444: Return MAC addresses to host installer #6466

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
529c7f1
CP-54444: Return MAC addresses to host installer
minglumlu May 12, 2025
6c56907
fixup! CP-54444: Return MAC addresses to host installer
minglumlu May 16, 2025
470d6d1
fixup! fixup! CP-54444: Return MAC addresses to host installer
minglumlu May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 52 additions & 15 deletions ocaml/networkd/bin_db/networkd_db.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,59 @@ let _ =
(Printf.sprintf "Usage: %s [-bridge <bridge> | -iface <interface>]" name) ;
try
let config = Network_config.read_config () in
if !bridge <> "" then
if List.mem_assoc !bridge config.bridge_config then (
let bridge_config = List.assoc !bridge config.bridge_config in
let ifaces =
List.concat_map (fun (_, port) -> port.interfaces) bridge_config.ports
in
Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ;
match bridge_config.vlan with
( if !bridge <> "" then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could the case of !bridge = "" not be handled as part of List.assoc_opt returning Null? I would try to reduce the deep nesting of conditions.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to distinguish the cases that no -bridge option and -bridge <br> where <br> is an invalid one.

match List.assoc_opt !bridge config.bridge_config with
| Some bridge_config -> (
let ifaces =
List.concat_map
(fun (_, port) -> port.interfaces)
bridge_config.ports
in
let macs =
let to_mac ~order name =
match List.find_opt (fun dev -> dev.name = name) order with
| Some dev ->
Either.Left (Macaddr.to_string dev.mac)
| None ->
Either.Right name
in
match (config.interface_order, ifaces) with
| Some order, _ :: _ ->
let oks, errs = List.partition_map (to_mac ~order) ifaces in
if errs = [] then
Ok oks
else
Error
(Printf.sprintf "Could not find MAC address(es) for %s"
(String.concat ", " errs)
)
| _, [] ->
(* No ifaces, no hwaddrs. *)
Ok []
| None, _ :: _ ->
(* Fallback to use the bridge MAC address when the interface_order
is not available. This can work only because the host installer
requires only one network interface to setup its own networking so far. *)
Ok (Option.to_list bridge_config.bridge_mac)
in
match macs with
| Error msg ->
rc := 1 ;
Printf.fprintf stderr "%s\n" msg
| Ok macs -> (
Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ;
Printf.printf "hwaddrs=%s\n" (String.concat "," macs) ;
match bridge_config.vlan with
| None ->
()
| Some (parent, id) ->
Printf.printf "vlan=%d\nparent=%s\n" id parent
)
)
| None ->
()
| Some (parent, id) ->
Printf.printf "vlan=%d\nparent=%s\n" id parent
) else (
rc := 1 ;
Printf.fprintf stderr "Could not find bridge %s\n" !bridge
) ;
rc := 1 ;
Printf.fprintf stderr "Could not find bridge %s\n" !bridge
) ;
if !iface <> "" then
if List.mem_assoc !iface config.interface_config then
let interface_config = List.assoc !iface config.interface_config in
Expand Down
Loading