From 2d6b531b3ea8fab3d4e049b0fec43e76db202ea0 Mon Sep 17 00:00:00 2001
From: arlakshm <55814491+arlakshm@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:53:58 -0700
Subject: [PATCH] internal loopback ipv6 fix (#7885)

In the multi asic platforms all the ASIC are advertising the same IPv6 /64 network from Loopback4096.
Therefore, the IPv6 loopback address of backend asic is not learnt on the frontend asic.
Change this to advertise the Loopback4096 address as /128
---
 dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2               | 2 +-
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf | 2 +-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf          | 2 +-
 .../tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf     | 2 +-
 src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf  | 2 +-
 .../tests/sample_output/bgpd_frr_backend_asic.conf              | 2 +-
 .../tests/sample_output/bgpd_frr_frontend_asic.conf             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
index b4f6d880e8..c4682e420a 100644
--- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
+++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -79,7 +79,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 {% if multi_asic is defined %}
 {% if get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") != 'None' %}
   address-family ipv6
-    network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/64 route-map HIDE_INTERNAL
+    network {{ get_ipv6_loopback_address(LOOPBACK_INTERFACE, "Loopback4096") | ip }}/128 route-map HIDE_INTERNAL
   exit-address-family
 {% endif %}
 {% endif %}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
index 9797a3e3c7..5afe462664 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -66,7 +66,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   address-family ipv6
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
index 584a00bb9d..80d995084e 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -41,7 +41,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
index 083d8c20dc..b8e44761ff 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -41,7 +41,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   network 10.10.10.1/24
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
index bf526235fe..4cf456052b 100644
--- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
+++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -75,7 +75,7 @@ router bgp 55555
     network fc00::1/64
   exit-address-family
   address-family ipv6
-    network fc00::2/64 route-map HIDE_INTERNAL
+    network fc00::2/128 route-map HIDE_INTERNAL
   exit-address-family
 !
   address-family ipv6
diff --git a/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf
index 27dca115de..4432abb7a5 100644
--- a/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/bgpd_frr_backend_asic.conf
@@ -58,7 +58,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:4::32/64 route-map HIDE_INTERNAL
+    network fd00:4::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf
index 36ae34705c..67ec0bdd99 100644
--- a/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf
+++ b/src/sonic-config-engine/tests/sample_output/bgpd_frr_frontend_asic.conf
@@ -58,7 +58,7 @@ router bgp 65100
     network fc00:1::32/64
   exit-address-family
   address-family ipv6
-    network fd00:1::32/64 route-map HIDE_INTERNAL
+    network fd00:1::32/128 route-map HIDE_INTERNAL
   exit-address-family
 !
 !