CP-54444: Return MAC addresses to host installer #6466
Conversation
The host installer uses this utility to get the management interface from the management bridge. Now it changes to use MAC address(es) to find out the management interface(s). This is because the interface-rename functionality will be deprecated and the names of the network interfaces are not guaranteed to be the same between dom0 and host installer's running environment. Note that this change must be delivered to a host before upgrading to a new version in which the interface-rename is deprecated because the host installer is built from the new version and it will not be able to find the management network interface by name if the networkd_db command returns only names generated by interface-rename. Specifically, the "interface_order" field is only available when the networkd takes place of interface-rename to generate order. Before that, only the "bridge_mac" can be used because at that time, the host installer only uses one interface to setup its own networking during installation and no MAC addresses are recorded in networkd.db for individual interfaces. The "bridge_mac" is just the MAC address of one of the interfaces which construct the management bridge. Signed-off-by: Ming Lu <[email protected]>
|
xenserver/host-installer#249 is for the host installer change. |
ocaml/networkd/bin_db/networkd_db.ml
Outdated
| Printf.fprintf stderr "%s\n" msg | ||
| | Ok macs -> ( | ||
| Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ; | ||
| Printf.printf "hwaddrs=%s\n" (String.concat "," (List.rev macs)) ; |
There was a problem hiding this comment.
Does adding this line work with the current script?
There was a problem hiding this comment.
Yes. The current script doesn't care about any extra keys in the output.
Signed-off-by: Ming Lu <[email protected]>
Signed-off-by: Ming Lu <[email protected]>
ocaml/networkd/bin_db/networkd_db.ml
Outdated
| in | ||
| Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ; | ||
| match bridge_config.vlan with | ||
| ( if !bridge <> "" then |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
This is to distinguish the cases that no -bridge option and -bridge <br> where <br> is an invalid one.
|
I would like @robhoes to take a look, too. |
Signed-off-by: Ming Lu <[email protected]>
| 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 |
There was a problem hiding this comment.
This could use |> Option.to_result ~none:error instead of the match, although that will construct the error every single time. It's a weak part of the API. It'd be nicer if it had been val to_error : none:(unit -> 'e) -> 'a option -> ('a, 'e) result
| | None -> | ||
| Ok () | ||
| | Some (parent, id) -> | ||
| Ok (Printf.printf "vlan=%d\nparent=%s\n" id parent) |
There was a problem hiding this comment.
I don't like using a side effect in the value position of Ok.
The host installer uses this utility to get the management interface from the management bridge. Now it changes to use MAC address(es) to find out the management interface(s). This is because the interface-rename functionality will be deprecated and the names of the network interfaces are not guaranteed to be the same between dom0 and host installer's running environment.
Note that this change must be delivered to a host before upgrading to a new version in which the interface-rename is deprecated because the host installer is built from the new version and it will not be able to find the management network interface by name if the networkd_db command returns only names generated by interface-rename.
Specifically, the "interface_order" field is only available when the networkd takes place of interface-rename to generate order. Before that, only the "bridge_mac" can be used because at that time, the host installer only uses one interface to setup its own networking during installation and no MAC addresses are recorded in networkd.db for individual interfaces. The "bridge_mac" is just the MAC address of one of the interfaces which construct the management bridge.