tests: Cleanup bgp config for evpn vxlan topotest

The bgp configuration for the vxlan topotest mixed
and matched some configuration that does not belong
for an IBGP setup.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf b/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf
index 720b83e4858ba0df2e300ec468c3c209886f5655..d337201f71e9b419bf628a9311c1c7487c028320 100644 (file)
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf
+++ b/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf
@@ -1,10 +1,9 @@
 router bgp 65000
+ timers 3 9
  bgp router-id 10.10.10.10
  no bgp default ipv4-unicast
  neighbor 10.30.30.30 remote-as 65000
- neighbor 10.30.30.30 ebgp-multihop 2
  neighbor 10.30.30.30 update-source lo
- neighbor 10.30.30.30 capability extended-nexthop
  address-family l2vpn evpn
   neighbor 10.30.30.30 activate
   advertise-all-vni

diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf b/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf
index 773979536788cc2641eb8d9eaa85f7078e4d7dc9..d99e33fc0662220709cdd5f3c00d7d84d05b4946 100644 (file)
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf
+++ b/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf
@@ -1,10 +1,9 @@
 router bgp 65000
+ timers bgp 3 9
  bgp router-id 10.30.30.30
  no bgp default ipv4-unicast
  neighbor 10.10.10.10 remote-as 65000
- neighbor 10.10.10.10 ebgp-multihop 2
  neighbor 10.10.10.10 update-source lo
- neighbor 10.10.10.10 capability extended-nexthop
  !
  address-family l2vpn evpn
   neighbor 10.10.10.10 activate