topotests: bgp-evpn-mh: configure uplinks and change the startup-delay

1. The default startup-delay for multihomed devices is three minutes. While
that is necessary/reasonable for a real network it is not needed for a
test env. Lower the startup-delay to 1s to keep the test run time low.
2. Configure uplinks for mh uplink-tracking

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>

diff --git a/tests/topotests/bgp-evpn-mh/torm11/zebra.conf b/tests/topotests/bgp-evpn-mh/torm11/zebra.conf
index ee4e87e1c29e81f10f9283c8c5e2c99a1d4957e4..33e89c06ae1bcd34c751d0b4ff6b5083c253966c 100644 (file)
--- a/tests/topotests/bgp-evpn-mh/torm11/zebra.conf
+++ b/tests/topotests/bgp-evpn-mh/torm11/zebra.conf
@@ -4,11 +4,15 @@ debug zebra evpn mh neigh
 debug zebra evpn mh nh
 debug zebra vxlan
 !
+evpn mh startup-delay 1
+!
 int torm11-eth0
   ip addr 192.168.1.2/24
+  evpn mh uplink
 !
 int torm11-eth1
   ip addr 192.168.5.2/24
+  evpn mh uplink
 !
 int lo
   ip addr 192.168.100.15/32

diff --git a/tests/topotests/bgp-evpn-mh/torm12/zebra.conf b/tests/topotests/bgp-evpn-mh/torm12/zebra.conf
index 736af4159e959bc3ceb304d58144e80dc5a1526f..419f62b2aceedc871e0600224a37b20963740aad 100644 (file)
--- a/tests/topotests/bgp-evpn-mh/torm12/zebra.conf
+++ b/tests/topotests/bgp-evpn-mh/torm12/zebra.conf
@@ -4,11 +4,16 @@ debug zebra evpn mh neigh
 debug zebra evpn mh nh
 debug zebra vxlan
 !
+evpn mh startup-delay 1
+!
 int torm12-eth0
   ip addr 192.168.2.2/24
+  evpn mh uplink
 !
 int torm12-eth1
   ip addr 192.168.6.2/24
+  evpn mh uplink
+!
 !
 int lo
   ip addr 192.168.100.16/32

diff --git a/tests/topotests/bgp-evpn-mh/torm21/zebra.conf b/tests/topotests/bgp-evpn-mh/torm21/zebra.conf
index 0ebe6f2d956088efa491bb0bfe24d9844ef6ead3..525f5eb0998c36f4671801704381ec20e6574239 100644 (file)
--- a/tests/topotests/bgp-evpn-mh/torm21/zebra.conf
+++ b/tests/topotests/bgp-evpn-mh/torm21/zebra.conf
@@ -4,11 +4,17 @@ debug zebra evpn mh neigh
 debug zebra evpn mh nh
 debug zebra vxlan
 !
+evpn mh startup-delay 1
+!
 int torm21-eth0
   ip addr 192.168.3.2/24
+  evpn mh uplink
+!
 !
 int torm21-eth1
   ip addr 192.168.7.2/24
+  evpn mh uplink
+!
 !
 int lo
   ip addr 192.168.100.17/32

diff --git a/tests/topotests/bgp-evpn-mh/torm22/evpn.conf b/tests/topotests/bgp-evpn-mh/torm22/evpn.conf
index b4f4f1dc25c5999f0c957b36d4b2a5960bb51970..432135c94a79210ba00d3cb399d50242f4be20d2 100644 (file)
--- a/tests/topotests/bgp-evpn-mh/torm22/evpn.conf
+++ b/tests/topotests/bgp-evpn-mh/torm22/evpn.conf
@@ -5,7 +5,6 @@ debug bgp evpn mh es
 debug bgp evpn mh route
 debug bgp zebra
 !
-!
 router bgp 65005
   bgp router-id 192.168.100.18
   no bgp ebgp-requires-policy

diff --git a/tests/topotests/bgp-evpn-mh/torm22/zebra.conf b/tests/topotests/bgp-evpn-mh/torm22/zebra.conf
index 356d8a43e7bad48efbc139095ffc12b0b1e0e6cf..398064df6c3037577abbd42f8b72d46b48fd0b75 100644 (file)
--- a/tests/topotests/bgp-evpn-mh/torm22/zebra.conf
+++ b/tests/topotests/bgp-evpn-mh/torm22/zebra.conf
@@ -4,11 +4,17 @@ debug zebra evpn mh neigh
 debug zebra evpn mh nh
 debug zebra vxlan
 !
+evpn mh startup-delay 1
+!
 int torm22-eth0
   ip addr 192.168.4.2/24
+  evpn mh uplink
+!
 !
 int torm22-eth1
   ip addr 192.168.8.2/24
+  evpn mh uplink
+!
 !
 int lo
   ip addr 192.168.100.18/32