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

mpls: T4489: Set priority 400 for MPLS after tunnel #1370

Merged
merged 1 commit into from
Jun 28, 2022

Conversation

sever-sever
Copy link
Member

Change Summary

Fix wrong behavior with priority by using tunnel interfaces
MPLS configuration must be applied after tunnel interfaces
as we use an addition sysctl option net.mpls.conf.tun0.input = 1
which doesn't exist without a tunnel interface

Change priority:

    299 protocols/mpls
    380 interfaces/tunnel

To:

    380 interfaces/tunnel
    400 protocols/mpls

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

mpls

Proposed changes

How to test

Add tunnel + mpls configuration and check sysctl option net.mpls.conf.tun0.input
Before fix:

set interfaces dummy dum1 address '10.5.4.8/24'
set interfaces tunnel tun0 address '10.255.0.2/30'
set interfaces tunnel tun0 encapsulation 'gre'
set interfaces tunnel tun0 remote '192.0.2.254'
set interfaces tunnel tun0 source-address '192.0.2.1'
set protocols mpls interface 'dum1'
set protocols mpls interface 'tun0'
set protocols mpls ldp discovery transport-ipv4-address '192.0.2.1'
set protocols mpls ldp interface 'dum1'
set protocols mpls ldp interface 'tun0'
set protocols mpls ldp router-id '192.0.2.1'


vyos@r14# sysctl net.mpls.conf.tun0.input
net.mpls.conf.tun0.input = 0

After Fix:

set interfaces dummy dum1 address '10.5.4.8/24'
set interfaces tunnel tun0 address '10.255.0.2/30'
set interfaces tunnel tun0 encapsulation 'gre'
set interfaces tunnel tun0 remote '192.0.2.254'
set interfaces tunnel tun0 source-address '192.0.2.1'
set protocols mpls interface 'dum1'
set protocols mpls interface 'tun0'
set protocols mpls ldp discovery transport-ipv4-address '192.0.2.1'
set protocols mpls ldp interface 'dum1'
set protocols mpls ldp interface 'tun0'
set protocols mpls ldp router-id '192.0.2.1'


vyos@r14# sysctl net.mpls.conf.tun0.input
net.mpls.conf.tun0.input = 1

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

Fix worng behavior with priority with using tunnel interfaces
MPLS configuration must be applied after tunnel interfaces
as we use an addition sysctl option 'net.mpls.conf.tun0.input = 1'
which doesn't exist without tunnel interface

Change priority:
    299 protocols/mpls
    380 interfaces/tunnel
To:
    380 interfaces/tunnel
    400 protocols/mpls
@c-po c-po merged commit 49d7ba8 into vyos:current Jun 28, 2022
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.

2 participants