fix config-engine tests

stepanblyschak · stepanblyschak · commit 735ab84c0ead · 2022-11-16T14:13:55.000Z
Signed-off-by: Stepan Blyschak &lt;stepanb@nvidia.com&gt;
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
@@ -55,6 +55,7 @@ route-map HIDE_INTERNAL permit 20
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -34,6 +34,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf
@@ -12,6 +12,7 @@ ip prefix-list PL_LoopbackV4 permit 55.55.55.55/32
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -34,6 +34,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/ipv6_lo.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/ipv6_lo.conf
@@ -14,6 +14,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00::1/128
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/packet_chassis.conf
@@ -34,6 +34,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/voq_chassis.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/voq_chassis.conf
@@ -34,6 +34,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -70,6 +70,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 55555
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -42,6 +42,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-pending-fib
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -53,6 +53,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -53,6 +53,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -61,6 +61,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-pending-fib
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -42,6 +42,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -53,6 +53,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
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
@@ -53,6 +53,7 @@ route-map HIDE_INTERNAL permit 10
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -61,6 +61,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.200.0/27
 router bgp 65100
 !
   bgp log-neighbor-changes
+  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 !

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ route-map HIDE_INTERNAL permit 20`
`55`	`55`	`router bgp 55555`
`56`	`56`	`!`
`57`	`57`	`bgp log-neighbor-changes`
	`58`	`+ bgp suppress-fib-pending`
`58`	`59`	`no bgp default ipv4-unicast`
`59`	`60`	`no bgp ebgp-requires-policy`
`60`	`61`	`!`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ route-map HIDE_INTERNAL permit 10`
`34`	`34`	`router bgp 55555`
`35`	`35`	`!`
`36`	`36`	`bgp log-neighbor-changes`
	`37`	`+ bgp suppress-fib-pending`
`37`	`38`	`no bgp default ipv4-unicast`
`38`	`39`	`no bgp ebgp-requires-policy`
`39`	`40`	`!`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ ip prefix-list PL_LoopbackV4 permit 55.55.55.55/32`
`12`	`12`	`router bgp 55555`
`13`	`13`	`!`
`14`	`14`	`bgp log-neighbor-changes`
	`15`	`+ bgp suppress-fib-pending`
`15`	`16`	`no bgp default ipv4-unicast`
`16`	`17`	`no bgp ebgp-requires-policy`
`17`	`18`	`!`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00::1/128`
`14`	`14`	`router bgp 55555`
`15`	`15`	`!`
`16`	`16`	`bgp log-neighbor-changes`
	`17`	`+ bgp suppress-fib-pending`
`17`	`18`	`no bgp default ipv4-unicast`
`18`	`19`	`no bgp ebgp-requires-policy`
`19`	`20`	`!`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ route-map HIDE_INTERNAL permit 10`
`70`	`70`	`router bgp 55555`
`71`	`71`	`!`
`72`	`72`	`bgp log-neighbor-changes`
	`73`	`+ bgp suppress-fib-pending`
`73`	`74`	`no bgp default ipv4-unicast`
`74`	`75`	`no bgp ebgp-requires-policy`
`75`	`76`	`!`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ ip prefix-list LOCAL_VLAN_IPV4_PREFIX seq 10 permit 192.168.0.0/27`
`42`	`42`	`router bgp 65100`
`43`	`43`	`!`
`44`	`44`	`bgp log-neighbor-changes`
	`45`	`+ bgp suppress-pending-fib`
`45`	`46`	`no bgp default ipv4-unicast`
`46`	`47`	`no bgp ebgp-requires-policy`
`47`	`48`	`!`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ route-map HIDE_INTERNAL permit 10`
`53`	`53`	`router bgp 65100`
`54`	`54`	`!`
`55`	`55`	`bgp log-neighbor-changes`
	`56`	`+ bgp suppress-fib-pending`
`56`	`57`	`no bgp default ipv4-unicast`
`57`	`58`	`no bgp ebgp-requires-policy`
`58`	`59`	`!`