[bgpcfgd]: Split one bgp mega-template to chunks. #4143

pavel-shirshov · 2020-02-12T22:40:31Z

The one big bgp configuration template was splitted into chunks.

Currently we have three types of bgp neighbor peers:

general bgp peers. They are represented by CONFIG_DB::BGP_NEIGHBOR table entries
dynamic bgp peers. They are represented by CONFIG_DB::BGP_PEER_RANGE table entries
monitors bgp peers. They are represented by CONFIG_DB::BGP_MONITORS table entries

This PR introduces three templates for each peer type:

bgp policies: represent policieas that will be applied to the bgp peer-group (ip prefix-lists, route-maps, etc)
bgp peer-group: represent bgp peer group which has common configuration for the bgp peer type and uses bgp routing policy from the previous item
bgp peer-group instance: represent bgp configuration, which will be used to instatiate a bgp peer-group for the bgp peer-type. Usually this one is simple, consist of the referral to the bgp peer-group, bgp peer description and bgp peer ip address.

This PR redefined constant.yml file. Now this file has a setting for to use or don't use bgp_neighbor metadata. This file has more parameters for now, which are not used. They will be used in the next iteration of bgpcfgd.

Currently all tests have been disabled. I'm going to create next PR with the tests right after this PR is merged.

I'm going to introduce better bgpcfgd in a short time. It will include support of dynamic changes for the templates.

FIX:: #4231

pavel-shirshov · 2020-02-13T21:55:54Z

retest vsimage please

pavel-shirshov · 2020-02-14T02:48:36Z

retest vsimage please

pavel-shirshov · 2020-02-14T23:07:53Z

retest vsimage please

lguohan · 2020-03-09T23:12:54Z

retest vsimage please

lguohan · 2020-03-21T21:27:53Z

retest vsimage please

lguohan · 2020-03-23T17:48:35Z

can you look at the test failure? I think there is a real issue here.

pavel-shirshov · 2020-03-23T18:08:08Z

@lguohan Yes. I'm currently working on it.

lguohan · 2020-04-10T21:55:22Z

can you update the config db entry that this pr support?

pavel-shirshov · 2020-04-14T19:45:51Z

I'm still working on the changes.

lgtm-com · 2020-04-14T21:21:51Z

This pull request introduces 2 alerts and fixes 3 when merging cd06c31 into e04eb80 - view on LGTM.com

new alerts:

2 for Except block handles 'BaseException'

fixed alerts:

1 for Unused local variable
1 for Except block handles 'BaseException'
1 for Unused import

lgtm-com · 2020-04-14T22:53:57Z

This pull request fixes 7 alerts when merging e9dbfa3 into a02255e - view on LGTM.com

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

lgtm-com · 2020-04-15T18:05:58Z

This pull request fixes 7 alerts when merging fc51718 into 89fb105 - view on LGTM.com

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

…ve it configured

lgtm-com · 2020-04-21T22:27:35Z

This pull request introduces 2 alerts and fixes 7 when merging ea88cfd into bddd0d1 - view on LGTM.com

new alerts:

2 for Unreachable code

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

dockers/docker-fpm-frr/bgpcfgd

lgtm-com · 2020-04-22T06:56:19Z

This pull request introduces 2 alerts and fixes 7 when merging d44926e into 3a82ade - view on LGTM.com

new alerts:

2 for Unreachable code

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

lguohan · 2020-04-22T08:18:43Z

please merge with proper commit messages.

dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2

lguohan

as comments

dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2

lgtm-com · 2020-04-22T15:07:07Z

This pull request introduces 2 alerts and fixes 7 when merging 1b9def0 into 3a82ade - view on LGTM.com

new alerts:

2 for Unreachable code

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

…ions

lgtm-com · 2020-04-22T22:08:10Z

This pull request introduces 2 alerts and fixes 7 when merging 1272cd4 into c5e9844 - view on LGTM.com

new alerts:

2 for Unreachable code

fixed alerts:

5 for Except block handles 'BaseException'
1 for Unused local variable
1 for Unused import

pavel-shirshov · 2020-04-23T01:24:47Z

retest vsimage please

dockers/docker-fpm-frr/frr/bgpd/templates/general/peer-group.conf.j2

lguohan · 2020-04-23T02:20:09Z

you have a typo. that is why the test fails.

https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-image-pr/3436/testReport/junit/route/test_default_route/test_default_ipv6_route_next_hop_global_address/

Signed-off-by: Guohan Lu <[email protected]>

pavel-shirshov · 2020-04-23T18:15:05Z

Thanks

The one big bgp configuration template was splitted into chunks. Currently we have three types of bgp neighbor peers: general bgp peers. They are represented by CONFIG_DB::BGP_NEIGHBOR table entries dynamic bgp peers. They are represented by CONFIG_DB::BGP_PEER_RANGE table entries monitors bgp peers. They are represented by CONFIG_DB::BGP_MONITORS table entries This PR introduces three templates for each peer type: bgp policies: represent policieas that will be applied to the bgp peer-group (ip prefix-lists, route-maps, etc) bgp peer-group: represent bgp peer group which has common configuration for the bgp peer type and uses bgp routing policy from the previous item bgp peer-group instance: represent bgp configuration, which will be used to instatiate a bgp peer-group for the bgp peer-type. Usually this one is simple, consist of the referral to the bgp peer-group, bgp peer description and bgp peer ip address. This PR redefined constant.yml file. Now this file has a setting for to use or don't use bgp_neighbor metadata. This file has more parameters for now, which are not used. They will be used in the next iteration of bgpcfgd. Currently all tests have been disabled. I'm going to create next PR with the tests right after this PR is merged. I'm going to introduce better bgpcfgd in a short time. It will include support of dynamic changes for the templates. FIX:: #4231

pavel-shirshov marked this pull request as ready for review February 12, 2020 22:40

pavel-shirshov changed the title ~~New bgpcfgd~~ [bgpcfgd]: Split one bgp mega-template to chunks. Feb 12, 2020

pavel-shirshov requested a review from lguohan February 12, 2020 22:44

pavel-shirshov self-assigned this Feb 12, 2020

pavel-shirshov added the Enhancement ➕ label Feb 12, 2020

pavel-shirshov added 4 commits April 14, 2020 13:31

New bgpcfgd

7b109d3

Disable unit tests for frr.

d10ff63

Another full rewrite

5beb656

Use correct path

cd06c31

pavel-shirshov force-pushed the pavelsh/new branch from 40521cf to cd06c31 Compare April 14, 2020 21:06

pavel-shirshov added 2 commits April 14, 2020 15:07

Remove fixme

af9fbfb

Add specification to exception handlers

e9dbfa3

Fix typo

fc51718

PksStudent and others added 5 commits April 15, 2020 18:10

Add comments

c6d375d

Improve wait_for_*

212d23d

Remove one excessive fixme

935abcc

Rename runner and inverse the dependency

a333c82

Add log_* functions

d9b664e

PksStudent added 2 commits April 21, 2020 14:32

Return set ipv6 next-hop prefer-global clause

5edd39e

Don't render parts related to Loopback0 ipv6 addresses if we don't ha…

ea88cfd

…ve it configured

lguohan reviewed Apr 22, 2020

View reviewed changes

dockers/docker-fpm-frr/bgpcfgd Outdated Show resolved Hide resolved

Fixed typos

d44926e

lguohan approved these changes Apr 22, 2020

View reviewed changes

lguohan reviewed Apr 22, 2020

View reviewed changes

dockers/docker-fpm-frr/frr/bgpd/templates/general/instance.conf.j2 Outdated Show resolved Hide resolved

lguohan requested changes Apr 22, 2020

View reviewed changes

lguohan added the FRR 🚥 label Apr 22, 2020

lguohan reviewed Apr 22, 2020

View reviewed changes

dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2 Outdated Show resolved Hide resolved

Fix issues in bgp templates for general peers

1b9def0

PksStudent added 2 commits April 22, 2020 13:39

It's normal to have the 'local_addr' missing for the dynamic bgp sess…

d7e1d76

…ions

Don't announce anything to bgp monitors

1272cd4

lguohan reviewed Apr 23, 2020

View reviewed changes

dockers/docker-fpm-frr/frr/bgpd/templates/general/peer-group.conf.j2 Outdated Show resolved Hide resolved

lguohan mentioned this pull request Apr 23, 2020

[platform-modules]: set debian control depends on unsigned kernel pac… #4466

Merged

Fix typo

73b8266

Signed-off-by: Guohan Lu <[email protected]>

lguohan approved these changes Apr 23, 2020

View reviewed changes

lguohan added the Request for 201911 Branch label Apr 23, 2020

lguohan merged commit 057ced0 into sonic-net:master Apr 23, 2020

sonic-net deleted a comment from paulnice Apr 23, 2020

pavel-shirshov deleted the pavelsh/new branch April 23, 2020 18:15

lguohan added the Included in 201911 Branch label Apr 25, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[bgpcfgd]: Split one bgp mega-template to chunks. #4143

[bgpcfgd]: Split one bgp mega-template to chunks. #4143

pavel-shirshov commented Feb 12, 2020 •

edited

Loading

pavel-shirshov commented Feb 13, 2020

pavel-shirshov commented Feb 14, 2020

pavel-shirshov commented Feb 14, 2020

lguohan commented Mar 9, 2020

lguohan commented Mar 21, 2020

lguohan commented Mar 23, 2020

pavel-shirshov commented Mar 23, 2020

lguohan commented Apr 10, 2020

pavel-shirshov commented Apr 14, 2020

lgtm-com bot commented Apr 14, 2020

lgtm-com bot commented Apr 14, 2020

lgtm-com bot commented Apr 15, 2020

lgtm-com bot commented Apr 21, 2020

lgtm-com bot commented Apr 22, 2020

lguohan commented Apr 22, 2020

lguohan left a comment

lgtm-com bot commented Apr 22, 2020

lgtm-com bot commented Apr 22, 2020

pavel-shirshov commented Apr 23, 2020

lguohan commented Apr 23, 2020 •

edited

Loading

pavel-shirshov commented Apr 23, 2020

[bgpcfgd]: Split one bgp mega-template to chunks. #4143

[bgpcfgd]: Split one bgp mega-template to chunks. #4143

Conversation

pavel-shirshov commented Feb 12, 2020 • edited Loading

pavel-shirshov commented Feb 13, 2020

pavel-shirshov commented Feb 14, 2020

pavel-shirshov commented Feb 14, 2020

lguohan commented Mar 9, 2020

lguohan commented Mar 21, 2020

lguohan commented Mar 23, 2020

pavel-shirshov commented Mar 23, 2020

lguohan commented Apr 10, 2020

pavel-shirshov commented Apr 14, 2020

lgtm-com bot commented Apr 14, 2020

lgtm-com bot commented Apr 14, 2020

lgtm-com bot commented Apr 15, 2020

lgtm-com bot commented Apr 21, 2020

lgtm-com bot commented Apr 22, 2020

lguohan commented Apr 22, 2020

lguohan left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Apr 22, 2020

lgtm-com bot commented Apr 22, 2020

pavel-shirshov commented Apr 23, 2020

lguohan commented Apr 23, 2020 • edited Loading

pavel-shirshov commented Apr 23, 2020

pavel-shirshov commented Feb 12, 2020 •

edited

Loading

lguohan commented Apr 23, 2020 •

edited

Loading