[multi-asic] fix network command for internal loopback (sonic-net#7878)

arlakshm · Carl Keene · commit 675b97c41128 · 2021-08-07T11:17:11.000-04:00
Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan &lt;arlakshm@microsoft.com&gt;
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 the bgpd.conf.main.conf.j2 template file to advertise the Loopback4096 ipv6 address as /128
diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -80,7 +80,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
@@ -61,7 +61,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/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -40,7 +40,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
@@ -40,7 +40,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
@@ -80,7 +80,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-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -59,7 +59,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/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -59,7 +59,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
 !
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -59,7 +59,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/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -59,7 +59,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
 !
 !

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ router bgp 55555`
`61`	`61`	`network fc00::1/64`
`62`	`62`	`exit-address-family`
`63`	`63`	`address-family ipv6`
`64`		`- network fc00::2/64 route-map HIDE_INTERNAL`
	`64`	`+ network fc00::2/128 route-map HIDE_INTERNAL`
`65`	`65`	`exit-address-family`
`66`	`66`	`!`
`67`	`67`	`network 10.10.10.1/24`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ router bgp 55555`
`40`	`40`	`network fc00::1/64`
`41`	`41`	`exit-address-family`
`42`	`42`	`address-family ipv6`
`43`		`- network fc00::2/64 route-map HIDE_INTERNAL`
	`43`	`+ network fc00::2/128 route-map HIDE_INTERNAL`
`44`	`44`	`exit-address-family`
`45`	`45`	`!`
`46`	`46`	`network 10.10.10.1/24`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ router bgp 55555`
`80`	`80`	`network fc00::1/64`
`81`	`81`	`exit-address-family`
`82`	`82`	`address-family ipv6`
`83`		`- network fc00::2/64 route-map HIDE_INTERNAL`
	`83`	`+ network fc00::2/128 route-map HIDE_INTERNAL`
`84`	`84`	`exit-address-family`
`85`	`85`	`!`
`86`	`86`	`network 10.10.10.1/24`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ router bgp 65100`
`59`	`59`	`network fc00:1::32/64`
`60`	`60`	`exit-address-family`
`61`	`61`	`address-family ipv6`
`62`		`- network fd00:4::32/64 route-map HIDE_INTERNAL`
	`62`	`+ network fd00:4::32/128 route-map HIDE_INTERNAL`
`63`	`63`	`exit-address-family`
`64`	`64`	`!`
`65`	`65`	`!`