Skip to content
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

bridge: bugfixes for equuleus #1450

Merged
merged 7 commits into from
Aug 4, 2022
Merged

Conversation

c-po
Copy link
Member

@c-po c-po commented Aug 1, 2022

Change Summary

Bugfix VLAN aware bridges loose VLAN configuration on later changes to the lower e.g. eth1 interface. Also member interfaces can't be deleted completely if VLAN was enabled on a bridge

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Component(s) name

bridge

Proposed changes

How to test

smoketests

set interfaces bridge br0 enable-vlan
set interfaces bridge br0 member interface eth1 allowed-vlan '5-50'
set interfaces bridge br0 member interface eth1 allowed-vlan '101'
set interfaces bridge br0 member interface eth1 native-vlan '101'
commit

Now change any setting on eth1 and bridge -c vlan show still must list eth1 with all it's VLANs

set interfaces ethernet eth1 description foo
commit
cpo@LR1.wue3# bridge -c vlan show
port              vlan-id
eth1              5-50
                  101 PVID Egress Untagged
br0               1 PVID Egress Untagged

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

c-po added 5 commits July 31, 2022 19:42
Interface() base class already takes care about VLAN creation/removal of
newly added or no longer required interfaces. No need to code this logic again.

(cherry picked from commit 41477cc)
... otherwise functionality like bridge VLANs will loose configuration
on membe rinterface update (e.g. description)

(cherry picked from commit a295ec1)
…y VLAN aware bridge

(cherry picked from commit dbc8e24)
… address

We should not print the entire dictionary - we only need the bridge interface
name:

Bug:
Cannot assign address to interface "eth1" as it is a member of bridge
"{'br0': {'allowed_vlan': ['5-50', '101'], 'native_vlan': '101'}}"!

Fixed:
Cannot assign address to interface "eth1" as it is a member of bridge
"br0"!

(cherry picked from commit 71f2f2d)
@c-po c-po merged commit 241fad2 into vyos:equuleus Aug 4, 2022
@c-po c-po deleted the bridge-fixes-equuleus branch August 15, 2022 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants