From fbc33868258f041f044437de55850df7d4fbba83 Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Thu, 25 Feb 2021 23:15:02 -0800
Subject: [PATCH] [multi-asic] BBR support on internal-peers for multi-asic
 platfroms. (#6848)

Enable BBR config allowas-in 1 for internal peers

Why I did:
To advertise BBR routes learnt via e-BGP peer in one asic/namespace to another iBGP asic/namespace via Route Reflector.
---
 .../docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2  | 1 +
 .../tests/data/internal/instance.conf/result_back_v4.conf        | 1 +
 .../tests/data/internal/instance.conf/result_back_v6.conf        | 1 +
 .../tests/data/internal/instance.conf/result_front_v4.conf       | 1 +
 .../tests/data/internal/instance.conf/result_front_v6.conf       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
index baa51cf35041..b6ee1c96d2b9 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
@@ -28,6 +28,7 @@
 !
     neighbor {{ neighbor_addr }} next-hop-self force
 !
+    neighbor {{ neighbor_addr }} allowas-in 1
     neighbor {{ neighbor_addr }} activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
index 9cf5e3d13c4a..647bd849317f 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
@@ -9,6 +9,7 @@
     neighbor 10.10.10.10 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor 10.10.10.10 route-reflector-client
     neighbor 10.10.10.10 next-hop-self force
+    neighbor 10.10.10.10 allowas-in 1
     neighbor 10.10.10.10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
index 41aa2ae7f800..a60b9a2796a9 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
@@ -9,6 +9,7 @@
     neighbor fc::10 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor fc::10 route-reflector-client
     neighbor fc::10 next-hop-self force
+    neighbor fc::10 allowas-in 1
     neighbor fc::10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
index c327e417f0f6..2b93fa3e0efb 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
@@ -7,6 +7,7 @@
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
     neighbor 10.10.10.10 next-hop-self force
+    neighbor 10.10.10.10 allowas-in 1
     neighbor 10.10.10.10 activate
   exit-address-family
 !
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
index c73003823375..a69d8a8440ea 100644
--- a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
+++ b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
@@ -7,6 +7,7 @@
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 next-hop-self force
+    neighbor fc::10 allowas-in 1
     neighbor fc::10 activate
   exit-address-family
 !