proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 12:25:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: nhrp, use unified config, remove misleading error log

Browse Source 
Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
Jafar Al-Gharaibeh 2024-09-04 23:51:39 -05:00
parent 4f185c5c9d
commit 2054b49c40
13 changed files with 75 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/topotests/nhrp_redundancy/host/zebra.conf → tests/topotests/nhrp_redundancy/host/frr.conf
View File

9
tests/topotests/nhrp_redundancy/nhc1/zebra.conf → tests/topotests/nhrp_redundancy/nhc1/frr.conf
View File

@ -1,4 +1,5 @@
ip forwarding
!debug nhrp all
interface nhc1-eth0
ip address 192.168.2.4/24
!
@ -7,6 +8,14 @@ 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

11
tests/topotests/nhrp_redundancy/nhc1/nhrpd.conf
View File

@ -1,11 +0,0 @@
!debug nhrp all
interface nhc1-gre0
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
exit

9
tests/topotests/nhrp_redundancy/nhc2/zebra.conf → tests/topotests/nhrp_redundancy/nhc2/frr.conf
View File

@ -1,4 +1,5 @@
ip forwarding
!debug nhrp all
interface nhc2-eth0
ip address 192.168.2.5/24
!
@ -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

11
tests/topotests/nhrp_redundancy/nhc2/nhrpd.conf
View File

@ -1,11 +0,0 @@
!debug nhrp all
interface nhc2-gre0
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
exit

7
tests/topotests/nhrp_redundancy/nhs1/zebra.conf → tests/topotests/nhrp_redundancy/nhs1/frr.conf
View File

@ -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
tests/topotests/nhrp_redundancy/nhs1/nhrpd.conf
View File

@ -1,9 +0,0 @@
!debug nhrp all
nhrp nflog-group 1
interface nhs1-gre0
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs1-eth0
exit

7
tests/topotests/nhrp_redundancy/nhs2/zebra.conf → tests/topotests/nhrp_redundancy/nhs2/frr.conf
View File

@ -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
tests/topotests/nhrp_redundancy/nhs2/nhrpd.conf
View File

@ -1,9 +0,0 @@
!debug nhrp all
nhrp nflog-group 1
interface nhs2-gre0
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs2-eth0
exit

7
tests/topotests/nhrp_redundancy/nhs3/zebra.conf → tests/topotests/nhrp_redundancy/nhs3/frr.conf
View File

@ -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
tests/topotests/nhrp_redundancy/nhs3/nhrpd.conf
View File

@ -1,9 +0,0 @@
!debug nhrp all
nhrp nflog-group 1
interface nhs3-gre0
ip nhrp holdtime 10
ip nhrp network-id 42
ip nhrp registration no-unique
ip nhrp redirect
tunnel source nhs3-eth0
exit

0
tests/topotests/nhrp_redundancy/router/zebra.conf → tests/topotests/nhrp_redundancy/router/frr.conf
View File

14
tests/topotests/nhrp_redundancy/test_nhrp_redundancy.py
View File

@ -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):
@ -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()