-
Notifications
You must be signed in to change notification settings - Fork 168
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
[13.4-stable] Allow to use network port with VLAN-subinterfaces for untagged traffic #4569
Conversation
@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? |
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.
Ok, we can consider it as a fix. Then we also expect a backport into 12.0-stable.
@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)
85eb200
to
e000787
Compare
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.
LGTM
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)