updated internal route policy for chassis-packet (#15349) (#15378)

sonic-net · Jun 7, 2023 · ffd062a · ffd062a
1 parent bd323a8
commit ffd062a
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 6 deletions.
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
@@ -10,18 +10,16 @@
   address-family ipv4
     neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V4
 !
-{%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
+{%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
     neighbor {{ neighbor_addr }} next-hop-self force
-    neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V4 in
 {%   endif %}
 !
 {% elif neighbor_addr | ipv6 %}
   address-family ipv6
     neighbor {{ neighbor_addr }} peer-group INTERNAL_PEER_V6
 !
-{%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' %}
+{%   if CONFIG_DB__DEVICE_METADATA['localhost']['sub_role'] == 'BackEnd' or CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
     neighbor {{ neighbor_addr }} next-hop-self force
-    neighbor {{ neighbor_addr }} route-map FROM_BGP_INTERNAL_PEER_V6 in
 {%   endif %}
 {% endif %}
 !

diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.conf
@@ -0,0 +1,15 @@
+!
+! template: bgpd/templates/internal/instance.conf.j2
+!
+  neighbor 10.10.10.10 remote-as 555
+  neighbor 10.10.10.10 description remote_peer
+  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers connect 10
+  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 activate
+  exit-address-family
+!
+! end of template: bgpd/templates/internal/instance.conf.j2
+!
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v4.json
@@ -0,0 +1,23 @@
+{
+    "CONFIG_DB__DEVICE_METADATA": {
+        "localhost": {
+            "sub_role": "FrontEnd",
+            "type": "SpineRouter",
+            "switch_type": "chassis-packet"
+        }
+    },
+    "neighbor_addr": "10.10.10.10",
+    "bgp_session": {
+        "asn": "555",
+        "name": "remote_peer",
+        "keepalive": "5",
+        "holdtime": "30",
+        "admin_status": "down",
+        "ASIC": "something"
+    },
+    "constants": {
+        "deployment_id_asn_map": {
+            "5": "51111"
+        }
+    }
+}
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.conf
@@ -0,0 +1,15 @@
+!
+! template: bgpd/templates/internal/instance.conf.j2
+!
+  neighbor fc::10 remote-as 555
+  neighbor fc::10 description remote_peer
+  neighbor fc::10 timers 3 10
+  neighbor fc::10 timers connect 10
+  address-family ipv6
+    neighbor fc::10 peer-group INTERNAL_PEER_V6
+    neighbor fc::10 next-hop-self force
+    neighbor fc::10 activate
+  exit-address-family
+!
+! end of template: bgpd/templates/internal/instance.conf.j2
+!
diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/chassis_packet_v6.json
@@ -0,0 +1,23 @@
+{
+    "CONFIG_DB__DEVICE_METADATA": {
+        "localhost": {
+            "sub_role": "FrontEnd",
+            "type": "SpineRouter",
+            "switch_type": "chassis-packet"
+        }
+    },
+    "neighbor_addr": "fc::10",
+    "bgp_session": {
+        "asn": "555",
+        "name": "remote_peer",
+        "keepalive": "5",
+        "holdtime": "30",
+        "admin_status": "down",
+        "ASIC": "something"
+    },
+    "constants": {
+        "deployment_id_asn_map": {
+            "5": "51111"
+        }
+    }
+}
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
@@ -8,7 +8,6 @@
   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 route-map FROM_BGP_INTERNAL_PEER_V4 in
     neighbor 10.10.10.10 route-reflector-client
     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
@@ -8,7 +8,6 @@
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 next-hop-self force
-    neighbor fc::10 route-map FROM_BGP_INTERNAL_PEER_V6 in
     neighbor fc::10 route-reflector-client
     neighbor fc::10 activate
   exit-address-family