Skip to content

Commit

Permalink
Merge pull request #16746 from Jafaral/nhrp-test
Browse files Browse the repository at this point in the history 
tests: nhrp, use unified config, remove misleading error log
  • Loading branch information
@ton31337
ton31337 authored Sep 6, 2024
2 parents 365a822 + 2054b49 commit f3f96f9
Show file tree
Hide file tree
Showing 13 changed files with 75 additions and 91 deletions.
0 ...topotests/nhrp_redundancy/host/zebra.conf → ...s/topotests/nhrp_redundancy/host/frr.conf
View file
File renamed without changes.
11 changes: 10 additions & 1 deletion ...topotests/nhrp_redundancy/nhc1/zebra.conf → ...s/topotests/nhrp_redundancy/nhc1/frr.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ip forwarding
!debug nhrp all
interface nhc1-eth0
ip address 192.168.2.4/24
!
Expand All @@ -7,10 +8,18 @@ interface nhc1-gre0
ip address 172.16.1.4/32
no link-detect
ipv6 nd suppress-ra
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp nhs dynamic nbma 192.168.1.1
ip nhrp nhs dynamic nbma 192.168.1.2
ip nhrp nhs dynamic nbma 192.168.1.3
ip nhrp shortcut
tunnel source nhc1-eth0
!
interface nhc1-eth1
ip address 10.4.4.4/24
!
ip route 0.0.0.0/0 172.16.1.1 50
ip route 0.0.0.0/0 172.16.1.2 60
ip route 0.0.0.0/0 172.16.1.3 70
ip route 0.0.0.0/0 172.16.1.3 70
11 changes: 0 additions & 11 deletions tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf
View file

This file was deleted.

9 changes: 9 additions & 0 deletions ...topotests/nhrp_redundancy/nhc2/zebra.conf → ...s/topotests/nhrp_redundancy/nhc2/frr.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ip forwarding
!debug nhrp all
interface nhc2-eth0
ip address 192.168.2.5/24
!
Expand All @@ -7,6 +8,14 @@ interface nhc2-gre0
ip address 172.16.1.5/32
no link-detect
ipv6 nd suppress-ra
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp nhs dynamic nbma 192.168.1.1
ip nhrp nhs dynamic nbma 192.168.1.2
ip nhrp nhs dynamic nbma 192.168.1.3
ip nhrp registration no-unique
ip nhrp shortcut
tunnel source nhc2-eth0
!
interface nhc2-eth1
ip address 10.5.5.5/24
Expand Down
11 changes: 0 additions & 11 deletions tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf
View file

This file was deleted.

7 changes: 7 additions & 0 deletions ...topotests/nhrp_redundancy/nhs1/zebra.conf → ...s/topotests/nhrp_redundancy/nhs1/frr.conf
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
ip forwarding
!debug nhrp all
interface nhs1-eth0
ip address 192.168.1.1/24
!
ip route 192.168.2.0/24 192.168.1.6
nhrp nflog-group 1
interface nhs1-gre0
ip address 172.16.1.1/32
no link-detect
ipv6 nd suppress-ra
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs1-eth0
!
ip route 10.4.4.0/24 172.16.1.4
ip route 10.5.5.0/24 172.16.1.5
9 changes: 0 additions & 9 deletions tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf
View file

This file was deleted.

7 changes: 7 additions & 0 deletions ...topotests/nhrp_redundancy/nhs2/zebra.conf → ...s/topotests/nhrp_redundancy/nhs2/frr.conf
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
ip forwarding
!debug nhrp all
interface nhs2-eth0
ip address 192.168.1.2/24
!
ip route 192.168.2.0/24 192.168.1.6
nhrp nflog-group 1
interface nhs2-gre0
ip address 172.16.1.2/32
no link-detect
ipv6 nd suppress-ra
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs2-eth0
!
ip route 10.4.4.0/24 172.16.1.4
ip route 10.5.5.0/24 172.16.1.5
9 changes: 0 additions & 9 deletions tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf
View file

This file was deleted.

7 changes: 7 additions & 0 deletions ...topotests/nhrp_redundancy/nhs3/zebra.conf → ...s/topotests/nhrp_redundancy/nhs3/frr.conf
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
ip forwarding
!debug nhrp all
interface nhs3-eth0
ip address 192.168.1.3/24
!
ip route 192.168.2.0/24 192.168.1.6
nhrp nflog-group 1
interface nhs3-gre0
ip address 172.16.1.3/32
no link-detect
ipv6 nd suppress-ra
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs3-eth0
!
ip route 10.4.4.0/24 172.16.1.4
ip route 10.5.5.0/24 172.16.1.5
9 changes: 0 additions & 9 deletions tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf
View file

This file was deleted.

0 ...potests/nhrp_redundancy/router/zebra.conf → ...topotests/nhrp_redundancy/router/frr.conf
View file
File renamed without changes.
76 changes: 35 additions & 41 deletions tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,38 +29,38 @@
"""

TOPOLOGY = """
+------------+ +------------+ +------------+
| | | | | |
| | | | | |
| NHS 1 | | NHS 2 | | NHS 3 |
| | | | | |
+-----+------+ +-----+------+ +-----+------+
|.1 |.2 |.3
| | |
| | 192.168.1.0/24 |
------+-------------------------------+------------------+-------------+------
|
|.6
GRE P2MP between all NHS and NHC +-----+------+
172.16.1.x/32 | |
| |
| Router |
| |
+-----+------+
|
|
---------+----------------+-------------+------
| 192.168.2.0/24 |
| |
| |.4 |.5
+------------+ | +-------+----+ +------+-----+ |
| | | | | | | |
| | +--------+ | | | |
+------------+ +------------+ +------------+
| | | | | |
| | | | | |
| NHS 1 | | NHS 2 | | NHS 3 |
| | | | | |
+-----+------+ +-----+------+ +-----+------+
|.1 |.2 |.3
| | |
| | 192.168.1.0/24 |
------+-------------------------------+------------------+-------------+------
|
|.6
GRE P2MP between all NHS and NHC +-----+------+
172.16.1.x/32 | |
| |
| Router |
| |
+-----+------+
|
|
---------+----------------+-------------+------
| 192.168.2.0/24 |
| |
| |.4 |.5
+------------+ | +-------+----+ +------+-----+ |
| | | | | | | |
| | +--------+ | | | |
| Host |.7 | | NHC 1 | | NHC 2 +-----+10.5.5.0/24
| +---------+ | | | | |
+------------+ | +------------+ +------------+ |
| |
10.4.4.0/24
| +---------+ | | | | |
+------------+ | +------------+ +------------+ |
| |
10.4.4.0/24
"""

# Save the Current Working Directory to find configuration files.
Expand Down Expand Up @@ -148,8 +148,8 @@ def _populate_iface():
def _verify_iptables():
tgen = get_topogen()
# Verify iptables is installed. Required for shortcuts
rc, _, _ = tgen.net["nhs1"].cmd_status("iptables")
return False if rc == 127 else True
rc, _, _ = tgen.net["nhs1"].cmd_status("iptables -V")
return True if rc == 0 else False


def setup_module(mod):
Expand All @@ -167,14 +167,8 @@ def setup_module(mod):
_populate_iface()

for rname, router in router_list.items():
router.load_config(
TopoRouter.RD_ZEBRA,
os.path.join(CWD, "{}/zebra.conf".format(rname)),
)
if rname in ("nhs1", "nhs2", "nhs3", "nhc1", "nhc2"):
router.load_config(
TopoRouter.RD_NHRP, os.path.join(CWD, "{}/nhrpd.conf".format(rname))
)
logger.info("Loading router %s" % rname)
router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))

# Initialize all routers.
tgen.start_router()
Expand Down

0 comments on commit f3f96f9

Please sign in to comment.