-
Notifications
You must be signed in to change notification settings - Fork 402
T7664: support FRR 10.5 #4921
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
base: current
Are you sure you want to change the base?
T7664: support FRR 10.5 #4921
Conversation
|
👍 |
In FRR 10.5 'bgp reject-as-sets' became default (https://frrouting.org/release/10.5.0/): > BGP rejects AS_SET by default > Until 10.5.0, it was disabled by default, and since RFC 9774 was > published, we switched this on by default (to reject). Add 'no bgp reject-as-sets' when VyOS option reject_as_sets is not set.
In FRR 10.5 block-len, node-len and func-bits are not shown if they have default values. Fix test smoketest/scripts/cli/test_protocols_segment-routing.py accordingly (update expected + change func-bits 16 -> 12 so that they are shown). Relevant commits in FRR: 44e67d2d3dabdc1492448e6a3c7024bd0309c244 84c807a3b300f4c9fcda55bccd93dcb64716f5d7
cac57b1 to
e72f4d8
Compare
c-po
left a comment
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.
Can you please create or extend configtest from VyOS 1.4 which makes use of the now no longer supported redistribute statements for both the default and any other VRF? This way we have a build in test that the CLI entries in question will be migrated away.
See for details https://github.com/vyos/vyos-1x/blob/current/smoketest/README.md
e72f4d8 to
8d16950
Compare
|
@c-po Thanks, I've added config test, and it showed one mistake (I've fixed that too). |
| } | ||
| /* Warning: Do not remove the following line. */ | ||
| /* === vyatta-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack-sync@1:conntrack@1:dhcp-relay@2:dhcp-server@5:dns-forwarding@1:firewall@5:ipsec@5:l2tp@1:mdns@1:nat@4:ntp@1:pptp@1:qos@1:quagga@6:snmp@1:ssh@1:system@27:vrf@3:vrrp@2:wanloadbalance@3:webgui@1:webproxy@1:webproxy@2:zone-policy@1" === */ | ||
| /* Release version: 1.2.6 */ |
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.
This version line is wrong as VRF support for any protocol was only intruduced recently in VyOS 1.4
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.
Thank you, I've updated it.
I've edited previous file (with '1.2.6' version) manually to get result I needed - I've just added sections with protocols and added versions of system and vrf.
The updated file is file saved by VyOS 1.4.3 without modifications.
To create it I've:
- Loaded
basic-vyosconfiguration on VyOS 1.4.3 - Ran commands:
set vrf name red table 1234
set policy route-map stub
set system ip protocol any route-map stub
set system ip protocol babel route-map stub
set system ip protocol bgp route-map stub
set system ip protocol connected route-map stub
...
set system ip protocol table route-map stub
set system ipv6 ...
set vrf name red ip protocol ...
set vrf name red ipv6 protocol ...
- Saved configuration file.
In FRR 10.5 ip protocols * connected * kernel * local * table * table-direct are removed. First three in fb8e399e4f66d09780f176fbecb99168089e64eb, table* in 7fd030504be060387694e8a2af7f19ddd7dee39d. In `ip protocols`, `ipv6 protocols` and `vrf` VyOS supports * connected * kernel * table Remove these from CLI, add migration scripts, update tests.
8d16950 to
0c518cb
Compare
|
CI integration ❌ failed! Details
|
Support FRR 10.5
Support for the following changes:
block-len,node-lenandfunc-bitsif they have default value. Updated smoke test accordingly.bgp reject-as-setsto on by default. I haven't changed default, just addedno bgp reject-as-setsin FRR configuration template.Types of changes
Related Task(s)
Related PR(s)
vyos/vyos-build#1090
How to test / Smoketest result
With vyos-build PR and this PR all smoke tests (VPP not tested) pass.
Checklist: