[13.4-stable] Allow to use network port with VLAN-subinterfaces for untagged traffic #4569
Conversation
This file contains 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
uncleDecart
requested review from
milan-zededa,
rouming,
OhmSpectator and
eriknordmark
as code owners
OhmSpectator
changed the title
|
@uncleDecart, why do we ignore the second commit from the same PR? |
|
Good catch @OhmSpectator forgot to look through the PR, found fix through source code, thank you! |
|
So, are the commits cherry-picked 1-top-1 with no merge conflicts? |
Yep, commits order is the same and there're no conflicts, commits are cherry-picked with -x option linking to the original commits |
|
Do we consider it a fix? Or why do we backport it into stable now? And why was it not done earlier, if we do? |
OhmSpectator
approved these changes
Jan 31, 2025
|
@uncleDecart could you please rebase the PR so the tests work again? |
With this enhancement, user will be able to use VLAN parent interface as an L3 endpoint and access the untagged network either for EVE management or from an application via Local network instance. Some changes were required to allow having SystemAdapter assigned to a network port (physical or bond) which is at the same time referenced by a VLAN sub-interface. Previously, this was not allowed and resulted in parsing errors published to the controller. In terms of the Linux network configuration, not many changes were required. We simply allow assigning static IP or running DHCP client even for VLAN parent interface. The only scenario which is not allowed, is to bridge network port and at the same time use it with VLAN sub-interfaces. This means that accessing untagged network from a Switch NI is not allowed when the port is already used with VLAN subinterfaces. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit 1f23508)
reflect.DeepEqual is quite expensive so let's compare Bond fields manually and using more efficient methods from the generics package. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit a783bfc)
uncleDecart
force-pushed
the
fix-vlans
branch
from
85eb200 to
e000787
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport of #4444
Backporting this patch for 13.4.1-rc2 to handle case when VLAN is created and the underlying interface is also used
With this enhancement, user will be able to use VLAN parent interface as an L3 endpoint and access the untagged network either for EVE management or from an application via Local network instance.
Some changes were required to allow having SystemAdapter assigned to a network port (physical or bond) which is at the same time referenced by a VLAN sub-interface. Previously, this was not allowed and resulted in parsing errors published to the controller.
In terms of the Linux network configuration, not many changes were required. We simply allow assigning static IP or running DHCP client even for VLAN parent interface.
The only scenario which is not allowed, is to bridge network port and at the same time use it with VLAN sub-interfaces. This means that accessing untagged network from a Switch NI is not allowed when the port is already used with VLAN subinterfaces.
Signed-off-by: Milan Lenco [email protected]
(cherry picked from commit 1f23508)