tests: align BFD profiles tests for IS-IS

Signed-off-by: GalaxyGorilla <sascha@netdef.org>

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 abca1ed13106b1c51c54fb10d65c97fda514530c..d2d0c601c3e47cb096e8ece1299b34b3c53dc508 100644 (file)
--- 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 74dae5a60d567c7a0a24470a8e462ed91f367647..08eb0468d66a99ab01d1c0a181afd4f4f7dabe8c 100644 (file)
--- 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 9c56a349edd0f890ea1a7af975687aa2392299a8..c7b75d2fde2b59c2159f9d8767de4221df102ea2 100644 (file)
--- 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 5d774a356ba5802521a6a2e5aabeccf10e751324..d27a783adf90198e12b2df53fc883b3ecc988876 100644 (file)
--- 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 c8bc4c20e92657ec8db5d39bf15c8ed05af03ec8..2c2e136abf2783523f000c0c5c05a00451550fe7 100644 (file)
--- 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 7c4b39b020fc129c6ab4305601b53948fc00d211..aff1016deeafe4644632f5ab21842ff73594ea4e 100644 (file)
--- 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 477740087dfa2ded58ff2202df04ea8e2bc785cf..01e197bed5c1e208bd7e7d482e731f33374c11c2 100644 (file)
--- 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 (file)
new mode 100755 (executable)