CP-308450 Improve bridge name converting and network name_label #6556
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
changlei-li
commented
Jun 26, 2025
changlei-li
commented
- Unify the behaviour when converting interface name to bridge name. Get a stricter check for eth with sscanf or re rather than start_with "eth".
- Construct the default name_label for new created network only with position.
Get a stricter check for eth<N> with sscanf or re rather than start_with "eth" Signed-off-by: Changlei Li <[email protected]>
Do not use the device name in the new created network name_label if the device has a position. Given the fact that device names may be different on different hosts of the pool, even they are of the same position. So it is more proper to just use the position in the network name_label. Also this will be good for interface name change scenario as this change will not reflect in this default network name_label. Signed-off-by: Changlei Li <[email protected]>
changlei-li
commented
Jun 26, 2025
| (fun x -> if x.name = device then Some x.position else None) | ||
| order | ||
| | None -> | ||
| get_index_from_ethx device |
There was a problem hiding this comment.
The logic change here is:
If interface_order is None, we are using interface-rename to sort interfaces and rename them to eth. But we can also get the position by parse the name eth.
If interface_order isn't None, we are using networkd to sort interfaces. Position can be gotten in the order.
Then we can simplify the logic of bridge_naming_convention.
lindig
approved these changes
Jun 26, 2025
minglumlu
approved these changes
Jun 27, 2025
changlei-li
merged commit 57ab83f
into
xapi-project:feature/host-network-device-ordering
16 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.