Template change for BGP monitors on T2 (#14844)

Why I did it
To support BGPMon sessions from each T2 linecard ASIC

Work item tracking
Microsoft ADO (number only): 17873174
How I did it
Added change in BGPMon configuration to use Loopback4096 as source interface, since this has a unique IP per ASIC.

How to verify it
Tested by manually setting up BGPMon session on T2 LC and verified that Loopback4096 could be used as source

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

@@ -2,11 +2,30 @@
 ! template: bgpd/templates/BGPMON/peer-group.conf.j2
 !
   neighbor BGPMON peer-group
+{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}
+  neighbor BGPMON update-source Loopback4096
+{% else %}
   neighbor BGPMON update-source {{ loopback0_ipv4 | ip }}
+{% endif %}
+
+  address-family ipv4
+    neighbor BGPMON activate
     neighbor BGPMON route-map FROM_BGPMON in
     neighbor BGPMON route-map TO_BGPMON out
     neighbor BGPMON send-community
     neighbor BGPMON maximum-prefix 1
+  exit-address-family
+
+{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' %}
+  address-family ipv6
+    neighbor BGPMON activate
+    neighbor BGPMON route-map FROM_BGPMON in
+    neighbor BGPMON route-map TO_BGPMON out
+    neighbor BGPMON send-community
+    neighbor BGPMON maximum-prefix 1
+  exit-address-family
+{% endif %}
 !
 ! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
 !
+

dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2

@@ -12,6 +12,7 @@ vni {{ vnet_metadata['vni'] }}
 {% block interfaces %}
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 {% for (name, prefix) in INTERFACE|pfx_filter %}
 interface {{ name }}

src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/param_all.json

@@ -1,3 +1,8 @@
 {
+    "CONFIG_DB__DEVICE_METADATA": {
+        "localhost": {         
+            "type": "LeafRouter"
+        }
+    },
     "loopback0_ipv4": "1.1.1.1/32"
 }

src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/param_chassis.json

@@ -0,0 +1,7 @@
+{
+    "CONFIG_DB__DEVICE_METADATA": {
+        "localhost": {         
+            "type": "SpineRouter"
+        }
+    }
+}

src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/result_all.conf

@@ -3,10 +3,14 @@
 !
   neighbor BGPMON peer-group
   neighbor BGPMON update-source 1.1.1.1
+  address-family ipv4
+    neighbor BGPMON activate
     neighbor BGPMON route-map FROM_BGPMON in
     neighbor BGPMON route-map TO_BGPMON out
     neighbor BGPMON send-community
     neighbor BGPMON maximum-prefix 1
+  exit-address-family
 !
 ! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
 !
+

src/sonic-bgpcfgd/tests/data/monitors/peer-group.conf/result_chassis.conf

@@ -0,0 +1,22 @@
+!
+! template: bgpd/templates/BGPMON/peer-group.conf.j2
+!
+  neighbor BGPMON peer-group
+  neighbor BGPMON update-source Loopback4096
+  address-family ipv4
+    neighbor BGPMON activate
+    neighbor BGPMON route-map FROM_BGPMON in
+    neighbor BGPMON route-map TO_BGPMON out
+    neighbor BGPMON send-community
+    neighbor BGPMON maximum-prefix 1
+  exit-address-family
+  address-family ipv6
+    neighbor BGPMON activate
+    neighbor BGPMON route-map FROM_BGPMON in
+    neighbor BGPMON route-map TO_BGPMON out
+    neighbor BGPMON send-community
+    neighbor BGPMON maximum-prefix 1
+  exit-address-family
+!
+! end of template: bgpd/templates/BGPMON/peer-group.conf.j2
+!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf

@@ -17,6 +17,7 @@ agentx
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect

src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/interfaces.conf

@@ -1,6 +1,7 @@
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect

src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf

@@ -28,6 +28,7 @@ vni 20
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect

src/sonic-config-engine/tests/sample_output/py2/frr.conf

@@ -20,6 +20,7 @@ agentx
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel03
 link-detect

src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf

@@ -26,6 +26,7 @@ vni 9000
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet8
 link-detect

src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf

@@ -26,6 +26,7 @@ vni 8000
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet8
 link-detect

src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf

@@ -23,6 +23,7 @@ log facility local4
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel03
 link-detect

src/sonic-config-engine/tests/sample_output/py3/frr.conf

@@ -20,6 +20,7 @@ agentx
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel01
 link-detect

src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf

@@ -26,6 +26,7 @@ vni 9000
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect

src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf

@@ -26,6 +26,7 @@ vni 8000
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface Ethernet0
 link-detect

src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf

@@ -23,6 +23,7 @@ log facility local4
 !
 ! Enable nht through default route
 ip nht resolve-via-default
+ipv6 nht resolve-via-default
 ! Enable link-detect (default disabled)
 interface PortChannel01
 link-detect