From a29bea9947dbcefe9f9c1d39865b4a75f318c59c Mon Sep 17 00:00:00 2001 From: GalaxyGorilla Date: Fri, 10 Jul 2020 11:29:32 +0000 Subject: [PATCH] tests: align BFD profiles tests for IS-IS Signed-off-by: GalaxyGorilla --- .../bfd-profiles-topo1/r3/bfd-peers-initial.json | 4 ++-- tests/topotests/bfd-profiles-topo1/r3/bfdd.conf | 9 ++++----- tests/topotests/bfd-profiles-topo1/r3/bgpd.conf | 2 +- tests/topotests/bfd-profiles-topo1/r3/isisd.conf | 1 + .../bfd-profiles-topo1/r4/bfd-peers-initial.json | 4 ++-- tests/topotests/bfd-profiles-topo1/r4/bgpd.conf | 2 +- tests/topotests/bfd-profiles-topo1/r4/isisd.conf | 1 + .../bfd-profiles-topo1/test_bfd_profiles_topo1.py | 0 8 files changed, 12 insertions(+), 11 deletions(-) mode change 100644 => 100755 tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py diff --git a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json b/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json index abca1ed131..d2d0c601c3 100644 --- a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json +++ b/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json @@ -25,14 +25,14 @@ "local": "*", "multihop": false, "peer": "*", - "receive-interval": 300, + "receive-interval": 250, "remote-detect-multiplier": 3, "remote-diagnostic": "ok", "remote-id": "*", "remote-receive-interval": 300, "remote-transmit-interval": 300, "status": "up", - "transmit-interval": 300, + "transmit-interval": 250, "uptime": "*", "vrf": "default" } diff --git a/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf b/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf index 74dae5a60d..08eb0468d6 100644 --- a/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf +++ b/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf @@ -3,9 +3,8 @@ debug bfd network debug bfd zebra ! bfd - ! profile is commented out on purpose. - !profile fasttx - ! receive-interval 250 - ! transmit-interval 250 - !! + profile fasttx + receive-interval 250 + transmit-interval 250 + ! ! diff --git a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf b/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf index 9c56a349ed..c7b75d2fde 100644 --- a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf +++ b/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf @@ -1,7 +1,7 @@ router bgp 100 bgp router-id 10.254.254.3 neighbor 172.16.1.2 remote-as 100 - neighbor 172.16.1.2 bfd profile fasttx + neighbor 172.16.1.2 bfd profile DOES_NOT_EXIST address-family ipv4 unicast redistribute connected exit-address-family diff --git a/tests/topotests/bfd-profiles-topo1/r3/isisd.conf b/tests/topotests/bfd-profiles-topo1/r3/isisd.conf index 5d774a356b..d27a783adf 100644 --- a/tests/topotests/bfd-profiles-topo1/r3/isisd.conf +++ b/tests/topotests/bfd-profiles-topo1/r3/isisd.conf @@ -8,6 +8,7 @@ interface r3-eth1 ipv6 router isis lan isis circuit-type level-1 isis bfd + isis bfd profile fasttx ! router isis lan net 10.0000.0000.0000.0000.0000.0000.0000.0000.0001.00 diff --git a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json b/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json index c8bc4c20e9..2c2e136abf 100644 --- a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json +++ b/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json @@ -11,8 +11,8 @@ "remote-detect-multiplier": 3, "remote-diagnostic": "ok", "remote-id": "*", - "remote-receive-interval": 300, - "remote-transmit-interval": 300, + "remote-receive-interval": 250, + "remote-transmit-interval": 250, "status": "up", "transmit-interval": 300, "uptime": "*", diff --git a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf b/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf index 7c4b39b020..aff1016dee 100644 --- a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf +++ b/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf @@ -5,7 +5,7 @@ router bgp 200 no bgp ebgp-requires-policy neighbor 2001:db8:1::2 remote-as 100 neighbor 2001:db8:1::2 ebgp-multihop 2 - neighbor 2001:db8:1::2 bfd profile fasttx + neighbor 2001:db8:1::2 bfd profile DOES_NOT_EXIST address-family ipv4 unicast redistribute connected exit-address-family diff --git a/tests/topotests/bfd-profiles-topo1/r4/isisd.conf b/tests/topotests/bfd-profiles-topo1/r4/isisd.conf index 477740087d..01e197bed5 100644 --- a/tests/topotests/bfd-profiles-topo1/r4/isisd.conf +++ b/tests/topotests/bfd-profiles-topo1/r4/isisd.conf @@ -8,6 +8,7 @@ interface r4-eth0 ipv6 router isis lan isis circuit-type level-1 isis bfd + isis bfd profile DOES_NOT_EXIST ! router isis lan net 10.0000.0000.0000.0000.0000.0000.0000.0000.0002.00 diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py b/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py old mode 100644 new mode 100755 -- 2.39.5