Merge pull request FRRouting#19597 from donaldsharp/tests_unified

Convert a couple of bfd tests to use frr.conf unified config

Author: Jafaral

tests/topotests/bfd_isis_topo1/rt1/bfdd.conf

@@ -0,0 +1,64 @@
+log file zebra.log
+log timestamp precision 3
+!
+hostname rt1
+!
+! debug zebra kernel
+! debug zebra packet
+! debug zebra events
+! debug zebra rib
+! debug bfd network
+! debug bfd peer
+! debug bfd zebra
+! debug isis events
+! debug isis route-events
+! debug isis spf-events
+! debug isis adj-packets
+! debug isis lsp-sched
+!
+interface lo
+ ip address 1.1.1.1/32
+ ipv6 address ::ffff:1.1.1.1/128
+ ip router isis 1
+ ipv6 router isis 1
+ isis passive
+!
+interface eth-rt2
+ ip address 10.0.1.1/24
+ ip router isis 1
+ ipv6 router isis 1
+ isis hello-multiplier 10
+ isis bfd
+!
+interface eth-rt3
+ ip address 10.0.2.1/24
+ ip router isis 1
+ ipv6 router isis 1
+ isis hello-multiplier 10
+ isis network point-to-point
+ isis bfd
+!
+ip forwarding
+ipv6 forwarding
+!
+bfd
+ peer 10.0.1.2 interface eth-rt2
+  detect-multiplier 3
+  receive-interval 300
+  transmit-interval 300
+  no shutdown
+ !
+ peer 10.0.2.2 interface eth-rt3
+  detect-multiplier 3
+  receive-interval 300
+  transmit-interval 300
+  no shutdown
+ !
+!
+router isis 1
+ lsp-gen-interval 2
+ net 49.0000.0000.0000.0001.00
+ is-type level-1
+!
+line vty
+!

tests/topotests/bfd_isis_topo1/rt1/frr.conf

@@ -1,31 +1,51 @@
-log file isisd.log
+log file zebra.log
 !
 hostname rt2
 !
-password 1
-!
+! debug zebra kernel
+! debug zebra packet
+! debug bfd network
+! debug bfd peer
+! debug bfd zebra
 ! debug isis events
 ! debug isis route-events
 ! debug isis spf-events
 !
 interface lo
+ ip address 2.2.2.2/32
+ ipv6 address ::ffff:2.2.2.2/128
  ip router isis 1
  ipv6 router isis 1
  isis passive
 !
 interface eth-rt1
+ ip address 10.0.1.2/24
  ip router isis 1
  ipv6 router isis 1
  isis hello-multiplier 10
  isis bfd
 !
 interface eth-rt5
+ ip address 10.0.3.1/24
  ip router isis 1
  ipv6 router isis 1
  isis hello-multiplier 10
 !
+ip forwarding
+ipv6 forwarding
+!
+bfd
+ peer 10.0.1.1 interface eth-rt1
+  detect-multiplier 3
+  receive-interval 300
+  transmit-interval 300
+  no shutdown
+ !
+!
 router isis 1
  lsp-gen-interval 2
  net 49.0000.0000.0000.0002.00
  is-type level-1
 !
+line vty
+!

tests/topotests/bfd_isis_topo1/rt1/isisd.conf

@@ -1,33 +1,52 @@
-log file isisd.log
+log file zebra.log
 !
 hostname rt3
 !
-password 1
-!
+! debug zebra kernel
+! debug zebra packet
+! debug bfd network
+! debug bfd peer
+! debug bfd zebra
 ! debug isis events
 ! debug isis route-events
 ! debug isis spf-events
 !
 interface lo
+ ip address 3.3.3.3/32
+ ipv6 address ::ffff:3.3.3.3/128
  ip router isis 1
  ipv6 router isis 1
  isis passive
 !
 interface eth-rt1
+ ip address 10.0.2.2/24
  ip router isis 1
  ipv6 router isis 1
  isis hello-multiplier 10
  isis network point-to-point
  isis bfd
 !
 interface eth-rt4
+ ip address 10.0.4.1/24
  ip router isis 1
  ipv6 router isis 1
  isis hello-multiplier 10
 !
+ip forwarding
+ipv6 forwarding
+!
+bfd
+ peer 10.0.2.1 interface eth-rt1
+  detect-multiplier 3
+  receive-interval 300
+  transmit-interval 300
+  no shutdown
+ !
+!
 router isis 1
  lsp-gen-interval 2
  net 49.0000.0000.0000.0003.00
  is-type level-1
 !
-
+line vty
+!