Merge pull request #456 from BYGX-wcr/202205

[VOQ Chassis] Reduce the i-BGP Keep alive and Hold timer value (#20189)
sonic-net · Sep 11, 2024 · 1d62764 · 1d62764
2 parents 29b3a4e + 61ebd2f
commit 1d62764
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/voq_chassis/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/voq_chassis/instance.conf.j2
@@ -11,7 +11,7 @@
 {% endif %}
   neighbor {{ neighbor_addr }} remote-as {{ bgp_session['asn'] }}
   neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
-  neighbor {{ neighbor_addr }} timers 3 10
+  neighbor {{ neighbor_addr }} timers 2 7
   neighbor {{ neighbor_addr }} timers connect 10
 !
 {% if 'admin_status' in bgp_session and bgp_session['admin_status'] == 'down' or 'admin_status' not in bgp_session and 'default_bgp_status' in CONFIG_DB__DEVICE_METADATA['localhost'] and CONFIG_DB__DEVICE_METADATA['localhost']['default_bgp_status'] == 'down' %}

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_all_v4.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_all_v4.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   neighbor 10.10.10.10 shutdown
 !

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_all_v6.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_all_v6.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   neighbor fc00::01 shutdown
 !

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_base_v4.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_base_v4.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_base_v6.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_base_v6.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v4_1.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v4_1.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   neighbor 10.10.10.10 shutdown
 !

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v4_2.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v4_2.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v6_1.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v6_1.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   neighbor fc00::01 shutdown
 !

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v6_2.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_shutdown_v6_2.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v4_1.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v4_1.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v4_2.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v4_2.conf
@@ -7,7 +7,7 @@
   neighbor 10.10.10.10 peer-group VOQ_CHASSIS_V4_PEER
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description internal1
-  neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers 2 7
   neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v6_1.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v6_1.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64

diff --git a/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v6_2.conf b/src/sonic-bgpcfgd/tests/data/voq_chassis/instance.conf/result_timers_v6_2.conf
@@ -7,7 +7,7 @@
   neighbor fc00::01 peer-group VOQ_CHASSIS_V6_PEER
   neighbor fc00::01 remote-as 555
   neighbor fc00::01 description internal1
-  neighbor fc00::01 timers 3 10
+  neighbor fc00::01 timers 2 7
   neighbor fc00::01 timers connect 10
   address-family ipv4
     maximum-paths ibgp 64