Skip to content

Commit

Permalink
Add OSPF test for issue 14488
Browse files Browse the repository at this point in the history
This is a preview that needs further work.

See FRRouting#14488
  • Loading branch information
href committed Oct 10, 2023
1 parent d2324b7 commit cb95585
Show file tree
Hide file tree
Showing 8 changed files with 480 additions and 0 deletions.
Empty file.
58 changes: 58 additions & 0 deletions tests/topotests/ospf_topo2/r1/frr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
frr version 7.5.1
frr defaults traditional
hostname r
log syslog informational
service integrated-vtysh-config
!
ip router-id 192.0.2.1
!
interface eth1
ip address 192.0.2.1/32
ipv6 address 2001:db8::1/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth2
ip address 192.0.2.1/32
ipv6 address 2001:db8::1/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth3
ip address 192.0.2.1/32
ipv6 address 2001:db8::1/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface lo
ip ospf area 0.0.0.0
ipv6 ospf6 passive
!
router ospf
log-adjacency-changes
passive-interface default
no passive-interface eth1
no passive-interface eth2
no passive-interface eth3
!
router ospf6
log-adjacency-changes
interface lo area 0.0.0.0
interface eth1 area 0.0.0.0
interface eth2 area 0.0.0.0
interface eth3 area 0.0.0.0
!
line vty
!
58 changes: 58 additions & 0 deletions tests/topotests/ospf_topo2/r2/frr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
frr version 7.5.1
frr defaults traditional
hostname r
log syslog informational
service integrated-vtysh-config
!
ip router-id 192.0.2.2
!
interface eth1
ip address 192.0.2.2/32
ipv6 address 2001:db8::2/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth2
ip address 192.0.2.2/32
ipv6 address 2001:db8::2/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth3
ip address 192.0.2.2/32
ipv6 address 2001:db8::2/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface lo
ip ospf area 0.0.0.0
ipv6 ospf6 passive
!
router ospf
log-adjacency-changes
passive-interface default
no passive-interface eth1
no passive-interface eth2
no passive-interface eth3
!
router ospf6
log-adjacency-changes
interface lo area 0.0.0.0
interface eth1 area 0.0.0.0
interface eth2 area 0.0.0.0
interface eth3 area 0.0.0.0
!
line vty
!
58 changes: 58 additions & 0 deletions tests/topotests/ospf_topo2/r3/frr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
frr version 7.5.1
frr defaults traditional
hostname r
log syslog informational
service integrated-vtysh-config
!
ip router-id 192.0.2.3
!
interface eth1
ip address 192.0.2.3/32
ipv6 address 2001:db8::3/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth2
ip address 192.0.2.3/32
ipv6 address 2001:db8::3/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth3
ip address 192.0.2.3/32
ipv6 address 2001:db8::3/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface lo
ip ospf area 0.0.0.0
ipv6 ospf6 passive
!
router ospf
log-adjacency-changes
passive-interface default
no passive-interface eth1
no passive-interface eth2
no passive-interface eth3
!
router ospf6
log-adjacency-changes
interface lo area 0.0.0.0
interface eth1 area 0.0.0.0
interface eth2 area 0.0.0.0
interface eth3 area 0.0.0.0
!
line vty
!
58 changes: 58 additions & 0 deletions tests/topotests/ospf_topo2/r4/frr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
frr version 7.5.1
frr defaults traditional
hostname r
log syslog informational
service integrated-vtysh-config
!
ip router-id 192.0.2.4
!
interface eth1
ip address 192.0.2.4/32
ipv6 address 2001:db8::4/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth2
ip address 192.0.2.4/32
ipv6 address 2001:db8::4/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface eth3
ip address 192.0.2.4/32
ipv6 address 2001:db8::4/128
ip ospf area 0.0.0.0
ip ospf dead-interval minimal hello-multiplier 4
ip ospf network point-to-point
ipv6 ospf6 dead-interval 4
ipv6 ospf6 hello-interval 1
ipv6 ospf6 network point-to-point
!
interface lo
ip ospf area 0.0.0.0
ipv6 ospf6 passive
!
router ospf
log-adjacency-changes
passive-interface default
no passive-interface eth1
no passive-interface eth2
no passive-interface eth3
!
router ospf6
log-adjacency-changes
interface lo area 0.0.0.0
interface eth1 area 0.0.0.0
interface eth2 area 0.0.0.0
interface eth3 area 0.0.0.0
!
line vty
!
44 changes: 44 additions & 0 deletions tests/topotests/ospf_topo2/test_ospf_topo2.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
graph template {
label="ospf_topo2";
splines = "line"

# Routers
r1 [
shape=doubleoctagon,
label="r1\n192.0.2.1\n2001:db8::1",
fillcolor="#f08080",
style=filled,
];
r2 [
shape=doubleoctagon,
label="r2\n\192.0.2.2\n2001:db8::2",
fillcolor="#f08080",
style=filled,
];
r3 [
shape=doubleoctagon,
label="r3\n192.0.2.3\n2001:db8::3",
fillcolor="#f08080",
style=filled,
];
r4 [
shape=doubleoctagon,
label="r4\n192.0.2.4\n2001:db8::4",
fillcolor="#f08080",
style=filled,
];

# Connections
r1 -- r2 [label="eth1"];
r1 -- r2 [label="eth2"];

r2 -- r3 [label="eth3\neth1"];
r1 -- r4 [label="eth3\neth1"];

r4 -- r3 [label="eth2"];
r4 -- r3 [label="eth3"];

# Group r1 and r2 above, r3 and r4 below
{ rank=min; r1; r2; }
{ rank=max; r3; r4; }
}
Binary file added tests/topotests/ospf_topo2/test_ospf_topo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cb95585

Please sign in to comment.