-
Notifications
You must be signed in to change notification settings - Fork 292
CP-309523: Make networkd_db utility return bridge MAC address #6637
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.
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
Conversation
ocaml/networkd/bin_db/networkd_db.ml
Outdated
in | ||
Printf.printf "interfaces=%s\n" (String.concat "," ifaces) ; | ||
Printf.printf "hwaddrs=%s\n" | ||
(String.concat "," (Option.to_list bridge_config.bridge_mac)) ; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. It's enough for host installer but not from the utility's perspective. The utility can be used independently as well.
Another point, can we get the mac addresses in host installer from interface-rename-data at the mount point?
It's possible but it would get the host installer changed too much - mounting the partition in that place. The networkd_db utility seems the best to get the information even in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me have a try on host installer. I think the file can be retrieved at that point.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The type of bridge_mac
is string option
, so String.concat "," (Option.to_list ...
is a little odd. What about Option.value ~default:""
?
This PR needs a rebase on top of the latest master to pass the required tests |
1ef3968
to
99dbe56
Compare
This is a simplified version of commit 846ce82. The feature introduced that commit is to remove the network device renaming functionality. When the feature is merged, there will be 3 states of releases: 1. without the feature. 2. with the feature but renaming is still working. 3. with the feature and renaming has been removed. Originally, the upgrade path was intended to support transitions from state 2 to state 3 only. However, it has become necessary to also support upgrades directly from state 1 to state 3. This commit is to enable the release in state 1 to upgrade to state 3. The change is kept extremely small so it can be merged independently without waiting for the full feature to be merged. In details, during the upgrade, the host-installer can't know the management interface as the eth<N> will not present in the environment the host-installer running. So it needs the MAC address to find out the management interface for setting up network. Signed-off-by: Ming Lu <[email protected]>
99dbe56
to
31b8461
Compare
Conflict between xapi-project#6637 and xapi-project#6466. The PR xapi-project#6637 on master is a simplified version of PR xapi-project#6466 for upgrade from master to feature version. To solve the conflict, keep xapi-project#6466.
Conflict between xapi-project#6637 and xapi-project#6466. The PR xapi-project#6637 on master is a simplified version of PR xapi-project#6466 for upgrade from master to feature version. To solve the conflict, keep xapi-project#6466, drop xapi-project#6637. Signed-off-by: Changlei Li <[email protected]>
This is a simplified version of commit 846ce82. The feature introduced that commit is to remove the network device renaming functionality. When the feature is merged, there will be 3 states of releases:
Originally, the upgrade path was intended to support transitions from state 2 to state 3 only. However, it has become necessary to also support upgrades directly from state 1 to state 3.
This commit is to enable the release in state 1 to upgrade to state 3. The change is kept extremely small so it can be merged independently without waiting for the full feature to be merged.
In details, during the upgrade, the host-installer can't know the management interface as the eth will not present in the environment the host-installer running. So it needs the MAC address to find out the management interface for setting up network.