[frrcfgd] Support for FRR configuration based on config DB events #5142

zhaozhenhong · 2020-08-10T22:31:42Z

- Why I did it

Support for non-template based FRR configurations (BGP, route-map, OSPF, static route..etc) using config DB schema.
Support for save & restore - Jinja template based config-DB data read and apply to FRR during startup

- How I did it

Added a new script and corresponding service. Based on the settings in DEVICE_METADATA table, new service will be started along with the bgp container start. And when user changed the BGP or other related table entries in config DB, the daemon will run corresponding VTYSH commands to program on FRR.
Also added jinja template to generate FRR config file to be used by FRR daemons while bgp container restarted

- How to verify it

Add/delete data on config DB and then run VTYSH "show running-config" command to check if FRR configuration changed.
Restart bgp container and check if generated FRR config file is correct and run VTYSH "show running-config" command to check if FRR configuration is consistent with attributes in config DB

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

ghost · 2020-08-10T22:31:54Z

All CLA requirements met.

zhaozhenhong · 2020-08-10T23:58:28Z

HLD: sonic-net/SONiC#544

lgtm-com · 2020-08-14T18:30:06Z

This pull request introduces 13 alerts when merging 288986c into c3202d8 - view on LGTM.com

new alerts:

4 for Unused local variable
2 for __eq__ not overridden when adding attributes
2 for Inconsistent equality and inequality
2 for Variable defined multiple times
1 for Unused import
1 for Duplicate key in dict literal
1 for Inconsistent equality and hashing

pavel-shirshov · 2020-08-17T22:46:53Z

@zhaozhenhong
Can you please make LGTM happy? You can find the report above.

…to bgpcfgd_merge

lgtm-com · 2020-08-24T22:54:22Z

This pull request introduces 13 alerts when merging 2a5c58e into f3feb56 - view on LGTM.com

new alerts:

4 for Unused local variable
2 for __eq__ not overridden when adding attributes
2 for Inconsistent equality and inequality
2 for Variable defined multiple times
1 for Unused import
1 for Duplicate key in dict literal
1 for Inconsistent equality and hashing

zhaozhenhong · 2020-08-25T02:58:19Z

@zhaozhenhong
Can you please make LGTM happy? You can find the report above.

Fix has been added with latest commit

lgtm-com · 2020-08-25T03:09:00Z

This pull request introduces 3 alerts when merging e942575 into f3feb56 - view on LGTM.com

new alerts:

2 for Comparison of identical values
1 for Inconsistent equality and hashing

venkatmahalingam · 2020-11-04T19:50:40Z

@lguohan @ben-gale Please let us know the next step on this PR.
Summary:
In DEVICE_METADATA table, field bgp_template_config has been introduced to differentiate whether the config model is template based (e.g current bgpcfgd) or non-template based (new one which has all configs in config-DB and based on events from config-DB, FRR is updated thru VTYSH commands).

ben-gale · 2020-11-04T20:18:22Z

@lguohan @ben-gale Please let us know the next step on this PR.
Summary:
In DEVICE_METADATA table, field bgp_template_config has been introduced to differentiate whether the config model is template based (e.g current bgpcfgd) or non-template based (new one which has all configs in config-DB and based on events from config-DB, FRR is updated thru VTYSH commands).

I think this is the right approach if MSFT wants to partition out some of the changes from their world. Somewhere else I saw a proposal to define cloud vs. enterprise builds, and use this as a selector, but I think this is too broad, and will create arguments (i.e. what should be in cloud vs. enterprise?).

…mage into bgpcfgd_merge

…to bgpcfgd_merge

…igration

src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2

…to bgpcfgd_merge

venkatmahalingam · 2021-01-19T21:51:35Z

@lguohan @tahmed-dev Can you please review the recent commit and merge the PR if everything looks good? also, label "Request for 202012 branch" this PR for 202012 release.

dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2

…to bgpcfgd_merge

zhaozhenhong · 2021-01-22T23:57:21Z

retest Azure.sonic-buildimage please

…ork_config is true (#5142) - Support for non-template based FRR configurations (BGP, route-map, OSPF, static route..etc) using config DB schema. - Support for save & restore - Jinja template based config-DB data read and apply to FRR during startup **- How I did it** - add frrcfgd service - when frr_mgmg_framework_config is set, frrcfgd starts in bgp container - when user changed the BGP or other related table entries in config DB, frrcfgd will run corresponding VTYSH commands to program on FRR. - add jinja template to generate FRR config file to be used by FRR daemons while bgp container restarted **- How to verify it** 1. Add/delete data on config DB and then run VTYSH "show running-config" command to check if FRR configuration changed. 1. Restart bgp container and check if generated FRR config file is correct and run VTYSH "show running-config" command to check if FRR configuration is consistent with attributes in config DB Co-authored-by: Zhenhong Zhao <zhenhong.zhao@dell.com>

sameerdell · 2021-01-26T21:34:51Z

@lguohan @pavel-shirshov @tahmed-dev - to get these changes in 202012 branch need help with the label. Dell doesn't have permissions to add label.

tahmed-dev · 2021-01-26T21:49:01Z

@lguohan @pavel-shirshov @tahmed-dev - to get these changes in 202012 branch need help with the label. Dell doesn't have permissions to add label.

Done!

legolasCc · 2021-08-20T07:29:05Z

@zhaozhenhong seems frrcfgd.py have problem in dependency processing between different config db tables. For example: step1 initial data with (BGP_GLOBALS, BGP_NEIGHBOR). step2 delete asn from BGP_GLOBLAS. result to BGP_NEIGHBOR data aslo removed from bgpd.conf. step3, restore asn again. router bgp {} vrf {} is success, while BGP_NEIGHBOR not.

Initial commit for adding non-template bgpcfgd script

47f5736

Reomved not needed config file

154ec12

zhaozhenhong changed the title ~~Initial commit for adding non-template bgpcfgd script~~ [bgpcfgd] Support for FRR configuration based on config DB events Aug 10, 2020

lguohan requested a review from pavel-shirshov August 14, 2020 04:27

Added update on setup.py

288986c

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

2a5c58e

…to bgpcfgd_merge

Fixed for erasing LGTM alert and other minor issues

e942575

Changed to erase new lgtm alerts

9c94d03

Zhenhong Zhao added 2 commits December 18, 2020 21:27

Merge branch 'master' of https://github.com/zhaozhenhong/sonic-buildi…

b12cde3

…mage into bgpcfgd_merge

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

d86c52d

…to bgpcfgd_merge

lguohan force-pushed the master branch from 3690c1a to 512eb6b Compare December 25, 2020 18:34

Zhenhong Zhao added 9 commits December 26, 2020 00:49

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

b0fdaf2

…to bgpcfgd_merge

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

792268a

…to bgpcfgd_merge

Added new package for FRR configuration daemon

2637566

Put template files into frrcfgd package

a41d8dd

Removed not needed and temporary files

609bcb7

Fixed setup.py not copying un-needed template file

64561d6

Added critical process list switch and fix issue related to python3 m…

0299bf3

…igration

Replaced python3 un-compatible function

a38469a

Added UT scripts and fixed minor issues in frrcfgd

0227421

venkatmahalingam reviewed Jan 3, 2021

View reviewed changes

src/sonic-frr-mgmt-framework/templates/bgpd/bgpd.conf.j2 Outdated Show resolved Hide resolved

tahmed-dev previously approved these changes Jan 14, 2021

View reviewed changes

Changed according code review comment

e92997c

zhaozhenhong dismissed tahmed-dev’s stale review via e92997c January 14, 2021 23:55

Fixed include template file issue

3b49d23

tahmed-dev previously approved these changes Jan 15, 2021

View reviewed changes

Fixed inlcuded template not found issue

ee973b5

zhaozhenhong dismissed tahmed-dev’s stale review via ee973b5 January 15, 2021 04:41

tahmed-dev previously approved these changes Jan 19, 2021

View reviewed changes

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

99629bb

…to bgpcfgd_merge

zhaozhenhong dismissed tahmed-dev’s stale review via 99629bb January 19, 2021 20:11

venkatmahalingam previously approved these changes Jan 19, 2021

View reviewed changes

lguohan reviewed Jan 21, 2021

View reviewed changes

dockers/docker-fpm-frr/frr/bgpd/gen_bgpd.conf.j2 Outdated Show resolved Hide resolved

Zhenhong Zhao added 2 commits January 22, 2021 19:10

Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…

6a693f4

…to bgpcfgd_merge

Changed the target folder name of frrcfgd template files

6e6dde5

zhaozhenhong dismissed venkatmahalingam’s stale review via 6e6dde5 January 22, 2021 21:13

lguohan approved these changes Jan 22, 2021

View reviewed changes

venkatmahalingam approved these changes Jan 22, 2021

View reviewed changes

lguohan merged commit a171e6c into sonic-net:master Jan 25, 2021

lguohan changed the title ~~[bgpcfgd] Support for FRR configuration based on config DB events~~ [frrcfgd] Support for FRR configuration based on config DB events Jan 25, 2021

tahmed-dev added the Request for 202012 Branch label Jan 26, 2021

daall added the Included in 202012 Branch label Jan 29, 2021

venkatmahalingam mentioned this pull request Feb 26, 2021

Add templates and code to support VoQ chassis iBGP peers #5622

Merged

3 tasks

puffc mentioned this pull request Aug 19, 2024

[frr-mgmt-framework] "auth_password" in the BGP_NEIGHBOR table cannot be restored correctly #19946

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[frrcfgd] Support for FRR configuration based on config DB events #5142

[frrcfgd] Support for FRR configuration based on config DB events #5142

zhaozhenhong commented Aug 10, 2020 •

edited

Loading

ghost commented Aug 10, 2020 •

edited by ghost

Loading

zhaozhenhong commented Aug 10, 2020

lgtm-com bot commented Aug 14, 2020

pavel-shirshov commented Aug 17, 2020

lgtm-com bot commented Aug 24, 2020

zhaozhenhong commented Aug 25, 2020

lgtm-com bot commented Aug 25, 2020

venkatmahalingam commented Nov 4, 2020 •

edited

Loading

ben-gale commented Nov 4, 2020

venkatmahalingam commented Jan 19, 2021

zhaozhenhong commented Jan 22, 2021

sameerdell commented Jan 26, 2021

tahmed-dev commented Jan 26, 2021

legolasCc commented Aug 20, 2021

[frrcfgd] Support for FRR configuration based on config DB events #5142

[frrcfgd] Support for FRR configuration based on config DB events #5142

Conversation

zhaozhenhong commented Aug 10, 2020 • edited Loading

ghost commented Aug 10, 2020 • edited by ghost Loading

zhaozhenhong commented Aug 10, 2020

lgtm-com bot commented Aug 14, 2020

pavel-shirshov commented Aug 17, 2020

lgtm-com bot commented Aug 24, 2020

zhaozhenhong commented Aug 25, 2020

lgtm-com bot commented Aug 25, 2020

venkatmahalingam commented Nov 4, 2020 • edited Loading

ben-gale commented Nov 4, 2020

venkatmahalingam commented Jan 19, 2021

zhaozhenhong commented Jan 22, 2021

sameerdell commented Jan 26, 2021

tahmed-dev commented Jan 26, 2021

legolasCc commented Aug 20, 2021

zhaozhenhong commented Aug 10, 2020 •

edited

Loading

ghost commented Aug 10, 2020 •

edited by ghost

Loading

venkatmahalingam commented Nov 4, 2020 •

edited

Loading