tests: Enable rfc8212 by default except datacenter profile

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

103 files changed, 155 insertions, 50 deletions

diff --git a/tests/topotests/all-protocol-startup/r1/bgpd.conf b/tests/topotests/all-protocol-startup/r1/bgpd.conf
index 4614287f27..3d1197a330 100644
--- a/tests/topotests/all-protocol-startup/r1/bgpd.conf
+++ b/tests/topotests/all-protocol-startup/r1/bgpd.conf
@@ -4,6 +4,7 @@ log file bgpd.log
 router bgp 100
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes
+ no bgp ebgp-requires-policy
  neighbor 192.168.7.10 remote-as 100
  neighbor 192.168.7.20 remote-as 200
  neighbor fc00:0:0:8::1000 remote-as 100
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
index fa6d60a8fc..f69b3c4ba3 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
@@ -1,6 +1,7 @@
 debug bgp neighbor-events
 router bgp 101
  bgp router-id 10.254.254.1
+ no bgp ebgp-requires-policy
  timers bgp 8 24
  bgp graceful-restart
  neighbor 2001:db8:4::1 remote-as 102
@@ -14,7 +15,7 @@ router bgp 101
  exit-address-family
  address-family ipv6 unicast
   network 2001:db8:8::/64
-  network 2001:db8:9::/64 
+  network 2001:db8:9::/64
   neighbor 2001:db8:4::1 activate
  exit-address-family
 !
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
index ea5334029c..51b611b2a7 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
@@ -1,6 +1,7 @@
 debug bgp neighbor-events
 router bgp 102
  bgp router-id 10.254.254.3
+ no bgp ebgp-requires-policy
  timers bgp 20 60
  bgp graceful-restart
  ! simulate NSF machine
diff --git a/tests/topotests/bfd-topo1/r1/bgpd.conf b/tests/topotests/bfd-topo1/r1/bgpd.conf
index 78a5611844..87f20d29e9 100644
--- a/tests/topotests/bfd-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 101
+ no bgp ebgp-requires-policy
  neighbor 192.168.0.2 remote-as 102
  neighbor 192.168.0.2 bfd
  address-family ipv4 unicast
diff --git a/tests/topotests/bfd-topo1/r2/bgpd.conf b/tests/topotests/bfd-topo1/r2/bgpd.conf
index af10cfaf40..f87e12f0a7 100644
--- a/tests/topotests/bfd-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 102
+ no bgp ebgp-requires-policy
  neighbor 192.168.0.1 remote-as 101
  neighbor 192.168.0.1 bfd
  neighbor 192.168.1.1 remote-as 103
diff --git a/tests/topotests/bfd-topo1/r3/bgpd.conf b/tests/topotests/bfd-topo1/r3/bgpd.conf
index 041fd7a759..0340e067f1 100644
--- a/tests/topotests/bfd-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r3/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 103
+ no bgp ebgp-requires-policy
  neighbor 192.168.1.2 remote-as 102
  neighbor 192.168.1.2 bfd
  address-family ipv4 unicast
diff --git a/tests/topotests/bfd-topo1/r4/bgpd.conf b/tests/topotests/bfd-topo1/r4/bgpd.conf
index 9c504699ba..980d927e97 100644
--- a/tests/topotests/bfd-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd-topo1/r4/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 104
+ no bgp ebgp-requires-policy
  neighbor 192.168.2.2 remote-as 102
  neighbor 192.168.2.2 bfd
  address-family ipv4 unicast
diff --git a/tests/topotests/bfd-topo2/r1/bgpd.conf b/tests/topotests/bfd-topo2/r1/bgpd.conf
index 1623b4578b..4d96bec2cb 100644
--- a/tests/topotests/bfd-topo2/r1/bgpd.conf
+++ b/tests/topotests/bfd-topo2/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 101
  bgp router-id 10.254.254.1
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bfd-topo2/r2/bgpd.conf b/tests/topotests/bfd-topo2/r2/bgpd.conf
index bf42d21812..4d02fc4f29 100644
--- a/tests/topotests/bfd-topo2/r2/bgpd.conf
+++ b/tests/topotests/bfd-topo2/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 102
  bgp router-id 10.254.254.2
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
index 7ad4e2bd74..136e53a43f 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 101 vrf r1-cust1
+ no bgp ebgp-requires-policy
  neighbor 192.168.0.2 remote-as 102
 ! neighbor 192.168.0.2 ebgp-multihop 10
  neighbor 192.168.0.2 bfd
diff --git a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
index 0715ea32a5..2bd13e22b2 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 102 vrf r2-cust1
+ no bgp ebgp-requires-policy
  neighbor 192.168.0.1 remote-as 101
  neighbor 192.168.0.1 bfd
  neighbor 192.168.1.1 remote-as 103
diff --git a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
index 277f027d5b..c0cd45f7fe 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 103 vrf r3-cust1
+ no bgp ebgp-requires-policy
  neighbor 192.168.1.2 remote-as 102
  neighbor 192.168.1.2 bfd
  address-family ipv4 unicast
diff --git a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf b/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
index 66bf28587d..fe1185768d 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 104 vrf r4-cust1
+ no bgp ebgp-requires-policy
  neighbor 192.168.2.2 remote-as 102
  neighbor 192.168.2.2 bfd
  address-family ipv4 unicast
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
index 627dc76c1b..d3beb2d320 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
@@ -5,6 +5,7 @@ log file bgpd.log
 router bgp 100
  bgp router-id 10.0.255.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 10.0.1.101 remote-as 99
  neighbor 10.0.1.102 remote-as 99
  neighbor 10.0.1.103 remote-as 99
diff --git a/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf b/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf
index 626c268392..03dfbf9322 100644
--- a/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf
+++ b/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf
@@ -1,14 +1,16 @@
 hostname r1
 
 router bgp 99 vrf DONNA
+  no bgp ebgp-requires-policy
   address-family ipv4 unicast
     redistribute connected
     import vrf EVA
   !
 !
 router bgp 99 vrf EVA
+  no bgp ebgp-requires-policy
   address-family ipv4 unicast
     redistribute connected
     import vrf DONNA
   !
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf b/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
index 528d02af36..9d519fae88 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf b/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
index 73d4d0aeea..38cf5aaca7 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   exit-address-family
 !
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf b/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
index ef34817bb1..292f0e967f 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf b/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
index 73d4d0aeea..38cf5aaca7 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   exit-address-family
 !
diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
index fc273ba7c6..75741a3c3e 100644
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r1/bgpd.conf
@@ -1,5 +1,6 @@
 ! exit1
 router bgp 65001
   bgp router-id 10.10.10.10
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
 !
diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
index 1134d98b38..18a6c66f69 100644
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r2/bgpd.conf
@@ -1,6 +1,7 @@
 ! spine
 router bgp 65002
   bgp router-id 10.10.10.10
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   neighbor 192.168.255.3 remote-as 65002
 !
diff --git a/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf b/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
index fa943d10c3..27bf126000 100644
--- a/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
+++ b/tests/topotests/bgp_as_wide_bgp_identifier/r3/bgpd.conf
@@ -1,5 +1,6 @@
 ! exit2
 router bgp 65002
   bgp router-id 10.10.10.10
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
 !
diff --git a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf b/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
index 6e1273f464..9518894351 100644
--- a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
+++ b/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     redistribute connected route-map r2-out
diff --git a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf b/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
index 3d354d56b1..e4c1167745 100644
--- a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
+++ b/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4
     neighbor 192.168.255.1 route-map r1-in in
diff --git a/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf b/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
index a9925ab661..12e56e27c4 100644
--- a/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
+++ b/tests/topotests/bgp_default-route_route-map/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     neighbor 192.168.255.2 default-originate route-map default
diff --git a/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf b/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
index a8a6c49f4d..b6b560aa4d 100644
--- a/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
+++ b/tests/topotests/bgp_default-route_route-map/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_distance_change/r1/bgpd.conf b/tests/topotests/bgp_distance_change/r1/bgpd.conf
index 67994702bc..cd2ef675fc 100644
--- a/tests/topotests/bgp_distance_change/r1/bgpd.conf
+++ b/tests/topotests/bgp_distance_change/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   exit-address-family
 !
diff --git a/tests/topotests/bgp_distance_change/r2/bgpd.conf b/tests/topotests/bgp_distance_change/r2/bgpd.conf
index 206f626da4..0faec85032 100644
--- a/tests/topotests/bgp_distance_change/r2/bgpd.conf
+++ b/tests/topotests/bgp_distance_change/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4
     redistribute connected
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
index e06fa08b57..aaa01ebcf9 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r1/bgpd.conf
@@ -1,5 +1,4 @@
 router bgp 65000
-  bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
index 0549697ff0..27427a9aaa 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r2/bgpd.conf
@@ -1,2 +1,3 @@
 router bgp 1000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
index b4e304d82a..2deb4b663d 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r3/bgpd.conf
@@ -1,5 +1,4 @@
 router bgp 65000
-  bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
index 0549697ff0..27427a9aaa 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r4/bgpd.conf
@@ -1,2 +1,3 @@
 router bgp 1000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
index 99e6b6818d..92a2797921 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r5/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65000
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf b/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
index 164f975cb7..342f53d4c7 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_requires_policy/r6/bgpd.conf
@@ -1,3 +1,2 @@
 router bgp 65000
-  bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
diff --git a/tests/topotests/bgp_ebgp_requires_policy/test_bgp_ebgp_requires_policy.py b/tests/topotests/bgp_ebgp_requires_policy/test_bgp_ebgp_requires_policy.py
index bdacff3a9c..4313b2b1ae 100644
--- a/tests/topotests/bgp_ebgp_requires_policy/test_bgp_ebgp_requires_policy.py
+++ b/tests/topotests/bgp_ebgp_requires_policy/test_bgp_ebgp_requires_policy.py
@@ -112,27 +112,27 @@ def test_ebgp_requires_policy():
 
     test_func = functools.partial(_bgp_converge, "r2")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is True, 'Failed bgp convergence (r2) in "{}"'.format(router)
+    assert success is True, 'Failed bgp convergence (r2) in "{}"'.format(tgen.gears["r2"])
 
     test_func = functools.partial(_bgp_has_routes, "r2")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is True, 'eBGP policy is not working (r2) in "{}"'.format(router)
+    assert success is True, 'eBGP policy is not working (r2) in "{}"'.format(tgen.gears["r2"])
 
     test_func = functools.partial(_bgp_converge, "r4")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is True, 'Failed bgp convergence (r4) in "{}"'.format(router)
+    assert success is True, 'Failed bgp convergence (r4) in "{}"'.format(tgen.gears["r4"])
 
     test_func = functools.partial(_bgp_has_routes, "r4")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is False, 'eBGP policy is not working (r4) in "{}"'.format(router)
+    assert success is False, 'eBGP policy is not working (r4) in "{}"'.format(tgen.gears["r4"])
 
     test_func = functools.partial(_bgp_converge, "r6")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is True, 'Failed bgp convergence (r6) in "{}"'.format(router)
+    assert success is True, 'Failed bgp convergence (r6) in "{}"'.format(tgen.gears["r6"])
 
     test_func = functools.partial(_bgp_has_routes, "r6")
     success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
-    assert success is True, 'eBGP policy is not working (r6) in "{}"'.format(router)
+    assert success is True, 'eBGP policy is not working (r6) in "{}"'.format(tgen.gears["r6"])
 
 
 if __name__ == "__main__":
diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf b/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
index 1623b4578b..4d96bec2cb 100644
--- a/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
+++ b/tests/topotests/bgp_ipv6_rtadv/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 101
  bgp router-id 10.254.254.1
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf b/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
index bf42d21812..4d02fc4f29 100644
--- a/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
+++ b/tests/topotests/bgp_ipv6_rtadv/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 102
  bgp router-id 10.254.254.2
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
index bd10248d7b..3591e52340 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf
@@ -7,6 +7,7 @@ log monitor notifications
 log commands
 router bgp 5226
    bgp router-id 99.0.0.1
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -28,6 +29,6 @@ route-map rm-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
index ab86c5e1b8..4cce20f623 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf
@@ -7,6 +7,7 @@ log monitor notifications
 log commands
 router bgp 5226
    bgp router-id 99.0.0.2
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -28,6 +29,6 @@ route-map rm-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
index 7d239b0bd5..4e68145761 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf
@@ -7,6 +7,7 @@ log monitor notifications
 log commands
 router bgp 5226
    bgp router-id 99.0.0.3
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5226
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -28,6 +29,6 @@ route-map rm-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
index 7ec941ee6b..33041262f6 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 1.1.1.1
    bgp cluster-id 1.1.1.1
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.2 remote-as 5226
    neighbor 192.168.1.2 update-source 192.168.1.1
    neighbor 192.168.1.2 route-reflector-client
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
index 241c2ac0ae..748da19bcf 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 2.2.2.2
    bgp cluster-id 2.2.2.2
+   no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
@@ -28,6 +29,6 @@ router bgp 5226
      neighbor 4.4.4.4 route-reflector-client
    exit-address-family
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
index 5591c633c6..1e1616b5f3 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf
@@ -8,8 +8,9 @@ log commands
 router bgp 5226
    bgp router-id 3.3.3.3
    bgp cluster-id 3.3.3.3
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.2 remote-as 5226
-   neighbor 192.168.1.2 update-source 192.168.1.2 
+   neighbor 192.168.1.2 update-source 192.168.1.2
    neighbor 192.168.1.2 route-reflector-client
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 3.3.3.3
@@ -37,6 +38,6 @@ router bgp 5226
  vnc redistribute ipv4 bgp-direct
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
index 145390d724..99ea049f93 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 4.4.4.4
    bgp cluster-id 4.4.4.4
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.2 remote-as 5226
    neighbor 192.168.1.2 update-source 192.168.1.1
    neighbor 192.168.1.2 route-reflector-client
@@ -37,6 +38,6 @@ router bgp 5226
  vnc redistribute ipv4 bgp-direct
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
index a38fb1e9a1..156723fc42 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
@@ -9,6 +9,7 @@ log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.1
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -41,6 +42,6 @@ route-map sharp-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
index 3aeb9f9c9f..6dfb175111 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
@@ -9,6 +9,7 @@ log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.2
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -41,6 +42,6 @@ route-map sharp-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
index a65b36f364..cfd50122fa 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
@@ -9,6 +9,7 @@ log file bgpd.log
 
 router bgp 5227
    bgp router-id 99.0.0.3
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
@@ -31,6 +32,6 @@ route-map rm-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
index cb08db5314..0219a4d8d7 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
@@ -9,6 +9,7 @@ log file bgpd.log
 
 router bgp 5228 vrf ce4-cust2
    bgp router-id 99.0.0.4
+   no bgp ebgp-requires-policy
    neighbor 192.168.2.1 remote-as 5228
    neighbor 192.168.2.1 update-source 192.168.2.2
    address-family ipv4 unicast
@@ -31,6 +32,6 @@ route-map rm-nh permit 10
 !
 
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
index c1bad0b7c6..a9549e8fee 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -16,6 +16,7 @@ log file bgpd.log debugging
 router bgp 5226
    bgp router-id 1.1.1.1
    bgp cluster-id 1.1.1.1
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 1.1.1.1
 
@@ -31,6 +32,7 @@ router bgp 5226
 router bgp 5227 vrf r1-cust1
 
    bgp router-id 192.168.1.1
+   no bgp ebgp-requires-policy
 
    neighbor 192.168.1.2 remote-as 5227
    neighbor 192.168.1.2 update-source 192.168.1.1
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
index 4ccb0ca5c0..d166dfd7e8 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf
@@ -10,6 +10,7 @@ log file bgpd.log debugging
 router bgp 5226
    bgp router-id 2.2.2.2
    bgp cluster-id 2.2.2.2
+   no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
@@ -30,6 +31,6 @@ router bgp 5226
      neighbor 4.4.4.4 route-reflector-client
    exit-address-family
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
index c4b6ac9bb4..e2a8de7db7 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
@@ -11,6 +11,7 @@ log file bgpd.log
 router bgp 5226
    bgp router-id 3.3.3.3
    bgp cluster-id 3.3.3.3
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 3.3.3.3
 
@@ -25,9 +26,10 @@ router bgp 5226
 router bgp 5227 vrf r3-cust1
 
    bgp router-id 192.168.1.1
+   no bgp ebgp-requires-policy
 
    neighbor 192.168.1.2 remote-as 5227
-   neighbor 192.168.1.2 update-source 192.168.1.1 
+   neighbor 192.168.1.2 update-source 192.168.1.1
 
    address-family ipv4 unicast
      neighbor 192.168.1.2 activate
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
index 6295406e69..7b267a6ee1 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
@@ -14,6 +14,7 @@ log file bgpd.log debug
 router bgp 5226
    bgp router-id 4.4.4.4
    bgp cluster-id 4.4.4.4
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 4.4.4.4
 
@@ -28,9 +29,10 @@ router bgp 5226
 router bgp 5227 vrf r4-cust1
 
    bgp router-id 192.168.1.1
+   no bgp ebgp-requires-policy
 
    neighbor 192.168.1.2 remote-as 5227
-   neighbor 192.168.1.2 update-source 192.168.1.1 
+   neighbor 192.168.1.2 update-source 192.168.1.1
 
    address-family ipv4 unicast
      neighbor 192.168.1.2 activate
@@ -47,6 +49,7 @@ router bgp 5227 vrf r4-cust1
 router bgp 5228 vrf r4-cust2
 
    bgp router-id 192.168.2.1
+   no bgp ebgp-requires-policy
 
    neighbor 192.168.2.2 remote-as 5228
    neighbor 192.168.2.2 update-source 192.168.2.1
diff --git a/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
index 595e244a21..40c19062a2 100644
--- a/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r1/bgpd.conf
@@ -2,6 +2,7 @@ hostname r1
 !
 router bgp 65101
  bgp router-id 11.1.1.1
+ no bgp ebgp-requires-policy
  bgp bestpath as-path multipath-relax
  neighbor 11.1.1.2 remote-as external
  neighbor 11.1.1.6 remote-as external
diff --git a/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
index 88a7bdce22..80588e7961 100644
--- a/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r10/bgpd.conf
@@ -7,6 +7,7 @@ route-map redist permit 10
 !
 router bgp 65354
  bgp router-id 11.1.6.2
+ no bgp ebgp-requires-policy
  neighbor 11.1.6.1 remote-as external
  !
  address-family ipv4 unicast
diff --git a/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
index 2b6e9aeb6f..6fec1913c8 100644
--- a/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r2/bgpd.conf
@@ -3,6 +3,7 @@ hostname r2
 router bgp 65201
  bgp router-id 11.1.2.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 11.1.1.1 remote-as external
  neighbor 11.1.2.2 remote-as external
  neighbor 11.1.2.6 remote-as external
diff --git a/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
index 8b7c0c1792..1c2ca88306 100644
--- a/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r3/bgpd.conf
@@ -3,6 +3,7 @@ hostname r3
 router bgp 65202
  bgp router-id 11.1.3.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 11.1.1.5 remote-as external
  neighbor 11.1.3.2 remote-as external
 !
diff --git a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
index fa1f37843f..022a230643 100644
--- a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf
@@ -18,6 +18,7 @@ route-map anycast_ip permit 20
 router bgp 65301
  bgp router-id 11.1.4.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 11.1.2.1 remote-as external
  neighbor 11.1.4.2 remote-as external
  neighbor 11.1.4.6 remote-as external
diff --git a/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
index 8614f3e178..fc4e3888d8 100644
--- a/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r5/bgpd.conf
@@ -11,6 +11,7 @@ route-map anycast_ip permit 20
 router bgp 65302
  bgp router-id 11.1.5.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 11.1.2.5 remote-as external
  neighbor 11.1.5.2 remote-as external
  !
diff --git a/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
index 3e5c6df6e1..f08f6337f4 100644
--- a/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r6/bgpd.conf
@@ -11,6 +11,7 @@ route-map anycast_ip permit 20
 router bgp 65303
  bgp router-id 11.1.6.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 11.1.3.1 remote-as external
  neighbor 11.1.6.2 remote-as external
  !
diff --git a/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
index 7862023f55..98dfe2471a 100644
--- a/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r7/bgpd.conf
@@ -7,6 +7,7 @@ route-map redist permit 10
 !
 router bgp 65351
  bgp router-id 11.1.4.2
+ no bgp ebgp-requires-policy
  neighbor 11.1.4.1 remote-as external
  !
  address-family ipv4 unicast
diff --git a/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
index 02110d9175..b4ba8e8a72 100644
--- a/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r8/bgpd.conf
@@ -7,6 +7,7 @@ route-map redist permit 10
 !
 router bgp 65352
  bgp router-id 11.1.4.6
+ no bgp ebgp-requires-policy
  neighbor 11.1.4.5 remote-as external
  !
  address-family ipv4 unicast
diff --git a/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
index d64663fa16..31f971dd08 100644
--- a/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
+++ b/tests/topotests/bgp_link_bw_ip/r9/bgpd.conf
@@ -7,6 +7,7 @@ route-map redist permit 10
 !
 router bgp 65353
  bgp router-id 11.1.5.2
+ no bgp ebgp-requires-policy
  neighbor 11.1.5.1 remote-as external
  !
  address-family ipv4 unicast
diff --git a/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
index e2f034453f..6f8fcd753d 100644
--- a/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
index 0549697ff0..27427a9aaa 100644
--- a/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r2/bgpd.conf
@@ -1,2 +1,3 @@
 router bgp 1000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
diff --git a/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
index 4e57f71c48..f2050ddfdb 100644
--- a/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r3/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 3000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 1000
   neighbor 192.168.255.2 local-as 500
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf b/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
index 0549697ff0..27427a9aaa 100644
--- a/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
+++ b/tests/topotests/bgp_local_as_private_remove/r4/bgpd.conf
@@ -1,2 +1,3 @@
 router bgp 1000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 500
diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf b/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
index 235b42b3d5..f0df56e947 100644
--- a/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf b/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
index e016284159..ef50dd0d7f 100644
--- a/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_invalid_update/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4
     neighbor 192.168.255.1 maximum-prefix 1
diff --git a/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf b/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
index 9a68809631..03e3eb6e08 100644
--- a/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_out/r1/bgpd.conf
@@ -1,5 +1,6 @@
 !
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf b/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
index 1659c4bec4..2d47b2f661 100644
--- a/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
+++ b/tests/topotests/bgp_maximum_prefix_out/r2/bgpd.conf
@@ -1,5 +1,6 @@
 !
 router bgp 65002
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   exit-address-family
   !
diff --git a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
index 71397a9942..5f65a54d7f 100644
--- a/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
@@ -13,6 +13,7 @@ log file bgpd.log
 !
 router bgp 100 view 1
  bgp router-id 172.30.1.1
+ no bgp ebgp-requires-policy
  network 172.20.0.0/28 route-map local1
  timers bgp 60 180
  neighbor 172.16.1.1 remote-as 65001
@@ -21,6 +22,7 @@ router bgp 100 view 1
 !
 router bgp 100 view 2
  bgp router-id 172.30.1.1
+ no bgp ebgp-requires-policy
  network 172.20.0.0/28 route-map local2
  timers bgp 60 180
  neighbor 172.16.1.3 remote-as 65003
@@ -28,6 +30,7 @@ router bgp 100 view 2
 !
 router bgp 100 view 3
  bgp router-id 172.30.1.1
+ no bgp ebgp-requires-policy
  network 172.20.0.0/28
  timers bgp 60 180
  neighbor 172.16.1.6 remote-as 65006
diff --git a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
index 7a38cc307f..2f8759f960 100644
--- a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
+++ b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf
@@ -5,6 +5,7 @@ log commands
 router bgp 1
  bgp router-id 10.0.0.1
  no bgp default ipv4-unicast
+ no bgp ebgp-requires-policy
  neighbor 10.0.0.101 remote-as 2
  neighbor 10.0.0.102 remote-as 3
  !
diff --git a/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
index 7b24c4bbf9..94bfc5e561 100644
--- a/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
@@ -1,5 +1,6 @@
 ! exit1
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
index c991b5bcd8..f217b7f794 100644
--- a/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
@@ -1,6 +1,7 @@
 ! spine
 router bgp 65002
   bgp reject-as-sets
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   neighbor 192.168.254.2 remote-as 65003
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
index bee518c84b..8d085a0e4b 100644
--- a/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
+++ b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
@@ -1,5 +1,6 @@
 ! exit2
 router bgp 65003
+  no bgp ebgp-requires-policy
   neighbor 192.168.254.1 remote-as 65002
   address-family ipv4 unicast
     neighbor 192.168.254.1 allowas-in
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
index 05eac758f1..b3fe5ff23d 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 1.1.1.1
    bgp cluster-id 1.1.1.1
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 1.1.1.1
 !
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
index 241c2ac0ae..748da19bcf 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 2.2.2.2
    bgp cluster-id 2.2.2.2
+   no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
@@ -28,6 +29,6 @@ router bgp 5226
      neighbor 4.4.4.4 route-reflector-client
    exit-address-family
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
index 67b26e3a50..3de285989b 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 3.3.3.3
    bgp cluster-id 3.3.3.3
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 3.3.3.3
 !
@@ -45,6 +46,6 @@ router bgp 5226
   exit-vnc
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
index 2ba5c74e5b..7238da233d 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 4.4.4.4
    bgp cluster-id 4.4.4.4
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 4.4.4.4
 !
@@ -46,6 +47,6 @@ router bgp 5226
   exit-vnc
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
index f7f5e2ee96..626d8227e7 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 1.1.1.1
    bgp cluster-id 1.1.1.1
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 1.1.1.1
 !
diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
index 241c2ac0ae..748da19bcf 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 2.2.2.2
    bgp cluster-id 2.2.2.2
+   no bgp ebgp-requires-policy
    neighbor 1.1.1.1 remote-as 5226
    neighbor 1.1.1.1 update-source 2.2.2.2
    neighbor 3.3.3.3 remote-as 5226
@@ -28,6 +29,6 @@ router bgp 5226
      neighbor 4.4.4.4 route-reflector-client
    exit-address-family
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
index 17e351988d..449980d33a 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 3.3.3.3
    bgp cluster-id 3.3.3.3
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 3.3.3.3
 !
@@ -46,6 +47,6 @@ router bgp 5226
   exit-vnc
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
index 0b8808cb80..a22806dabd 100644
--- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
+++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf
@@ -8,6 +8,7 @@ log commands
 router bgp 5226
    bgp router-id 4.4.4.4
    bgp cluster-id 4.4.4.4
+   no bgp ebgp-requires-policy
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 4.4.4.4
 !
@@ -47,6 +48,6 @@ router bgp 5226
   exit-vnc
 !
 end
-   
-   
+
+
 
diff --git a/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf b/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
index 29a119c291..fa77cce073 100644
--- a/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/spine1/bgpd.conf
@@ -1,5 +1,6 @@
 hostname spine1
 router bgp 99
+  no bgp ebgp-requires-policy
   neighbor 192.168.2.1 remote-as internal
   neighbor 192.168.4.2 remote-as internal
   address-family ipv4 uni
diff --git a/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf b/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
index e8ec0f7680..b028ab4e8b 100644
--- a/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/tor1/bgpd.conf
@@ -1,4 +1,5 @@
 hostname tor1
 router bgp 99
+  no bgp ebgp-requires-policy
   neighbor 192.168.2.3 remote-as internal
   redistribute connected
diff --git a/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf b/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
index b091c97ac3..99c34158b9 100644
--- a/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
+++ b/tests/topotests/bgp_rr_ibgp/tor2/bgpd.conf
@@ -1,4 +1,5 @@
 hostname tor2
 router bgp 99
+  no bgp ebgp-requires-policy
   neighbor 192.168.4.3 remote-as internal
   redistribute connected
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
index a91b564bff..b16e94d7c1 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
@@ -1,5 +1,6 @@
 ! exit1
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65002
   address-family ipv4 unicast
     neighbor 192.168.255.1 route-map prepend out
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
index 6e8e89360f..674877edd3 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
@@ -1,5 +1,6 @@
 ! spine
 router bgp 65002
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   neighbor 192.168.255.2 solo
   neighbor 192.168.254.2 remote-as 65003
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf b/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
index 8962befad2..4ee7a39ab2 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
+++ b/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
@@ -1,4 +1,5 @@
 ! exit2
 router bgp 65003
+  no bgp ebgp-requires-policy
   neighbor 192.168.254.1 remote-as 65002
 !
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
index 1a9c5325ad..7dab52fef0 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65000
   neighbor 192.168.255.3 remote-as 65000
   exit-address-family
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
index 89e1256667..a8a0384632 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4
     redistribute connected
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf b/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
index fabd4605f3..2f5dceede2 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
+++ b/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4
     redistribute connected
diff --git a/tests/topotests/bgp_show_ip_bgp_fqdn/r1/bgpd.conf b/tests/topotests/bgp_show_ip_bgp_fqdn/r1/bgpd.conf
index 235b42b3d5..f0df56e947 100644
--- a/tests/topotests/bgp_show_ip_bgp_fqdn/r1/bgpd.conf
+++ b/tests/topotests/bgp_show_ip_bgp_fqdn/r1/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65000
+  no bgp ebgp-requires-policy
   neighbor 192.168.255.2 remote-as 65001
   address-family ipv4 unicast
     redistribute connected
diff --git a/tests/topotests/bgp_show_ip_bgp_fqdn/r2/bgpd.conf b/tests/topotests/bgp_show_ip_bgp_fqdn/r2/bgpd.conf
index c05bfd5a6b..555946b679 100644
--- a/tests/topotests/bgp_show_ip_bgp_fqdn/r2/bgpd.conf
+++ b/tests/topotests/bgp_show_ip_bgp_fqdn/r2/bgpd.conf
@@ -1,4 +1,5 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   bgp default show-hostname
   neighbor 192.168.255.1 remote-as 65000
   address-family ipv4 unicast
diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
index 3c974c767f..002cecd1fa 100644
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 101 vrf r1-cust1
  bgp router-id 10.254.254.1
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
index 39362abd46..0878b9b995 100644
--- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
+++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/bgpd.conf
@@ -1,5 +1,6 @@
 router bgp 102 vrf r2-cust1
  bgp router-id 10.254.254.2
+ no bgp ebgp-requires-policy
  neighbor r2g peer-group
  neighbor r2g remote-as external
  neighbor r2g bfd
diff --git a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
index e3f158d7b3..dabf9521ac 100644
--- a/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_netns/r1/bgpd.conf
@@ -2,6 +2,7 @@
 router bgp 100 vrf r1-cust1
  bgp router-id 10.0.1.1
  bgp bestpath as-path multipath-relax
+ no bgp ebgp-requires-policy
  neighbor 10.0.1.101 remote-as 99
  !
 !
diff --git a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf b/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
index 33d34db677..4dedfecd61 100644
--- a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
@@ -1,9 +1,10 @@
 
 router bgp 65002
+   no bgp ebgp-requires-policy
    neighbor 192.168.1.1 remote-as external
    redistribute connected
    address-family l2vpn evpn
       neighbor 192.168.1.1 activate
       advertise-all-vni
    !
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf b/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
index 3dd9f237be..5bc708240d 100644
--- a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
@@ -1,9 +1,10 @@
 
 router bgp 65003
+  no bgp ebgp-requires-policy
   neighbor 192.168.2.1 remote-as external
   redistribute connected
   address-family l2vpn evpn
      neighbor 192.168.2.1 activate
      advertise-all-vni
   !
-!
\ No newline at end of file
+!
diff --git a/tests/topotests/evpn-pim-1/spine/bgpd.conf b/tests/topotests/evpn-pim-1/spine/bgpd.conf
index 9a845043e9..16c17b29cc 100644
--- a/tests/topotests/evpn-pim-1/spine/bgpd.conf
+++ b/tests/topotests/evpn-pim-1/spine/bgpd.conf
@@ -1,5 +1,6 @@
 
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 192.168.1.2 remote-as external
   neighbor 192.168.2.3 remote-as external
   redistribute connected
diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py
index b2cd2d284d..cafba60abf 100644
--- a/tests/topotests/lib/bgp.py
+++ b/tests/topotests/lib/bgp.py
@@ -209,6 +209,9 @@ def __create_bgp_global(tgen, input_dict, router, build=False):
 
     config_data.append(cmd)
 
+    # Skip RFC8212 in topotests
+    config_data.append("no bgp ebgp-requires-policy")
+
     router_id = bgp_data.setdefault("router_id", None)
     del_router_id = bgp_data.setdefault("del_router_id", False)
     if del_router_id:
diff --git a/tests/topotests/pim-basic/r1/bgpd.conf b/tests/topotests/pim-basic/r1/bgpd.conf
index 8acaac96a0..1ca643f758 100644
--- a/tests/topotests/pim-basic/r1/bgpd.conf
+++ b/tests/topotests/pim-basic/r1/bgpd.conf
@@ -1,3 +1,4 @@
 router bgp 65001
+  no bgp ebgp-requires-policy
   neighbor 10.0.30.3 remote-as external
   redistribute connected
diff --git a/tests/topotests/pim-basic/rp/bgpd.conf b/tests/topotests/pim-basic/rp/bgpd.conf
index 6b16c067a5..451799288a 100644
--- a/tests/topotests/pim-basic/rp/bgpd.conf
+++ b/tests/topotests/pim-basic/rp/bgpd.conf
@@ -1,3 +1,4 @@
 router bgp 65003
+   no bgp ebgp-requires-policy
    neighbor 10.0.30.1 remote-as external
    redistribute connected