From b2a7ddfd39e5f1b47f0464d90ea0fd8e7e745b94 Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Tue, 23 Feb 2021 00:34:40 +0000 Subject: [PATCH 1/2] BBR support on inrnal-links for multi-asic platfroms. Signed-off-by: Abhishek Dosi --- .../frr/bgpd/templates/internal/peer-group.conf.j2 | 2 ++ .../tests/data/internal/peer-group.conf/result_back.conf | 6 ++++-- .../tests/data/internal/peer-group.conf/result_front.conf | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2 index 323c13447ed0..c0ee4d99b796 100644 --- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2 +++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/peer-group.conf.j2 @@ -8,6 +8,7 @@ neighbor INTERNAL_PEER_V4 route-reflector-client {% endif %} neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V4 allowas-in 1 neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out exit-address-family @@ -16,6 +17,7 @@ neighbor INTERNAL_PEER_V6 route-reflector-client {% endif %} neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V6 allowas-in 1 neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out exit-address-family diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf index 15076685eb1a..facd4caa9cf0 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf @@ -1,20 +1,22 @@ ! -! template: bgpd/templates/internal/peer-group.conf.j2 +! template: bgpd/templates/general/peer-group.conf.j2 ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group address-family ipv4 neighbor INTERNAL_PEER_V4 route-reflector-client neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V4 allowas-in 1 neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out exit-address-family address-family ipv6 neighbor INTERNAL_PEER_V6 route-reflector-client neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V6 allowas-in 1 neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out exit-address-family ! -! end of template: bgpd/templates/internal/peer-group.conf.j2 +! end of template: bgpd/templates/general/peer-group.conf.j2 ! diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf index 8f4aa450f5db..9d78ac36b54b 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf @@ -1,18 +1,20 @@ ! -! template: bgpd/templates/internal/peer-group.conf.j2 +! template: bgpd/templates/general/peer-group.conf.j2 ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group address-family ipv4 neighbor INTERNAL_PEER_V4 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V4 allowas-in 1 neighbor INTERNAL_PEER_V4 route-map FROM_BGP_INTERNAL_PEER_V4 in neighbor INTERNAL_PEER_V4 route-map TO_BGP_INTERNAL_PEER_V4 out exit-address-family address-family ipv6 neighbor INTERNAL_PEER_V6 soft-reconfiguration inbound + neighbor INTERNAL_PEER_V6 allowas-in 1 neighbor INTERNAL_PEER_V6 route-map FROM_BGP_INTERNAL_PEER_V6 in neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out exit-address-family ! -! end of template: bgpd/templates/internal/peer-group.conf.j2 +! end of template: bgpd/templates/general/peer-group.conf.j2 ! From 3fd81b25178323b9f728ca05826f9b3c8d5255f8 Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Tue, 23 Feb 2021 00:40:59 +0000 Subject: [PATCH 2/2] Fixes Signed-off-by: Abhishek Dosi --- .../tests/data/internal/peer-group.conf/result_back.conf | 4 ++-- .../tests/data/internal/peer-group.conf/result_front.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf index facd4caa9cf0..28a543841fef 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_back.conf @@ -1,5 +1,5 @@ ! -! template: bgpd/templates/general/peer-group.conf.j2 +! template: bgpd/templates/internal/peer-group.conf.j2 ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group @@ -18,5 +18,5 @@ neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out exit-address-family ! -! end of template: bgpd/templates/general/peer-group.conf.j2 +! end of template: bgpd/templates/internal/peer-group.conf.j2 ! diff --git a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf index 9d78ac36b54b..5b061fa52b44 100644 --- a/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf +++ b/src/sonic-bgpcfgd/tests/data/internal/peer-group.conf/result_front.conf @@ -1,5 +1,5 @@ ! -! template: bgpd/templates/general/peer-group.conf.j2 +! template: bgpd/templates/internal/peer-group.conf.j2 ! neighbor INTERNAL_PEER_V4 peer-group neighbor INTERNAL_PEER_V6 peer-group @@ -16,5 +16,5 @@ neighbor INTERNAL_PEER_V6 route-map TO_BGP_INTERNAL_PEER_V6 out exit-address-family ! -! end of template: bgpd/templates/general/peer-group.conf.j2 +! end of template: bgpd/templates/internal/peer-group.conf.j2 !