Merge pull request sonic-net#524 from dgsudharsan/disable_gr_2412

r12f · web-flow · commit 259904b922af · 2025-01-18T00:51:42.000-08:00
diff --git a/files/image_config/constants/constants.yml b/files/image_config/constants/constants.yml
@@ -16,7 +16,7 @@ constants:
     use_deployment_id: false
     use_neighbors_meta: false
     graceful_restart:
-      enabled: true
+      enabled: false
       restart_time: 240
     multipath_relax:
       enabled: true
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
@@ -48,10 +48,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf
@@ -48,10 +48,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
 !
   bmp mirror buffer-limit 4294967214
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf
@@ -49,10 +49,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf
@@ -20,8 +20,6 @@ router bgp 65100
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
   no bgp default ipv4-unicast
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
   bgp router-id 10.1.0.32
   network 10.1.0.32/32
   address-family ipv6
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -68,10 +68,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
@@ -26,8 +26,6 @@ router bgp 4000 vrf VnetFE
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
   no bgp default ipv4-unicast
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
   bgp router-id 4.0.0.0
   neighbor 192.168.0.1 remote-as 3000
   neighbor 192.168.0.1 description Leaf01
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
@@ -48,10 +48,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf
@@ -48,10 +48,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
 !
   bmp mirror buffer-limit 4294967214
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf
@@ -49,10 +49,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf
@@ -20,8 +20,6 @@ router bgp 65100
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
   no bgp default ipv4-unicast
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
   bgp router-id 10.1.0.32
   network 10.1.0.32/32
   address-family ipv6
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -68,10 +68,6 @@ router bgp 65100
 !
   bgp bestpath as-path multipath-relax
 !
-  bgp graceful-restart restart-time 240
-  bgp graceful-restart
-  bgp graceful-restart preserve-fw-state
-  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 10.1.0.32
 !

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,6 @@ router bgp 65100`
`48`	`48`	`!`
`49`	`49`	`bgp bestpath as-path multipath-relax`
`50`	`50`	`!`
`51`		`- bgp graceful-restart restart-time 240`
`52`		`- bgp graceful-restart`
`53`		`- bgp graceful-restart preserve-fw-state`
`54`		`- bgp graceful-restart select-defer-time 45`
`55`	`51`	`!`
`56`	`52`	`bgp router-id 10.1.0.32`
`57`	`53`	`!`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,6 @@ router bgp 65100`
`49`	`49`	`!`
`50`	`50`	`bgp bestpath as-path multipath-relax`
`51`	`51`	`!`
`52`		`- bgp graceful-restart restart-time 240`
`53`		`- bgp graceful-restart`
`54`		`- bgp graceful-restart preserve-fw-state`
`55`		`- bgp graceful-restart select-defer-time 45`
`56`	`52`	`!`
`57`	`53`	`bgp router-id 10.1.0.32`
`58`	`54`	`!`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,6 @@ router bgp 65100`
`68`	`68`	`!`
`69`	`69`	`bgp bestpath as-path multipath-relax`
`70`	`70`	`!`
`71`		`- bgp graceful-restart restart-time 240`
`72`		`- bgp graceful-restart`
`73`		`- bgp graceful-restart preserve-fw-state`
`74`		`- bgp graceful-restart select-defer-time 45`
`75`	`71`	`!`
`76`	`72`	`bgp router-id 10.1.0.32`
`77`	`73`	`!`